nextcloud/apps
Brice Maron e5c56b2433 Merge branch 'master' into multi_app_dir
Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php
2012-06-21 17:15:35 +00:00
..
admin_audit Audit: Log sharing actions 2012-05-07 09:04:07 +02:00
admin_dependencies_chk Remove OC_App::register function 2012-05-31 13:01:30 +02:00
admin_migrate mark the apps as part of the shipped package and increase the requirement to ownCloud 4 2012-05-18 16:06:57 +02:00
bookmarks Merge branch 'master' into multi_app_dir 2012-06-21 17:15:35 +00:00
calendar Merge branch 'master' into multi_app_dir 2012-06-21 17:15:35 +00:00
contacts Merge branch 'master' into multi_app_dir 2012-06-21 17:15:35 +00:00
external prevent XSS 2012-06-10 19:52:23 +02:00
files use new sanitizeHTML() function 2012-06-21 10:28:43 +02:00
files_archive removed readdir to fix bug oc-1054 2012-06-20 16:24:49 +01:00
files_encryption only use 1 fsview when initializing encryption 2012-06-21 18:35:12 +02:00
files_external suppress error when using is_dir on non directory in smb backend 2012-06-17 03:09:49 +02:00
files_imageviewer files_imageviewer: Double encode paths. Fixes oc-1016. 2012-06-16 18:54:55 +02:00
files_pdfviewer PDF Viewer: Double encode link. 2012-06-16 19:48:33 +02:00
files_sharing Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-20 16:26:02 +01:00
files_sharing_log Add app for logging access to shared files 2012-06-14 17:44:41 +02:00
files_texteditor use new sanitizeHTML() function 2012-06-21 10:28:43 +02:00
files_versions Fixed missing jQuery event object - expire interface now works with Firefox 2012-06-21 14:54:24 +01:00
gallery Gallery: Move code/js/css from main template to the right place 2012-06-20 21:28:37 +02:00
media Merge branch 'master' into multi_app_dir 2012-06-21 17:15:35 +00:00
remoteStorage utf8 in der DB config 2012-06-11 23:04:28 +02:00
tasks Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127 2012-06-13 15:17:46 -04:00
user_ldap forgotten $, incorrect subtract 2012-06-20 12:47:31 +02:00
user_migrate user_migrate: remove old code 2012-06-17 12:06:40 +00:00
user_openid Allow apps to load before login, needed for user_openid 2012-06-18 15:40:48 +02:00
user_webfinger Merge branch 'master' into multi_app_dir 2012-06-21 17:15:35 +00:00
.gitkeep apps are now stored in /apps 2011-04-16 09:46:58 +02:00