Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Enforce string as passed type | Lukas Reschke | 2015-04-09 | 1 | -1/+13 | |
|/ / | ||||||
* | | 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 | 4 | -5/+471 | |
|\ \ \ | ||||||
| * | | | Make scrutinizer happy | Joas Schilling | 2015-04-01 | 2 | -2/+2 | |
| * | | | 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 a filter for favorites and allow limiting the all-list to favorites | Joas Schilling | 2015-03-30 | 1 | -2/+69 | |
* | | | | Merge pull request #15488 from owncloud/files-navigation-icons | Morris Jobke | 2015-04-08 | 14 | -3/+62 | |
|\ \ \ \ | ||||||
| * | | | | 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 | 14 | -2/+61 | |
| * | | | | Fixing issue #15322 - showing Settings button next to gear icon | James Anslow | 2015-04-08 | 1 | -1/+1 | |
* | | | | | 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 | 1 | -34/+9 | |
|\ \ \ \ \ | ||||||
| * | | | | | OCS Fixes to allow setting of password without removing additional settings | Roeland Jago Douma | 2015-03-30 | 1 | -34/+9 | |
* | | | | | | Merge pull request #15469 from owncloud/fix/15463 | Lukas Reschke | 2015-04-08 | 3 | -6/+20 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix language level incompatibilties | Lukas Reschke | 2015-04-08 | 3 | -6/+20 | |
* | | | | | | | Merge pull request #15464 from owncloud/fixmasterunittests | Vincent Petry | 2015-04-08 | 2 | -17/+2 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Replace originalStorage in tests with a proper teardown | Vincent Petry | 2015-04-08 | 2 | -17/+2 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge pull request #15443 from owncloud/encryption-user-hook-tests | Thomas Müller | 2015-04-08 | 1 | -0/+217 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | adding test for user hooks | Clark Tomlinson | 2015-04-07 | 1 | -0/+217 | |
| |/ / / / | ||||||
* / / / / | fix function call | Bjoern Schiessle | 2015-04-08 | 1 | -2/+1 | |
|/ / / / | ||||||
* | | / | fixing license headers - encryption code related | Thomas Müller | 2015-04-07 | 27 | -86/+243 | |
| |_|/ |/| | | ||||||
* | | | fixing unit test execution related to trashbin | Thomas Müller | 2015-04-07 | 1 | -1/+1 | |
* | | | adding user setup test and adding 4 tests to keymanager | Clark Tomlinson | 2015-04-07 | 2 | -13/+144 | |
* | | | adding recoverFileTest | Clark Tomlinson | 2015-04-07 | 1 | -2/+43 | |
* | | | adding recovery tests | Clark Tomlinson | 2015-04-07 | 1 | -0/+224 | |
* | | | PHPDoc cleanup - clean code \o/ | Thomas Müller | 2015-04-07 | 2 | -21/+18 | |
* | | | userRecovery() was replaced by setRecoveryForUser() | Bjoern Schiessle | 2015-04-07 | 2 | -17/+0 | |
* | | | fix versions tests | Bjoern Schiessle | 2015-04-07 | 1 | -0/+6 | |
* | | | remove unused code | Bjoern Schiessle | 2015-04-07 | 1 | -1/+0 | |
* | | | fix versions download and previews | Bjoern Schiessle | 2015-04-07 | 2 | -3/+94 | |
* | | | reset init status before login | Bjoern Schiessle | 2015-04-07 | 1 | -1/+7 | |
* | | | cleanup | Thomas Müller | 2015-04-07 | 3 | -29/+15 | |
* | | | fix re-shares with encryption | Bjoern Schiessle | 2015-04-07 | 1 | -1/+1 | |
* | | | store init status per user | Bjoern Schiessle | 2015-04-07 | 1 | -5/+6 | |
* | | | use loginHelper from base class | Bjoern Schiessle | 2015-04-07 | 1 | -11/+11 | |
* | | | reset storage for each unit test | Bjoern Schiessle | 2015-04-07 | 2 | -1/+14 | |
* | | | fixing unit test execution | Thomas Müller | 2015-04-07 | 3 | -47/+5 | |
* | | | adding util test and reducing keymanager instances to one in test | Clark Tomlinson | 2015-04-07 | 2 | -108/+161 | |
* | | | add more descriptive message to the exception, will be displayed to the user | Bjoern Schiessle | 2015-04-07 | 1 | -1/+1 | |
* | | | remove encryption specific code from files app | Bjoern Schiessle | 2015-04-07 | 3 | -21/+0 | |
* | | | add priority to trashbin storage wrapper so that he is always on top | Bjoern Schiessle | 2015-04-07 | 1 | -1/+1 | |
* | | | cleaning up exception mess | Thomas Müller | 2015-04-07 | 7 | -10/+44 | |
* | | | work arround to make sure that shares are initialized only once | Bjoern Schiessle | 2015-04-07 | 1 | -2/+8 |