| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #15499 from owncloud/admin-hints | Jan-Christoph Borchardt | 2015-04-09 | 5 | -0/+18 |
|\ |
|
| * | add admin documentation hints to Federated Cloud Sharing and cron | Jan-Christoph Borchardt | 2015-04-09 | 5 | -0/+18 |
* | | Merge pull request #15497 from owncloud/enforce-type-security | Lukas Reschke | 2015-04-09 | 6 | -24/+41 |
|\ \
| |/
|/| |
|
| * | Fix PHPDoc | Lukas Reschke | 2015-04-09 | 5 | -22/+20 |
| * | Fix code style | Lukas Reschke | 2015-04-09 | 1 | -1/+8 |
| * | Enforce string as passed type | Lukas Reschke | 2015-04-09 | 1 | -1/+13 |
|/ |
|
* | Merge pull request #15314 from owncloud/app-categories-15274 | Lukas Reschke | 2015-04-09 | 20 | -267/+1719 |
|\ |
|
| * | Add JS unit test for sorting | Lukas Reschke | 2015-04-08 | 1 | -0/+54 |
| * | Reference `$(this)` instead | Lukas Reschke | 2015-04-08 | 1 | -1/+1 |
| * | Fix wording | Lukas Reschke | 2015-04-08 | 2 | -2/+2 |
| * | Fix PHPDoc | Lukas Reschke | 2015-04-07 | 1 | -1/+3 |
| * | Deduplicate code | Lukas Reschke | 2015-04-07 | 1 | -44/+31 |
| * | apps mgmt: style experimental apps section, small design fixes | Jan-Christoph Borchardt | 2015-04-07 | 2 | -9/+21 |
| * | app mgmt app level design enhancements | Jan-Christoph Borchardt | 2015-04-07 | 4 | -36/+39 |
| * | Make user names clickable | Lukas Reschke | 2015-04-03 | 3 | -0/+7 |
| * | Add experimental applications switch | Lukas Reschke | 2015-04-03 | 18 | -246/+1633 |
* | | Merge pull request #14676 from owncloud/deleteorphanedshares | Morris Jobke | 2015-04-09 | 3 | -0/+222 |
|\ \ |
|
| * | | Disable trashbin when testing orphaned shares deletion job | Vincent Petry | 2015-04-08 | 1 | -0/+17 |
| * | | Added FIXME about registering jobs in apps.php | Vincent Petry | 2015-04-08 | 1 | -0/+2 |
| * | | Delete orphaned shares in a background job | Vincent Petry | 2015-04-08 | 3 | -0/+203 |
* | | | Merge pull request #15196 from owncloud/limit-file-activities-to-favorites | Morris Jobke | 2015-04-09 | 11 | -12/+658 |
|\ \ \ |
|
| * | | | Make scrutinizer happy | Joas Schilling | 2015-04-01 | 7 | -23/+16 |
| * | | | Adjust by/self filter aswell and fix tests | Joas Schilling | 2015-03-31 | 2 | -3/+3 |
| * | | | DeMorgan applied the wrong transformation | Joas Schilling | 2015-03-31 | 1 | -2/+1 |
| * | | | Move tag related code into a helper so we can test the query without a view | Joas Schilling | 2015-03-30 | 4 | -36/+416 |
| * | | | Use DI for the objects where possible | Joas Schilling | 2015-03-30 | 2 | -7/+27 |
| * | | | Add tests from getCurrentUserId() method and fix the constructor | Joas Schilling | 2015-03-30 | 1 | -1/+109 |
| * | | | Add a filter for favorites and allow limiting the all-list to favorites | Joas Schilling | 2015-03-30 | 1 | -2/+69 |
| * | | | Add logic for getting the user from the rss token to the Manager | Joas Schilling | 2015-03-30 | 3 | -2/+81 |
* | | | | Merge pull request #15448 from owncloud/occ-check-server-env-master | Morris Jobke | 2015-04-09 | 4 | -25/+79 |
|\ \ \ \ |
|
| * | | | | Adding check command to validate server environment - fixes #15429 | Thomas Müller | 2015-04-08 | 4 | -25/+79 |
| | |/ /
| |/| | |
|
* | | | | Merge pull request #15483 from owncloud/maintenance-refresh | Thomas Müller | 2015-04-08 | 2 | -2/+3 |
|\ \ \ \ |
|
| * | | | | Fix maintenance refresh interval | Morris Jobke | 2015-04-08 | 2 | -2/+3 |
* | | | | | Merge pull request #15490 from owncloud/remove-debug-logging | Morris Jobke | 2015-04-08 | 1 | -2/+0 |
|\ \ \ \ \ |
|
| * | | | | | remove unessesary logging of methods instantiation | Clark Tomlinson | 2015-04-08 | 1 | -2/+0 |
* | | | | | | Merge pull request #14120 from owncloud/dav-statcache | Morris Jobke | 2015-04-08 | 1 | -27/+143 |
|\ \ \ \ \ \ |
|
| * | | | | | | Added stat cache for DAV storage | Vincent Petry | 2015-03-26 | 1 | -27/+143 |
* | | | | | | | Merge pull request #15488 from owncloud/files-navigation-icons | Morris Jobke | 2015-04-08 | 27 | -14/+78 |
|\ \ \ \ \ \ \
| |_|/ / / / /
|/| | | | | | |
|
| * | | | | | | fix for IE8 | Morris Jobke | 2015-04-08 | 1 | -1/+1 |
| * | | | | | | add icons to files sidebar, fix shade, fix position of settings icon and text | Jan-Christoph Borchardt | 2015-04-08 | 27 | -13/+77 |
| * | | | | | | Fixing issue #15322 - showing Settings button next to gear icon | James Anslow | 2015-04-08 | 1 | -1/+1 |
* | | | | | | | Merge pull request #15481 from owncloud/enc_no_error_if_enc_is_disabled | Vincent Petry | 2015-04-08 | 1 | -5/+6 |
|\ \ \ \ \ \ \
| |_|_|/ / / /
|/| | | | | | |
|
| * | | | | | | don't throw exception if a file gets uploaded and encryption is disabled | Bjoern Schiessle | 2015-04-08 | 1 | -5/+6 |
|/ / / / / / |
|
* | | | | | | Merge pull request #15472 from owncloud/enc_backward_compatibility | Clark Tomlinson | 2015-04-08 | 3 | -9/+29 |
|\ \ \ \ \ \ |
|
| * | | | | | | read cipher from key header and always write a key header if a new private ke... | Bjoern Schiessle | 2015-04-08 | 3 | -9/+29 |
| |/ / / / / |
|
* | | | | | | Merge pull request #14987 from rullzer/ocs_password_fix2 | Morris Jobke | 2015-04-08 | 4 | -34/+341 |
|\ \ \ \ \ \ |
|
| * | | | | | | Fix unit test | Roeland Jago Douma | 2015-03-30 | 1 | -0/+4 |
| * | | | | | | No injections | Roeland Jago Douma | 2015-03-30 | 1 | -3/+7 |
| * | | | | | | OCS Fixes to allow setting of password without removing additional settings | Roeland Jago Douma | 2015-03-30 | 4 | -34/+333 |
* | | | | | | | Merge pull request #15469 from owncloud/fix/15463 | Lukas Reschke | 2015-04-08 | 3 | -6/+20 |
|\ \ \ \ \ \ \ |
|