Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | occ script to disable encryption and to decrypt all files again | Bjoern Schiessle | 2015-09-15 | 15 | -4/+1482 |
* | Merge pull request #18368 from owncloud/version-retention | Lukas Reschke | 2015-09-15 | 5 | -7/+480 |
|\ | |||||
| * | Merge branch 'master' into version-retention | Lukas Reschke | 2015-09-15 | 13 | -171/+306 |
| |\ | |/ |/| | |||||
* | | Merge pull request #18915 from owncloud/node-getfoldercontents-use-view-logic | Robin Appelman | 2015-09-15 | 3 | -100/+18 |
|\ \ | |||||
| * | | Use the view logic for getFolderContent for the node api | Robin Appelman | 2015-09-08 | 3 | -100/+18 |
* | | | Merge pull request #17811 from owncloud/dav-lock-wide | Robin Appelman | 2015-09-15 | 8 | -68/+287 |
|\ \ \ | |||||
| * | | | allow hook cancel | Robin Appelman | 2015-09-14 | 1 | -4/+9 |
| * | | | fix chunking tests | Robin Appelman | 2015-09-14 | 1 | -0/+2 |
| * | | | use the correct path for cache updates when doing chunked assembly | Robin Appelman | 2015-09-14 | 1 | -7/+13 |
| * | | | also verify cache in dav upload tests | Robin Appelman | 2015-09-14 | 1 | -1/+21 |
| * | | | work directly on storages when doing a chunked upload assembly | Robin Appelman | 2015-09-14 | 2 | -57/+87 |
| * | | | handle notfound exceptions in lock plugin | Robin Appelman | 2015-09-14 | 1 | -1/+5 |
| * | | | adjust tests to handle before/after locking | Robin Appelman | 2015-09-14 | 1 | -5/+43 |
| * | | | wrap the entire put operation in a read lock | Robin Appelman | 2015-09-14 | 4 | -9/+98 |
| * | | | expose locking api in sabre connector | Robin Appelman | 2015-09-14 | 1 | -1/+26 |
* | | | | Merge pull request #19043 from owncloud/fix-php-doc-of-encrypt-all | Thomas Müller | 2015-09-15 | 2 | -3/+1 |
|\ \ \ \ | |||||
| * | | | | Function does return void | Lukas Reschke | 2015-09-15 | 2 | -3/+1 |
| | | | * | Follow PSR | Victor Dubiniuk | 2015-09-15 | 1 | -0/+0 |
| | | | * | Update options description | Victor Dubiniuk | 2015-09-15 | 1 | -7/+6 |
| | | | * | Add method docblock | Victor Dubiniuk | 2015-09-15 | 1 | -0/+4 |
| | | | * | Namespacing, reusing | Victor Dubiniuk | 2015-09-15 | 2 | -4/+11 |
| | | | * | Improvements | Victor Dubiniuk | 2015-09-15 | 4 | -18/+48 |
| | | | * | Add quota status to expiration check | Victor Dubiniuk | 2015-09-15 | 1 | -10/+10 |
| | | | * | Add versions obligation | Victor Dubiniuk | 2015-09-15 | 5 | -4/+437 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #18273 from owncloud/files-sidebar-toggle | Frank Karlitschek | 2015-09-15 | 1 | -9/+26 |
|\ \ \ \ | |||||
| * | | | | Fixed sidebar toggle entry | Vincent Petry | 2015-09-14 | 1 | -18/+26 |
| * | | | | Keep right sidebar open, add Details action | Vincent Petry | 2015-09-14 | 1 | -2/+11 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #19024 from owncloud/remove-get_temp_dir | Thomas Müller | 2015-09-15 | 2 | -9/+1 |
|\ \ \ \ | |||||
| * | | | | Remove get_temp_dir() | Robin McCorkell | 2015-09-15 | 2 | -9/+1 |
* | | | | | Merge pull request #19041 from owncloud/issue-19007-parameter-name | Thomas Müller | 2015-09-15 | 2 | -10/+10 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Fix parameter name to match the specs | Joas Schilling | 2015-09-15 | 2 | -10/+10 |
* | | | | | Merge pull request #18964 from owncloud/availability-integer | Thomas Müller | 2015-09-15 | 3 | -6/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Use integer for availability instead of bool | Robin McCorkell | 2015-09-15 | 3 | -6/+8 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #19039 from owncloud/setup-autoloader-earlier | Thomas Müller | 2015-09-15 | 1 | -1/+9 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Catch apps which have been removed manually | Lukas Reschke | 2015-09-15 | 1 | -1/+4 |
| * | | | | Define allowed app roots earlier | Lukas Reschke | 2015-09-15 | 1 | -1/+6 |
|/ / / / | |||||
* | | | | Merge pull request #19029 from owncloud/allow-tests-folder-in-autoloader | Thomas Müller | 2015-09-15 | 1 | -1/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Allow /tests folder in autoloader by default | Lukas Reschke | 2015-09-15 | 1 | -1/+2 |
|/ / / | |||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-15 | 10 | -0/+64 |
|/ / | |||||
* | | Merge pull request #18973 from owncloud/try-fixing-app-config-on-oracle | Thomas Müller | 2015-09-14 | 2 | -5/+21 |
|\ \ | |||||
| * | | Only check the "was updated/inserted" when not on Oracle... | Joas Schilling | 2015-09-14 | 1 | -2/+8 |
| * | | Do not compare the value on Oracle | Joas Schilling | 2015-09-14 | 1 | -3/+13 |
* | | | Merge pull request #18966 from owncloud/ext-remove-numeric-id | Lukas Reschke | 2015-09-14 | 1 | -67/+0 |
|\ \ \ | |||||
| * | | | Remove storing storage_id in mount.json | Robin McCorkell | 2015-09-10 | 1 | -67/+0 |
* | | | | Merge pull request #18982 from owncloud/fix_18878 | Lukas Reschke | 2015-09-14 | 2 | -3/+7 |
|\ \ \ \ | |||||
| * | | | | enforce loading icon in sidebar to be 32x32 | Georg Ehrke | 2015-09-11 | 2 | -3/+7 |
* | | | | | Merge pull request #19012 from owncloud/occ_encrypt_all_fix_name | Björn Schießle | 2015-09-14 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | use the same pattern for the command name like every other command | Bjoern Schiessle | 2015-09-14 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #19010 from owncloud/use-proper-web-root | Thomas Müller | 2015-09-14 | 1 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Use / instead of an empty string as cookie path | Lukas Reschke | 2015-09-14 | 1 | -1/+5 |
| |/ / / / |