summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* replace logo-wide on share page as well with better icon + textJan-Christoph Borchardt2015-05-226-24/+22
* remove logo-wide from testsJan-Christoph Borchardt2015-05-217-886/+16
* Merge pull request #16322 from owncloud/trash-viewMorris Jobke2015-05-205-31/+125
|\
| * add tests for copyFromStorage with same storageRobin Appelman2015-05-191-12/+25
| * cleanup move/copy logic in trashRobin Appelman2015-05-191-20/+57
| * use copy when doing a crossStorageCopy on the same storageRobin Appelman2015-05-192-3/+20
| * adjust testRobin Appelman2015-05-181-1/+7
| * fix target path for moveRobin Appelman2015-05-181-2/+6
| * update cache after move to trashRobin Appelman2015-05-181-0/+2
| * dont go trough the view when moving to trashRobin Appelman2015-05-181-12/+27
* | Merge pull request #16465 from owncloud/s2s-returnpropererrorwhenpublicwebdav...Morris Jobke2015-05-201-4/+5
|\ \
| * | Return 401 when accessing public webdav and s2s is disabledVincent Petry2015-05-201-4/+5
* | | Merge pull request #16075 from owncloud/skeleton-copy-delayVincent Petry2015-05-2013-75/+98
|\ \ \
| * | | Catch NotFoundException and return no quota information which simply reflects...Thomas Müller2015-05-191-10/+26
| * | | exception class will be logged as well - helps especially in cases where the ...Thomas Müller2015-05-191-3/+9
| * | | Fix provisioning API unit tests for loginVincent Petry2015-05-183-49/+51
| * | | fix testsRobin Appelman2015-05-183-5/+3
| * | | fix testsRobin Appelman2015-05-181-1/+3
| * | | fix testsRobin Appelman2015-05-183-4/+3
| * | | wait with copying the skeleton untill login and setupfs are doneRobin Appelman2015-05-182-4/+4
* | | | Merge pull request #16463 from owncloud/add-support-to-disallow-domainsJan-Christoph Borchardt2015-05-202-2/+326
|\ \ \ \
| * | | | Add support for disallowing domains to the ContentSecurityPolicyLukas Reschke2015-05-202-2/+326
* | | | | Merge pull request #16326 from owncloud/fix-16192Morris Jobke2015-05-202-3/+29
|\ \ \ \ \
| * | | | | include base dn test in functionality testArthur Schiwon2015-05-132-3/+29
* | | | | | Merge pull request #16444 from owncloud/close-new-dropdownJan-Christoph Borchardt2015-05-201-1/+1
|\ \ \ \ \ \
| * | | | | | Closes "New" dropdown when switching categoryMorris Jobke2015-05-191-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #16453 from cmeh/patch-6Morris Jobke2015-05-201-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Clean-up of orthography, grammarChristian Hoffmann2015-05-191-2/+2
* | | | | | Merge pull request #16446 from owncloud/fix-url-generationLukas Reschke2015-05-203-2/+115
|\ \ \ \ \ \
| * | | | | | Added unit tests for download URL in public sharing pageVincent Petry2015-05-193-1/+114
| * | | | | | Fix URL generationLukas Reschke2015-05-191-1/+1
| | |/ / / / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-20126-42/+128
* | | | | | Merge pull request #16440 from owncloud/scrutinizer-patch-1Thomas Müller2015-05-1920-42/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Re-add use statementMorris Jobke2015-05-191-0/+1
| * | | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-05-1921-43/+0
* | | | | | Merge pull request #16447 from owncloud/fix-minor-code-problemsThomas Müller2015-05-192-2/+2
|\ \ \ \ \ \
| * | | | | | Fix unexisting class and broken docJoas Schilling2015-05-192-2/+2
| |/ / / / /
* | | | | | Merge pull request #16419 from owncloud/user-group-backend-performanceThomas Müller2015-05-192-11/+47
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Reduce the complexity of the search queries in the backends to a minimumJoas Schilling2015-05-182-11/+47
* | | | | | Merge pull request #15606 from owncloud/fix-group-list-and-count-primary-grou...Thomas Müller2015-05-192-9/+78
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | add primary group users to resultset before cachingArthur Schiwon2015-05-191-1/+2
| * | | | | Fixes returns of group memberships and counting if all members have the speci...Arthur Schiwon2015-05-192-9/+77
* | | | | | Merge pull request #12401 from owncloud/add-limit-parameter-to-getSharewithThomas Müller2015-05-192-4/+6
|\ \ \ \ \ \
| * | | | | | add support for limit request parameter to getShareWithCraig Morrissey2015-05-152-4/+6
* | | | | | | Merge pull request #16420 from owncloud/update-useconfigtableprefixMorris Jobke2015-05-191-1/+28
|\ \ \ \ \ \ \
| * | | | | | | Add unit test for migrator with different prefixVincent Petry2015-05-191-1/+28
* | | | | | | | Merge pull request #15965 from owncloud/conditional-loggingThomas Müller2015-05-196-50/+156
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Conditional loggingMorris Jobke2015-05-083-7/+113
| * | | | | | | Move log level check to logger parent classMorris Jobke2015-05-084-45/+45
* | | | | | | | Merge pull request #16085 from owncloud/encryption-module-renameThomas Müller2015-05-195-6/+6
|\ \ \ \ \ \ \ \