Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-21 | 136 | -98/+160 |
| | |||||
* | Merge pull request #16469 from ↵ | Vincent Petry | 2015-05-20 | 1 | -0/+1 |
|\ | | | | | | | | | oparoz/restore-minheight-for-single-public-previews Restore min-height for single previews | ||||
| * | Restore min-height for single previews | Olivier Paroz | 2015-05-20 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #16322 from owncloud/trash-view | Morris Jobke | 2015-05-20 | 5 | -31/+125 |
|\ \ | | | | | | | dont go trough the view when moving to trash | ||||
| * | | add tests for copyFromStorage with same storage | Robin Appelman | 2015-05-19 | 1 | -12/+25 |
| | | | |||||
| * | | cleanup move/copy logic in trash | Robin Appelman | 2015-05-19 | 1 | -20/+57 |
| | | | |||||
| * | | use copy when doing a crossStorageCopy on the same storage | Robin Appelman | 2015-05-19 | 2 | -3/+20 |
| | | | |||||
| * | | adjust test | Robin Appelman | 2015-05-18 | 1 | -1/+7 |
| | | | |||||
| * | | fix target path for move | Robin Appelman | 2015-05-18 | 1 | -2/+6 |
| | | | |||||
| * | | update cache after move to trash | Robin Appelman | 2015-05-18 | 1 | -0/+2 |
| | | | |||||
| * | | dont go trough the view when moving to trash | Robin Appelman | 2015-05-18 | 1 | -12/+27 |
| | | | |||||
* | | | Merge pull request #16465 from ↵ | Morris Jobke | 2015-05-20 | 1 | -4/+5 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/s2s-returnpropererrorwhenpublicwebdavdisabled Return 401 when accessing public webdav and s2s is disabled | ||||
| * | | | Return 401 when accessing public webdav and s2s is disabled | Vincent Petry | 2015-05-20 | 1 | -4/+5 |
| | | | | |||||
* | | | | Merge pull request #16075 from owncloud/skeleton-copy-delay | Vincent Petry | 2015-05-20 | 13 | -75/+98 |
|\ \ \ \ | | | | | | | | | | | wait with copying the skeleton untill login and setupfs are done | ||||
| * | | | | Catch NotFoundException and return no quota information which simply ↵ | Thomas Müller | 2015-05-19 | 1 | -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üller | 2015-05-19 | 1 | -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 login | Vincent Petry | 2015-05-18 | 3 | -49/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Properly login the user every time to make sure their FS is properly setup. | ||||
| * | | | | fix tests | Robin Appelman | 2015-05-18 | 3 | -5/+3 |
| | | | | | |||||
| * | | | | fix tests | Robin Appelman | 2015-05-18 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | fix tests | Robin Appelman | 2015-05-18 | 3 | -4/+3 |
| | | | | | |||||
| * | | | | wait with copying the skeleton untill login and setupfs are done | Robin Appelman | 2015-05-18 | 2 | -4/+4 |
| | | | | | |||||
* | | | | | Merge pull request #16463 from owncloud/add-support-to-disallow-domains | Jan-Christoph Borchardt | 2015-05-20 | 2 | -2/+326 |
|\ \ \ \ \ | | | | | | | | | | | | | Add support for disallowing domains to the ContentSecurityPolicy | ||||
| * | | | | | Add support for disallowing domains to the ContentSecurityPolicy | Lukas Reschke | 2015-05-20 | 2 | -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-16192 | Morris Jobke | 2015-05-20 | 2 | -3/+29 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | include base dn test in functionality test | ||||
| * | | | | | | include base dn test in functionality test | Arthur Schiwon | 2015-05-13 | 2 | -3/+29 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #16444 from owncloud/close-new-dropdown | Jan-Christoph Borchardt | 2015-05-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Closes "New" dropdown when switching category | ||||
| * | | | | | | | Closes "New" dropdown when switching category | Morris Jobke | 2015-05-19 | 1 | -1/+1 |
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #16394 * return false - stops all following event callbacks | ||||
* | | | | | | | Merge pull request #16453 from cmeh/patch-6 | Morris Jobke | 2015-05-20 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Clean-up of orthography, grammar | ||||
| * | | | | | | Clean-up of orthography, grammar | Christian Hoffmann | 2015-05-19 | 1 | -2/+2 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | * Changed "instead to" to "instead of". * Changed "setup" to "set up" (past participle). | ||||
* | | | | | | Merge pull request #16446 from owncloud/fix-url-generation | Lukas Reschke | 2015-05-20 | 3 | -2/+115 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix URL generation | ||||
| * | | | | | | Added unit tests for download URL in public sharing page | Vincent Petry | 2015-05-19 | 3 | -1/+114 |
| | | | | | | | |||||
| * | | | | | | Fix URL generation | Lukas Reschke | 2015-05-19 | 1 | -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 transifex | Jenkins for ownCloud | 2015-05-20 | 126 | -42/+128 |
| | | | | | | |||||
* | | | | | | Merge pull request #16440 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2015-05-19 | 20 | -42/+0 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Scrutinizer Auto-Fixes | ||||
| * | | | | | Re-add use statement | Morris Jobke | 2015-05-19 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-05-19 | 21 | -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-problems | Thomas Müller | 2015-05-19 | 2 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix unexisting class and broken doc | ||||
| * | | | | | | Fix unexisting class and broken doc | Joas Schilling | 2015-05-19 | 2 | -2/+2 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #16419 from owncloud/user-group-backend-performance | Thomas Müller | 2015-05-19 | 2 | -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 minimum | Joas Schilling | 2015-05-18 | 2 | -11/+47 |
| | | | | | | |||||
* | | | | | | Merge pull request #15606 from ↵ | Thomas Müller | 2015-05-19 | 2 | -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 caching | Arthur Schiwon | 2015-05-19 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Fixes returns of group memberships and counting if all members have the ↵ | Arthur Schiwon | 2015-05-19 | 2 | -9/+77 |
| | | | | | | | | | | | | | | | | | | | | | | | | specific groups as primary set. | ||||
* | | | | | | Merge pull request #12401 from owncloud/add-limit-parameter-to-getSharewith | Thomas Müller | 2015-05-19 | 2 | -4/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove hard coded limit of 15 from getShareWith | ||||
| * | | | | | | add support for limit request parameter to getShareWith | Craig Morrissey | 2015-05-15 | 2 | -4/+6 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #16420 from owncloud/update-useconfigtableprefix | Morris Jobke | 2015-05-19 | 1 | -1/+28 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add unit test for migrator with different prefix | ||||
| * | | | | | | | Add unit test for migrator with different prefix | Vincent Petry | 2015-05-19 | 1 | -1/+28 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #15965 from owncloud/conditional-logging | Thomas Müller | 2015-05-19 | 6 | -50/+156 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Conditional logging | ||||
| * | | | | | | | Conditional logging | Morris Jobke | 2015-05-08 | 3 | -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 class | Morris Jobke | 2015-05-08 | 4 | -45/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove duplicate code from child classes |