summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #21268 from owncloud/cleanup-OC_Helper-getFileNameMimeTypeThomas Müller2015-12-184-5/+7
|\
| * Use proper public API for OC_Helper::getFileNameMimeTypeMorris Jobke2015-12-174-5/+7
* | Merge pull request #21264 from owncloud/deprecated_oc_user_methodsThomas Müller2015-12-188-20/+32
|\ \
| * | Removed deprecated function OC_User::deleteUserRoeland Jago Douma2015-12-177-12/+24
| * | Removed deprecated private OC_User::createUserRoeland Jago Douma2015-12-175-7/+7
| * | Remove deprecated function OC_User::getManagerRoeland Jago Douma2015-12-171-1/+1
| |/
* | Merge pull request #20696 from owncloud/add-carddav-backends-to-ocp-contactsm...Thomas Müller2015-12-179-21/+1184
|\ \ | |/ |/|
| * avoid duplicates on searchBjörn Schießle2015-12-152-15/+33
| * Fix last Oracle issueThomas Müller2015-12-151-1/+1
| * Fix Oracle insert errorThomas Müller2015-12-152-4/+8
| * implement delete, create, update, search, get permissionsBjörn Schießle2015-12-1510-123/+1133
| * save wipThomas Müller2015-12-112-0/+131
* | Merge pull request #21200 from owncloud/files-authorizationheaderThomas Müller2015-12-171-1/+2
|\ \
| * | Use Authorization headers for public webdav instead of URLVincent Petry2015-12-141-1/+2
* | | Merge pull request #21201 from mmattel/scanFiles_stat_output_IIThomas Müller2015-12-171-6/+184
|\ \ \
| * | | Statistics output for ./occ files:scanmartin.mattel@diemattels.at2015-12-151-6/+184
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-1716-26/+42
* | | add unit test for #21230Morris Jobke2015-12-161-0/+41
* | | Use name of ICollection for exception messageMorris Jobke2015-12-161-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-162-0/+20
* | | Merge pull request #21133 from owncloud/fix-shared-files-of-deleted-usersC. Montero Luque2015-12-154-9/+203
|\ \ \
| * | | fix find DN by UUID for ADArthur Schiwon2015-12-141-13/+56
| * | | unit test on getHome in combination with OfflineUserArthur Schiwon2015-12-111-2/+52
| * | | adjust unit testArthur Schiwon2015-12-111-0/+8
| * | | look for DN changes before marking a user as deletedArthur Schiwon2015-12-113-3/+76
| * | | throw NoUserException in getHome when the requested user does not exist anymoreArthur Schiwon2015-12-111-5/+25
* | | | Merge pull request #21189 from owncloud/fix_21187Thomas Müller2015-12-152-1/+4
|\ \ \ \
| * | | | File shares can't have create permissionsRoeland Jago Douma2015-12-142-1/+4
* | | | | Merge pull request #21067 from owncloud/fix_20296Thomas Müller2015-12-157-6/+23
|\ \ \ \ \
| * | | | | Fixed JS unit tests for fed owner display nameVincent Petry2015-12-141-0/+4
| * | | | | show display name but internally use the user nameBjörn Schießle2015-12-146-6/+11
| * | | | | don't allow to create a federated share if source and target server are the sameBjörn Schießle2015-12-141-0/+8
| | |_|/ / | |/| | |
* / | | | Remove unneeded upgrade codeMorris Jobke2015-12-151-16/+0
|/ / / /
* | | | Fix mount type root detectionVincent Petry2015-12-142-7/+40
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-138-2/+36
|/ / /
* | / [tx-robot] updated from transifexJenkins for ownCloud2015-12-1286-0/+150
| |/ |/|
* | Merge pull request #21153 from owncloud/files-deleteactiontextThomas Müller2015-12-113-5/+49
|\ \
| * | Bring back file delete action text to be based on contextVincent Petry2015-12-113-5/+49
* | | skip test if we cant use the filesystem when not logged inRobin Appelman2015-12-111-2/+5
* | | Fix thrashbin wrapper when no user is loggedinRobin Appelman2015-12-112-2/+13
|/ /
* | Merge pull request #21144 from owncloud/dav-auth-checkduplicateheaderThomas Müller2015-12-111-1/+1
|\ \
| * | Properly check X-Requested-With header in case of multiple valuesVincent Petry2015-12-111-1/+1
* | | Merge pull request #21135 from owncloud/add-polyfillThomas Müller2015-12-113-111/+9
|\ \ \
| * | | Use PHP polyfillsLukas Reschke2015-12-113-111/+9
| | |/ | |/|
* | | Merge pull request #21045 from owncloud/scrutinizer-patch-1Thomas Müller2015-12-1110-9/+38
|\ \ \
| * | | adjust PHPDocThomas Müller2015-12-102-0/+4
| * | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-1010-9/+34
| |/ /
* / / Catch exception when querying direct download linkVincent Petry2015-12-102-3/+33
|/ /
* | Merge pull request #21114 from owncloud/group-propagation-testsThomas Müller2015-12-104-78/+215
|\ \ | |/ |/|
| * Add test case for group share propagationRobin Appelman2015-12-104-78/+215