summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-21136-98/+160
|
* Merge pull request #16469 from ↵Vincent Petry2015-05-201-0/+1
|\ | | | | | | | | oparoz/restore-minheight-for-single-public-previews Restore min-height for single previews
| * Restore min-height for single previewsOlivier Paroz2015-05-201-0/+1
| |
* | Merge pull request #16322 from owncloud/trash-viewMorris Jobke2015-05-205-31/+125
|\ \ | | | | | | dont go trough the view when moving to trash
| * | 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 ↵Morris Jobke2015-05-201-4/+5
|\ \ \ | | | | | | | | | | | | | | | | owncloud/s2s-returnpropererrorwhenpublicwebdavdisabled Return 401 when accessing public webdav and s2s is disabled
| * | | 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
|\ \ \ \ | | | | | | | | | | wait with copying the skeleton untill login and setupfs are done
| * | | | Catch NotFoundException and return no quota information which simply ↵Thomas Müller2015-05-191-10/+26
| | | | | | | | | | | | | | | | | | | | reflects the current state - no file storage has been initialized for the user.
| * | | | exception class will be logged as well - helps especially in cases where the ↵Thomas Müller2015-05-191-3/+9
| | | | | | | | | | | | | | | | | | | | message contained is empty - e.g. "message":"OCP\\Files\\NotFoundException: at \/home\/deepdiver\/Development\/ownCloud\/core-autotest\/apps\/provisioning_api\/lib\/users.php#354",
| * | | | Fix provisioning API unit tests for loginVincent Petry2015-05-183-49/+51
| | | | | | | | | | | | | | | | | | | | | | | | | Properly login the user every time to make sure their FS is properly setup.
| * | | | 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 ContentSecurityPolicy
| * | | | | Add support for disallowing domains to the ContentSecurityPolicyLukas Reschke2015-05-202-2/+326
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For enhanced security it is important that there is also a way to disallow domains, including the default ones. With this commit every method gets added a new "disallow" function.
* | | | | | Merge pull request #16326 from owncloud/fix-16192Morris Jobke2015-05-202-3/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | include base dn test in functionality test
| * | | | | | 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 category
| * | | | | | | Closes "New" dropdown when switching categoryMorris Jobke2015-05-191-1/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #16394 * return false - stops all following event callbacks
* | | | | | | Merge pull request #16453 from cmeh/patch-6Morris Jobke2015-05-201-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Clean-up of orthography, grammar
| * | | | | | Clean-up of orthography, grammarChristian Hoffmann2015-05-191-2/+2
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | * Changed "instead to" to "instead of". * Changed "setup" to "set up" (past participle).
* | | | | | Merge pull request #16446 from owncloud/fix-url-generationLukas Reschke2015-05-203-2/+115
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix URL generation
| * | | | | | Added unit tests for download URL in public sharing pageVincent Petry2015-05-193-1/+114
| | | | | | |
| * | | | | | Fix URL generationLukas Reschke2015-05-191-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `params` in the `OC.generateUrl` function call only replaces all specified occurences of a key just like the l10n PHP functionality does. This means that to build a query string we have to use `OC.buildQueryString` instead of the params parameters. Fixes https://github.com/owncloud/core/issues/16336 which is a regression introduced with https://github.com/owncloud/core/commit/58a87d0babcb91aab75b45e630d2fc2fee15691e of https://github.com/owncloud/core/pull/15652. Without this fix downloading single files from a public shared folder is not possible.
* | | | | | [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
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Scrutinizer Auto-Fixes
| * | | | | Re-add use statementMorris Jobke2015-05-191-0/+1
| | | | | |
| * | | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-05-1921-43/+0
| | | | | | | | | | | | | | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* | | | | | Merge pull request #16447 from owncloud/fix-minor-code-problemsThomas Müller2015-05-192-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix unexisting class and broken doc
| * | | | | | 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 user/group backends to a minimum
| * | | | | Reduce the complexity of the search queries in the backends to a minimumJoas Schilling2015-05-182-11/+47
| | | | | |
* | | | | | Merge pull request #15606 from ↵Thomas Müller2015-05-192-9/+78
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | owncloud/fix-group-list-and-count-primary-group-only Fixes returns of group memberships and counting if all members have the ...
| * | | | | 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 ↵Arthur Schiwon2015-05-192-9/+77
| | | | | | | | | | | | | | | | | | | | | | | | specific groups as primary set.
* | | | | | Merge pull request #12401 from owncloud/add-limit-parameter-to-getSharewithThomas Müller2015-05-192-4/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove hard coded limit of 15 from getShareWith
| * | | | | | 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 prefix
| * | | | | | | 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 logging
| * | | | | | | Conditional loggingMorris Jobke2015-05-083-7/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Log condition for log level increase based on conditions. Once one of these conditions is met, the required log level is set to debug. This allows to debug specific requests, users or apps * Supported conditions (setting `log_condition` in `config.php`): - `shared_secret`: if a request parameter with the name `log_secret` is set to this value the condition is met - `users`: if the current request is done by one of the specified users, this condition is met - `apps`: if the log message is invoked by one of the specified apps, this condition is met * fix unit test and add app log condition test
| * | | | | | | Move log level check to logger parent classMorris Jobke2015-05-084-45/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove duplicate code from child classes