wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
server/apps
History
Michael Gapczynski 30b58f5677 Merge branch 'master' into share_api 
Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php
2012-07-25 17:08:18 -04: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
atnotes Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
bookmarks remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
calendar Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
contacts Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
external remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
files Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
files_archive Make file actions permissions aware 2012-07-25 16:33:08 -04:00
files_encryption remove unused variables 2012-07-20 18:56:18 +02:00
files_external Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
files_imageviewer Make file actions permissions aware 2012-07-25 16:33:08 -04:00
files_pdfviewer Make file actions permissions aware 2012-07-25 16:33:08 -04:00
files_sharing Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
files_sharing_log latin1 => utf8 2012-07-16 01:46:16 +02:00
files_texteditor Make file actions permissions aware 2012-07-25 16:33:08 -04:00
files_versions Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
gallery Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
journal Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
media Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
news Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
remoteStorage remove unused variables 2012-07-20 18:56:18 +02:00
shorty Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
storage_charts Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
tal Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
tasks Tasks: Remove unused code 2012-07-21 00:52:49 +02:00
user_external ftp user backend 2012-07-19 23:03:02 +02:00
user_ldap LDAP: check if php-ldap is installed. If not, give an error output. FIX: blank Users page when the module is not installed. 2012-07-25 18:40:48 +02:00
user_migrate increase width of user migrates form in personal settings, so you can read the whole label in all languages 2012-07-21 19:50:45 +02:00
user_openid OpenID: fix include path 2012-07-25 17:45:59 +02:00
user_webfinger improve webfinger for situations where owncloud is not installed in the server root 2012-07-16 19:58:05 +02:00
.gitkeep
tanghus-journal-2c506aa.tar.gz Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
tanghus-tal-7f8befe.tar.gz Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00