Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | Merge branch 'master' into dont-add-requestheaders-for-cross-domain-requests | Lukas Reschke | 2015-09-15 | 5 | -8/+19 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Disable automatic evaluation of responses | Lukas Reschke | 2015-09-15 | 1 | -0/+14 | |
| * | | | | | | | | | Do not add sensitive request headers for cross domain requests | Lukas Reschke | 2015-09-15 | 1 | -3/+5 | |
* | | | | | | | | | | Merge pull request #18979 from owncloud/sidebare-preview-fixes | Thomas Müller | 2015-09-16 | 4 | -48/+83 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | fix filename display in sidebar, fix #18981 | Jan-Christoph Borchardt | 2015-09-15 | 1 | -0/+3 | |
| * | | | | | | | | | | fix small mimetype icons | Robin Appelman | 2015-09-15 | 1 | -3/+3 | |
| * | | | | | | | | | | recognize eps, psd and illustrator as image | Robin Appelman | 2015-09-15 | 1 | -1/+7 | |
| * | | | | | | | | | | crop to the center for landscape images | Robin Appelman | 2015-09-15 | 1 | -1/+5 | |
| * | | | | | | | | | | Various thumbnail fixes | Robin Appelman | 2015-09-15 | 1 | -44/+62 | |
| * | | | | | | | | | | Fix path for fileinfomodel in subdirectories | Robin Appelman | 2015-09-15 | 1 | -1/+1 | |
| * | | | | | | | | | | normal margins for portrait previews | Robin Appelman | 2015-09-15 | 1 | -0/+4 | |
* | | | | | | | | | | | Merge pull request #18938 from owncloud/occ_decrypt_all2 | Thomas Müller | 2015-09-16 | 15 | -4/+1482 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | occ script to disable encryption and to decrypt all files again | Bjoern Schiessle | 2015-09-15 | 15 | -4/+1482 | |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #19052 from owncloud/revert-14856-remote_avatars | Thomas Müller | 2015-09-16 | 2 | -22/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Revert "Allow Remote avatars" | Thomas Müller | 2015-09-15 | 2 | -22/+13 | |
| | |_|_|_|/ / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | 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 | |
|/ / / / / / / / |