Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | Return failed shipped responses over succedded shipped responses | tomneedham | 2013-11-14 | 1 | -3/+3 | |
| * | | | | | | | | Fix type in unit test | tomneedham | 2013-11-14 | 1 | -1/+1 | |
| * | | | | | | | | Return result object when only one successful response is returned | tomneedham | 2013-11-14 | 1 | -2/+2 | |
| * | | | | | | | | Update lib/private/api.php after merge conflict | tomneedham | 2013-11-14 | 1 | -1/+1 | |
| * | | | | | | | | Merge branch 'ocs_api_fix_success_code' into oc_api_tests | tomneedham | 2013-11-14 | 1 | -2/+13 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Pick any none 100 status code before defaulting to 100 | Tom Needham | 2013-11-13 | 1 | -2/+13 | |
| * | | | | | | | | | Merge branch 'master' into oc_api_tests | tomneedham | 2013-11-14 | 25 | -217/+531 | |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Add tests for OC_API::mergeResponses() | tomneedham | 2013-11-14 | 1 | -0/+159 | |
| * | | | | | | | | | Remove OC_App dependancy from OC_API::mergeResponses() | tomneedham | 2013-11-13 | 1 | -9/+12 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #5214 from owncloud/no_extra_slashes | Frank Karlitschek | 2013-11-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Don't double-slash filenames at the root. | ringmaster | 2013-10-08 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #5827 from owncloud/avoid_preview_errors | Thomas Müller | 2013-11-14 | 5 | -7/+12 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Use dedicated OC_Image loader methods | Thomas Tanghus | 2013-11-13 | 5 | -7/+12 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'master' of https://github.com/owncloud/corev6.0.0beta4 | Frank Karlitschek | 2013-11-13 | 17 | -140/+397 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge pull request #5805 from owncloud/shared-storage-copy-folderlist | Frank Karlitschek | 2013-11-13 | 1 | -59/+47 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
| | * | | | | | | | | Use View::copy and View::rename when copying or renaming files in the shared ... | Robin Appelman | 2013-11-11 | 1 | -59/+47 | |
| * | | | | | | | | | Merge pull request #5806 from owncloud/styles-fix-external_storage | Frank Karlitschek | 2013-11-13 | 2 | -0/+9 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Fix spacing issue for checkboxes, vertically center checkboxes on personal page | Morris Jobke | 2013-11-11 | 2 | -0/+9 | |
| | |/ / / / / / / / | ||||||
| * | | | | | | | | | Merge pull request #5809 from owncloud/fix5753 | Morris Jobke | 2013-11-13 | 5 | -53/+35 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | LDAP Wizard: make UI behaviour more consistent and more pleasant when determi... | Arthur Schiwon | 2013-11-11 | 2 | -7/+6 | |
| | * | | | | | | | | | LDAP Wizard: remove ugly whitespace where it should not be | Arthur Schiwon | 2013-11-11 | 1 | -2/+1 | |
| | * | | | | | | | | | LDAP Wizard: determine port without credentials. don't hide the port input field | Arthur Schiwon | 2013-11-11 | 3 | -13/+12 | |
| | * | | | | | | | | | LDAP Wizard: improve check for Agent DN and Credentials | Arthur Schiwon | 2013-11-11 | 1 | -26/+16 | |
| | * | | | | | | | | | LDAP Wizard: keep Base DN always visible | Arthur Schiwon | 2013-11-08 | 2 | -6/+1 | |
| * | | | | | | | | | | Merge pull request #5768 from owncloud/quota-workaroundwhenmissingrootsize-ho... | Morris Jobke | 2013-11-13 | 8 | -25/+303 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Now using HomeStorage for legacy home storage ids | Vincent Petry | 2013-11-12 | 4 | -6/+115 | |
| | * | | | | | | | | | | Now calling parent method when path is not root | Vincent Petry | 2013-11-12 | 1 | -16/+8 | |
| | * | | | | | | | | | | Do not use -1 as the size for the root folder of the home storage | Robin Appelman | 2013-11-12 | 5 | -19/+196 | |
| | | |_|_|_|/ / / / / | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #5831 from owncloud/files-charatissue | Morris Jobke | 2013-11-13 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | Fixed total dirs/files message hiding condition | Vincent Petry | 2013-11-13 | 1 | -3/+3 | |
| | | |_|_|/ / / / / | | |/| | | | | | | | ||||||
* | / | | | | | | | | beta 4 | Frank Karlitschek | 2013-11-13 | 1 | -2/+2 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #5447 from owncloud/fixing-5117-master | Vincent Petry | 2013-11-13 | 7 | -75/+132 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | rename fixPartialFilePath() to stripPartialFileExtension(), this name describ... | Bjoern Schiessle | 2013-11-12 | 4 | -12/+12 | |
| * | | | | | | | | missed some replacements... now tests should work | Bjoern Schiessle | 2013-11-12 | 1 | -13/+6 | |
| * | | | | | | | | fixing tests for the new part file handling | Bjoern Schiessle | 2013-11-12 | 5 | -42/+86 | |
| * | | | | | | | | let encryption app detect transfer id in path and handle it correctly | Bjoern Schiessle | 2013-11-11 | 3 | -36/+34 | |
| * | | | | | | | | make it possible to detect transferID part | Bjoern Schiessle | 2013-11-11 | 1 | -1/+1 | |
| * | | | | | | | | adding oc-mtime handling to chunked upload | Thomas Müller | 2013-10-21 | 1 | -0/+9 | |
| * | | | | | | | | chunked files are assembled into a part file on the target storage followed b... | Thomas Müller | 2013-10-21 | 1 | -3/+16 | |
* | | | | | | | | | Merge pull request #5822 from owncloud/delete_hooks_trash_and_versions | Morris Jobke | 2013-11-12 | 3 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | add trash bin and file versions delete hooks in OC::registerPreviewHooks | Georg Ehrke | 2013-11-12 | 1 | -0/+2 | |
| * | | | | | | | | implement delete hooks in file versions lib | Georg Ehrke | 2013-11-12 | 1 | -0/+3 | |
| * | | | | | | | | replace $path with '/files_trashbin/files/' . $file | Georg Ehrke | 2013-11-12 | 1 | -1/+1 | |
| * | | | | | | | | add delete hook for trash bin app | Georg Ehrke | 2013-11-12 | 1 | -0/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #5810 from owncloud/disbaledtextareas | Morris Jobke | 2013-11-12 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | new line for css rule | Morris Jobke | 2013-11-12 | 1 | -1/+2 | |
| * | | | | | | | | Disabled textareas should look like they are disabled | Arthur Schiwon | 2013-11-11 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #5816 from Wikinaut/patch-1 | Thomas Müller | 2013-11-12 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Update config.sample.php | Wikinaut | 2013-11-12 | 1 | -1/+5 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #5804 from owncloud/files-selectionsummary | Morris Jobke | 2013-11-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | |