summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
...
* | | Enforce string as passed typeLukas Reschke2015-04-091-1/+13
|/ /
* | 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-094-5/+471
|\ \ \
| * | | Make scrutinizer happyJoas Schilling2015-04-012-2/+2
| * | | 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 a filter for favorites and allow limiting the all-list to favoritesJoas Schilling2015-03-301-2/+69
* | | | Merge pull request #15488 from owncloud/files-navigation-iconsMorris Jobke2015-04-0814-3/+62
|\ \ \ \
| * | | | 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-0814-2/+61
| * | | | Fixing issue #15322 - showing Settings button next to gear iconJames Anslow2015-04-081-1/+1
* | | | | 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-081-34/+9
|\ \ \ \ \
| * | | | | OCS Fixes to allow setting of password without removing additional settingsRoeland Jago Douma2015-03-301-34/+9
* | | | | | Merge pull request #15469 from owncloud/fix/15463Lukas Reschke2015-04-083-6/+20
|\ \ \ \ \ \
| * | | | | | Fix language level incompatibiltiesLukas Reschke2015-04-083-6/+20
* | | | | | | Merge pull request #15464 from owncloud/fixmasterunittestsVincent Petry2015-04-082-17/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Replace originalStorage in tests with a proper teardownVincent Petry2015-04-082-17/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #15443 from owncloud/encryption-user-hook-testsThomas Müller2015-04-081-0/+217
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | adding test for user hooksClark Tomlinson2015-04-071-0/+217
| |/ / / /
* / / / / fix function callBjoern Schiessle2015-04-081-2/+1
|/ / / /
* | | / fixing license headers - encryption code relatedThomas Müller2015-04-0727-86/+243
| |_|/ |/| |
* | | fixing unit test execution related to trashbinThomas Müller2015-04-071-1/+1
* | | adding user setup test and adding 4 tests to keymanagerClark Tomlinson2015-04-072-13/+144
* | | adding recoverFileTestClark Tomlinson2015-04-071-2/+43
* | | adding recovery testsClark Tomlinson2015-04-071-0/+224
* | | PHPDoc cleanup - clean code \o/Thomas Müller2015-04-072-21/+18
* | | userRecovery() was replaced by setRecoveryForUser()Bjoern Schiessle2015-04-072-17/+0
* | | fix versions testsBjoern Schiessle2015-04-071-0/+6
* | | remove unused codeBjoern Schiessle2015-04-071-1/+0
* | | fix versions download and previewsBjoern Schiessle2015-04-072-3/+94
* | | reset init status before loginBjoern Schiessle2015-04-071-1/+7
* | | cleanupThomas Müller2015-04-073-29/+15
* | | fix re-shares with encryptionBjoern Schiessle2015-04-071-1/+1
* | | store init status per userBjoern Schiessle2015-04-071-5/+6
* | | use loginHelper from base classBjoern Schiessle2015-04-071-11/+11
* | | reset storage for each unit testBjoern Schiessle2015-04-072-1/+14
* | | fixing unit test executionThomas Müller2015-04-073-47/+5
* | | adding util test and reducing keymanager instances to one in testClark Tomlinson2015-04-072-108/+161
* | | add more descriptive message to the exception, will be displayed to the userBjoern Schiessle2015-04-071-1/+1
* | | remove encryption specific code from files appBjoern Schiessle2015-04-073-21/+0
* | | add priority to trashbin storage wrapper so that he is always on topBjoern Schiessle2015-04-071-1/+1
* | | cleaning up exception messThomas Müller2015-04-077-10/+44
* | | work arround to make sure that shares are initialized only onceBjoern Schiessle2015-04-071-2/+8