wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
server/apps
History
Michael Gapczynski 4c7fd8cd01 Merge branch 'master' into share_api 
Conflicts:
	lib/group.php
	lib/group/backend.php
	lib/group/database.php
	lib/group/interface.php
	lib/public/user.php
	lib/user.php
	lib/user/backend.php
	lib/user/database.php
	lib/user/interface.php
2012-08-14 10:22:13 -04:00
..
admin_audit audit: update appinfo to OC4 2012-08-03 16:05:48 +02:00
admin_dependencies_chk [tx-robot] updated from transifex 2012-08-13 23:19:31 +02:00
admin_migrate [tx-robot] updated from transifex 2012-08-13 23:19:31 +02:00
bookmarks Remove unused RUNTIME_NOSETUPFS var 2012-08-08 22:42:50 +02:00
calendar Merge branch 'master' into share_api 2012-08-14 10:22:13 -04:00
contacts Merge branch 'master' into share_api 2012-08-14 10:22:13 -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-08-14 10:22:13 -04:00
files_archive Make file actions permissions aware 2012-07-25 16:33:08 -04:00
files_encryption [tx-robot] updated from transifex 2012-08-13 23:19:31 +02:00
files_external Merge branch 'master' into share_api 2012-08-14 10:22:13 -04:00
files_imageviewer Merge branch 'master' into share_api 2012-07-31 15:00:04 -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-08-14 10:22:13 -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-08-14 10:22:13 -04:00
gallery Merge branch 'master' into share_api 2012-08-14 10:22:13 -04:00
media Merge branch 'master' into share_api 2012-08-14 10:22:13 -04:00
remoteStorage Rewrite remoteStorage settings, remove block echo 2012-08-12 22:30:13 +02:00
tasks [tx-robot] updated from transifex 2012-08-13 23:19:31 +02:00
user_external ftp user backend 2012-07-19 23:03:02 +02:00
user_ldap LDAP: adjust usersInGroup to updated interface 2012-08-14 14:30:03 +02:00
user_migrate [tx-robot] updated from transifex 2012-08-13 23:19:31 +02:00
user_openid [tx-robot] updated from transifex 2012-08-13 23:19:31 +02:00
user_webfinger Check if webfinger is enabled 2012-08-10 10:01:56 +02:00
.gitkeep