summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15499 from owncloud/admin-hintsJan-Christoph Borchardt2015-04-095-0/+18
|\
| * add admin documentation hints to Federated Cloud Sharing and cronJan-Christoph Borchardt2015-04-095-0/+18
* | Merge pull request #15497 from owncloud/enforce-type-securityLukas Reschke2015-04-096-24/+41
|\ \ | |/ |/|
| * Fix PHPDocLukas Reschke2015-04-095-22/+20
| * Fix code styleLukas Reschke2015-04-091-1/+8
| * Enforce string as passed typeLukas Reschke2015-04-091-1/+13
|/
* Merge pull request #15314 from owncloud/app-categories-15274Lukas Reschke2015-04-0920-267/+1719
|\
| * Add JS unit test for sortingLukas Reschke2015-04-081-0/+54
| * Reference `$(this)` insteadLukas Reschke2015-04-081-1/+1
| * Fix wordingLukas Reschke2015-04-082-2/+2
| * Fix PHPDocLukas Reschke2015-04-071-1/+3
| * Deduplicate codeLukas Reschke2015-04-071-44/+31
| * apps mgmt: style experimental apps section, small design fixesJan-Christoph Borchardt2015-04-072-9/+21
| * app mgmt app level design enhancementsJan-Christoph Borchardt2015-04-074-36/+39
| * Make user names clickableLukas Reschke2015-04-033-0/+7
| * Add experimental applications switchLukas Reschke2015-04-0318-246/+1633
* | Merge pull request #14676 from owncloud/deleteorphanedsharesMorris Jobke2015-04-093-0/+222
|\ \
| * | Disable trashbin when testing orphaned shares deletion jobVincent Petry2015-04-081-0/+17
| * | Added FIXME about registering jobs in apps.phpVincent Petry2015-04-081-0/+2
| * | Delete orphaned shares in a background jobVincent Petry2015-04-083-0/+203
* | | Merge pull request #15196 from owncloud/limit-file-activities-to-favoritesMorris Jobke2015-04-0911-12/+658
|\ \ \
| * | | Make scrutinizer happyJoas Schilling2015-04-017-23/+16
| * | | Adjust by/self filter aswell and fix testsJoas Schilling2015-03-312-3/+3
| * | | DeMorgan applied the wrong transformationJoas Schilling2015-03-311-2/+1
| * | | Move tag related code into a helper so we can test the query without a viewJoas Schilling2015-03-304-36/+416
| * | | Use DI for the objects where possibleJoas Schilling2015-03-302-7/+27
| * | | Add tests from getCurrentUserId() method and fix the constructorJoas Schilling2015-03-301-1/+109
| * | | Add a filter for favorites and allow limiting the all-list to favoritesJoas Schilling2015-03-301-2/+69
| * | | Add logic for getting the user from the rss token to the ManagerJoas Schilling2015-03-303-2/+81
* | | | Merge pull request #15448 from owncloud/occ-check-server-env-masterMorris Jobke2015-04-094-25/+79
|\ \ \ \
| * | | | Adding check command to validate server environment - fixes #15429Thomas Müller2015-04-084-25/+79
| | |/ / | |/| |
* | | | Merge pull request #15483 from owncloud/maintenance-refreshThomas Müller2015-04-082-2/+3
|\ \ \ \
| * | | | Fix maintenance refresh intervalMorris Jobke2015-04-082-2/+3
* | | | | Merge pull request #15490 from owncloud/remove-debug-loggingMorris Jobke2015-04-081-2/+0
|\ \ \ \ \
| * | | | | remove unessesary logging of methods instantiationClark Tomlinson2015-04-081-2/+0
* | | | | | Merge pull request #14120 from owncloud/dav-statcacheMorris Jobke2015-04-081-27/+143
|\ \ \ \ \ \
| * | | | | | Added stat cache for DAV storageVincent Petry2015-03-261-27/+143
* | | | | | | Merge pull request #15488 from owncloud/files-navigation-iconsMorris Jobke2015-04-0827-14/+78
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | fix for IE8Morris Jobke2015-04-081-1/+1
| * | | | | | add icons to files sidebar, fix shade, fix position of settings icon and textJan-Christoph Borchardt2015-04-0827-13/+77
| * | | | | | Fixing issue #15322 - showing Settings button next to gear iconJames Anslow2015-04-081-1/+1
* | | | | | | Merge pull request #15481 from owncloud/enc_no_error_if_enc_is_disabledVincent Petry2015-04-081-5/+6
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | don't throw exception if a file gets uploaded and encryption is disabledBjoern Schiessle2015-04-081-5/+6
|/ / / / / /
* | | | | | Merge pull request #15472 from owncloud/enc_backward_compatibilityClark Tomlinson2015-04-083-9/+29
|\ \ \ \ \ \
| * | | | | | read cipher from key header and always write a key header if a new private ke...Bjoern Schiessle2015-04-083-9/+29
| |/ / / / /
* | | | | | Merge pull request #14987 from rullzer/ocs_password_fix2Morris Jobke2015-04-084-34/+341
|\ \ \ \ \ \
| * | | | | | Fix unit testRoeland Jago Douma2015-03-301-0/+4
| * | | | | | No injectionsRoeland Jago Douma2015-03-301-3/+7
| * | | | | | OCS Fixes to allow setting of password without removing additional settingsRoeland Jago Douma2015-03-304-34/+333
* | | | | | | Merge pull request #15469 from owncloud/fix/15463Lukas Reschke2015-04-083-6/+20
|\ \ \ \ \ \ \