Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | replace logo-wide on share page as well with better icon + text | Jan-Christoph Borchardt | 2015-05-22 | 6 | -24/+22 |
* | remove logo-wide from tests | Jan-Christoph Borchardt | 2015-05-21 | 7 | -886/+16 |
* | Merge pull request #16322 from owncloud/trash-view | Morris Jobke | 2015-05-20 | 5 | -31/+125 |
|\ | |||||
| * | 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 owncloud/s2s-returnpropererrorwhenpublicwebdav... | Morris Jobke | 2015-05-20 | 1 | -4/+5 |
|\ \ | |||||
| * | | 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 |
|\ \ \ | |||||
| * | | | Catch NotFoundException and return no quota information which simply reflects... | Thomas Müller | 2015-05-19 | 1 | -10/+26 |
| * | | | exception class will be logged as well - helps especially in cases where the ... | Thomas Müller | 2015-05-19 | 1 | -3/+9 |
| * | | | Fix provisioning API unit tests for login | Vincent Petry | 2015-05-18 | 3 | -49/+51 |
| * | | | 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 | Lukas Reschke | 2015-05-20 | 2 | -2/+326 |
* | | | | | Merge pull request #16326 from owncloud/fix-16192 | Morris Jobke | 2015-05-20 | 2 | -3/+29 |
|\ \ \ \ \ | |||||
| * | | | | | 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 | Morris Jobke | 2015-05-19 | 1 | -1/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #16453 from cmeh/patch-6 | Morris Jobke | 2015-05-20 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Clean-up of orthography, grammar | Christian Hoffmann | 2015-05-19 | 1 | -2/+2 |
* | | | | | | Merge pull request #16446 from owncloud/fix-url-generation | Lukas Reschke | 2015-05-20 | 3 | -2/+115 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | [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 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Re-add use statement | Morris Jobke | 2015-05-19 | 1 | -0/+1 |
| * | | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-05-19 | 21 | -43/+0 |
* | | | | | | 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 | 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 backends to a minimum | Joas Schilling | 2015-05-18 | 2 | -11/+47 |
* | | | | | | Merge pull request #15606 from owncloud/fix-group-list-and-count-primary-grou... | Thomas Müller | 2015-05-19 | 2 | -9/+78 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | 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 speci... | Arthur Schiwon | 2015-05-19 | 2 | -9/+77 |
* | | | | | | Merge pull request #12401 from owncloud/add-limit-parameter-to-getSharewith | Thomas Müller | 2015-05-19 | 2 | -4/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 | 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 | Morris Jobke | 2015-05-08 | 3 | -7/+113 |
| * | | | | | | | Move log level check to logger parent class | Morris Jobke | 2015-05-08 | 4 | -45/+45 |
* | | | | | | | | Merge pull request #16085 from owncloud/encryption-module-rename | Thomas Müller | 2015-05-19 | 5 | -6/+6 |
|\ \ \ \ \ \ \ \ |