summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #13848 from owncloud/ldap-warnMorris Jobke2015-02-071-1/+1
|\
| * Reduce log level of bind failed to WARN - fixes #11624Morris Jobke2015-02-031-1/+1
* | Merge pull request #13889 from owncloud/catch-exceptionMorris Jobke2015-02-072-8/+18
|\ \
| * | Catch exception properlyLukas Reschke2015-02-042-8/+18
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-0710-4/+50
* | | Revert "Add OCS sharing info to capabilities"Lukas Reschke2015-02-073-280/+0
* | | Merge pull request #13692 from rullzer/capabilitiesFrank Karlitschek2015-02-063-0/+280
|\ \ \
| * | | Updated unit testsRoeland Jago Douma2015-02-061-43/+123
| * | | Bit better formatting when using json outputRoeland Jago Douma2015-02-061-2/+4
| * | | Updated sharing capabilitiesRoeland Jago Douma2015-02-061-9/+15
| * | | Split up unit testsRoeland Jago Douma2015-02-041-16/+24
| * | | Added unit test to test getCapabilities for files_sharingRoeland Jago Douma2015-02-041-0/+113
| * | | Converted getCapabilities to non static functionRoeland Jago Douma2015-02-041-7/+24
| * | | Use single quotesRoeland Jago Douma2015-02-041-7/+7
| * | | Only return capabilities if they are setRoeland Jago Douma2015-02-041-14/+8
| * | | Added capabilities whether a server allows public linksRoeland Jago Douma2015-02-042-0/+60
* | | | Merge pull request #13954 from owncloud/fix-enc-mig-user-retrievalThomas Müller2015-02-062-7/+18
|\ \ \ \
| * | | | always specify limit, except you do like questionable surprisesArthur Schiwon2015-02-062-7/+18
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-0616-86/+94
* | | | | don't check if we have a valid userBjoern Schiessle2015-02-061-5/+1
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-0616-12/+114
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-054-2/+4
| |/ / |/| |
* | | Merge pull request #13849 from owncloud/ldap-oc8-updateblizzz2015-02-042-49/+1
|\ \ \ | |/ / |/| |
| * | no update routine needed from OC 7 to 8Arthur Schiwon2015-02-032-49/+1
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2015-02-0418-16/+88
|/
* Merge pull request #13837 from owncloud/endless-redirectThomas Müller2015-02-031-0/+1
|\
| * Add callCheck to testremote.phpLukas Reschke2015-02-021-0/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-0322-42/+100
|/
* Merge pull request #13817 from owncloud/core-apps-dependenciesMorris Jobke2015-02-022-0/+6
|\
| * encryption requires openssl and user_ldap requires ldap :speak_no_evil:Thomas Müller2015-02-022-0/+6
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-028-12/+22
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-016-2/+6
* | Merge pull request #13797 from owncloud/fix_move_del_of_remote_sharesLukas Reschke2015-01-313-3/+3
|\ \
| * | no need to initialize the same view twiceBjoern Schiessle2015-01-301-1/+0
| * | get correct user for paths to the trash bin, needed for remote shares if the ...Bjoern Schiessle2015-01-302-2/+3
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-3144-86/+120
| |/ |/|
* | Merge pull request #13508 from owncloud/failed-delete-cacheMorris Jobke2015-01-303-4/+46
|\ \ | |/ |/|
| * Dont do a cache rename if we cant delete the source fileRobin Appelman2015-01-291-1/+3
| * Make sure we delete the file when doing a cross storage trashbin moveRobin Appelman2015-01-291-0/+2
| * Detect failed deletes in the trashbinRobin Appelman2015-01-292-3/+41
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-3064-66/+42
* | Merge pull request #13760 from owncloud/create_enc_key_for_remote_sharesMorris Jobke2015-01-292-57/+118
|\ \
| * | Fix intendationJoas Schilling2015-01-291-3/+3
| * | Fix more assertionsJoas Schilling2015-01-291-26/+26
| * | Fix 2 assertionsJoas Schilling2015-01-291-3/+3
| * | make sure that we always create a public share key for remote sharesBjoern Schiessle2015-01-292-32/+93
* | | Merge pull request #13728 from owncloud/federated_cloudThomas Müller2015-01-292-5/+5
|\ \ \ | |_|/ |/| |
| * | rename 'server-to-server sharing' to 'federated cloud'Bjoern Schiessle2015-01-292-5/+5
| |/
* | Merge pull request #13746 from owncloud/no-groups-provisioning-apiThomas Müller2015-01-292-1/+5
|\ \
| * | disallow provisioning api to be enabled for groups onlyThomas Müller2015-01-292-1/+5