Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | copy always file by file to encrypt/decrypt it if needed | Bjoern Schiessle | 2015-08-26 | 1 | -53/+8 | |
| * | | occ tool to encrypt all files | Bjoern Schiessle | 2015-08-26 | 3 | -2/+133 | |
* | | | Use certificates that expire in 10 years | Lukas Reschke | 2015-08-27 | 3 | -33/+48 | |
| |/ |/| | ||||||
* | | Merge pull request #17662 from owncloud/locking-db | Thomas Müller | 2015-08-26 | 2 | -0/+73 | |
|\ \ | ||||||
| * | | log a warning while trying to acquire a db lock from within a transaction | Robin Appelman | 2015-08-10 | 1 | -1/+1 | |
| * | | Fix db schema | Robin Appelman | 2015-08-03 | 1 | -1/+1 | |
| * | | Add database backend for high level locking | Robin Appelman | 2015-08-03 | 1 | -0/+43 | |
| * | | split off keeping track of acquire locks | Robin Appelman | 2015-08-03 | 1 | -0/+30 | |
* | | | Explicitly specify status code 200 as response code | Lukas Reschke | 2015-08-25 | 1 | -0/+4 | |
* | | | Merge pull request #18491 from owncloud/expire-token-after-12h-or-login | Lukas Reschke | 2015-08-24 | 1 | -7/+116 | |
|\ \ \ | ||||||
| * | | | Expire token after 12h and if user logged-in again | Lukas Reschke | 2015-08-22 | 1 | -7/+116 | |
* | | | | Merge pull request #18482 from owncloud/encrypt-session-data | Morris Jobke | 2015-08-24 | 3 | -0/+136 | |
|\ \ \ \ | ||||||
| * | | | | Handle failures gracefully, remove switch | Lukas Reschke | 2015-08-21 | 1 | -3/+4 | |
| * | | | | Add a session wrapper to encrypt the data before storing it on disk | Joas Schilling | 2015-08-21 | 3 | -0/+135 | |
| |/ / / | ||||||
* | | | | Merge pull request #18254 from owncloud/mitigate-breach | Morris Jobke | 2015-08-24 | 12 | -16/+130 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Add mitigation against BREACH | Lukas Reschke | 2015-08-14 | 12 | -16/+130 | |
* | | | | Merge pull request #18426 from owncloud/joblist-next-non-existing | Morris Jobke | 2015-08-21 | 1 | -0/+26 | |
|\ \ \ \ | ||||||
| * | | | | handle non existing job classes in $jobList->getNext | Robin Appelman | 2015-08-19 | 1 | -0/+26 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #18457 from owncloud/test-traits | Robin McCorkell | 2015-08-20 | 4 | -44/+127 | |
|\ \ \ \ | ||||||
| * | | | | add test mountprovider logic to a trait | Robin Appelman | 2015-08-20 | 2 | -31/+60 | |
| * | | | | allow moving common test logic into traits | Robin Appelman | 2015-08-20 | 3 | -14/+68 | |
* | | | | | Merge pull request #18372 from owncloud/issue-18358-object-type-and-id-for-ac... | Joas Schilling | 2015-08-20 | 1 | -1/+196 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Add test coverage for Activity Event and Manager | Joas Schilling | 2015-08-20 | 1 | -1/+196 | |
* | | | | | Merge pull request #18369 from owncloud/occ-log | Morris Jobke | 2015-08-20 | 2 | -0/+302 | |
|\ \ \ \ \ | ||||||
| * | | | | | Unit tests for occ log:* commands | Robin McCorkell | 2015-08-19 | 2 | -0/+302 | |
* | | | | | | Merge pull request #17434 from owncloud/update-showappnameonappupdate | Morris Jobke | 2015-08-20 | 1 | -0/+70 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Additions to update page | Vincent Petry | 2015-08-20 | 1 | -3/+6 | |
| * | | | | | | Display app names in update page for app updates | Vincent Petry | 2015-08-19 | 1 | -0/+67 | |
* | | | | | | | Merge pull request #18432 from owncloud/ext-backends.simple | Morris Jobke | 2015-08-19 | 1 | -21/+0 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Revert "Fix mounting wrapped storages resulting in many-layered wrapping" | Robin McCorkell | 2015-08-19 | 1 | -21/+0 | |
| | |_|/ / / | |/| | | | | ||||||
* / | | | | | Filter the objectstore password from the config list as well | Joas Schilling | 2015-08-19 | 1 | -0/+17 | |
|/ / / / / | ||||||
* | | | | | Move avatarcontroller towards Node Api | Roeland Jago Douma | 2015-08-18 | 1 | -11/+11 | |
* | | | | | Merge pull request #17182 from owncloud/user_ini_upload_size | Robin McCorkell | 2015-08-17 | 3 | -0/+202 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Unit test OC_Files::setUploadLimit() | Robin McCorkell | 2015-07-20 | 3 | -0/+202 | |
* | | | | | [test] more tests for UserController::setMailAddress | Morris Jobke | 2015-08-17 | 1 | -5/+13 | |
| |_|/ / |/| | | | ||||||
* | | | | Merge pull request #17982 from owncloud/appframework-sanitize-name | Thomas Müller | 2015-08-12 | 1 | -0/+19 | |
|\ \ \ \ | ||||||
| * | | | | Sanitize class names before registerService/query | Robin McCorkell | 2015-07-30 | 1 | -0/+19 | |
* | | | | | Merge pull request #18127 from owncloud/dav-request-tests | Thomas Müller | 2015-08-12 | 5 | -0/+405 | |
|\ \ \ \ \ | ||||||
| * | | | | | fix setup/teardown | Robin Appelman | 2015-08-11 | 1 | -11/+18 | |
| * | | | | | split out creating the sabre dav server to it's own factory | Robin Appelman | 2015-08-11 | 1 | -31/+13 | |
| * | | | | | add test framework for doing full request webdav tests | Robin Appelman | 2015-08-11 | 5 | -0/+416 | |
* | | | | | | Merge pull request #17852 from owncloud/register-alias-factory | Robin McCorkell | 2015-08-11 | 2 | -14/+47 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | add test for factories | Bernhard Posselt | 2015-07-25 | 2 | -14/+47 | |
* | | | | | | | Merge pull request #17868 from owncloud/x-forwarded-for | Thomas Müller | 2015-08-11 | 1 | -1/+48 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add setup check for reverse proxy header configuration | Robin McCorkell | 2015-08-10 | 1 | -1/+48 | |
* | | | | | | | | Merge pull request #17932 from owncloud/fix_move_files | Thomas Müller | 2015-08-11 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | make sure that we emit the hooks if a file gets moved from a subfolder to the... | Bjoern Schiessle | 2015-07-29 | 1 | -1/+3 | |
* | | | | | | | | | Merge pull request #17830 from owncloud/issue-17825-dont-silently-ignore-inva... | Joas Schilling | 2015-08-11 | 1 | -0/+43 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Throw a InvalidArgumentException when a consumer/extension is invalid | Joas Schilling | 2015-07-23 | 1 | -0/+43 | |
* | | | | | | | | | | Merge pull request #18096 from sualko/patch-1 | Morris Jobke | 2015-08-10 | 4 | -56/+56 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | |