aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | add example themeJan-Christoph Borchardt2015-05-2213-7/+207
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #16563 from ↵Thomas Müller2015-05-261-5/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/revert-16562-revert-15203-revert-15201-webdav-ng-bugfix Revert "Revert "Revert "FIX for webdav.mediencenter.t-online.de"""
| * | | | | | | Revert "Revert "Revert "FIX for webdav.mediencenter.t-online.de"""Thomas Müller2015-05-261-5/+0
|/ / / / / / /
* | | | | | | Merge pull request #16562 from ↵Oliver Kohl D.Sc.2015-05-261-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/revert-15203-revert-15201-webdav-ng-bugfix FIX for webdav.mediencenter.t-online.de https://webdav.mediencenter.t-online.de returns invalid response code. e.g. {"reqId":"f9a1c394b98108e4e5ca62bf47829c64","remoteAddr":"81.189.45.224","app":"PHP","message":"Undefined offset: 2 at \/var\/www\/owncloud\/3rdparty\/sabre\/dav\/lib\/Sabre\/DAV\/Client.php#569","level":3,"time":"2015-03-25T18:25:48+00:00","method":"GET","url":"\/index.php\/apps\/files\/ajax\/getstoragestats.php?dir=External%2FT-Cloud%2FTests"} e.g. {"reqId":"3407d66672b3cef206b0af883e49bff4","remoteAddr":"46.74.125.245","app":"PHP","message":"Undefined index: {DAV:}getlastmodified at \/var\/www\/owncloud\/lib\/private\/files\/storage\/dav.php#563","level":3,"time":"2015-03-25T16:33:21+00:00"}
| * | | | | | | Revert "Revert "FIX for webdav.mediencenter.t-online.de""Oliver Kohl D.Sc2015-05-261-0/+5
|/ / / / / / /
* | | | | | | Merge pull request #16521 from owncloud/unbold-placeholder-imageVincent Petry2015-05-261-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | use normal font weight instead of bold for image placeholders
| * | | | | | | use normal font weight instead of bold for image placeholdersJan-Christoph Borchardt2015-05-221-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #16561 from owncloud/add-default-timeout-backBjörn Schießle2015-05-262-3/+80
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add connection timeout to default POST options
| * | | | | | | Add connection timeout to default POST optionsLukas Reschke2015-05-262-3/+80
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16560
* | | | | | | Merge pull request #16515 from owncloud/deprecate-useless-helper-classVincent Petry2015-05-262-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Deprecate useless helper class
| * | | | | | | Deprecate useless helper classLukas Reschke2015-05-212-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The helper class has no real reason anymore with 8.1.0 as we now have better public APIs. No need for an `IHelper` class like that from my opinion.
* | | | | | | | Merge pull request #16518 from owncloud/external-link-arrowVincent Petry2015-05-261-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | use arrow icon for external link to Apps dev docs, like in Help section
| * | | | | | | | use arrow icon for external link to Apps dev docs, like in Help sectionJan-Christoph Borchardt2015-05-221-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #16520 from owncloud/fix-float-spinner-positionVincent Petry2015-05-261-1/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix float spinner position
| * | | | | | | | fix float spinner positionJan-Christoph Borchardt2015-05-221-1/+4
| |/ / / / / / /
* | | | | | | | Merge pull request #16532 from owncloud/cors-no-cookie-authVincent Petry2015-05-264-13/+118
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Disallow cookie auth for cors requests
| * | | | | | | | disallow cookie auth for cors requestsBernhard Posselt2015-05-224-13/+118
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testing ... fixes fix test add php doc fix small mistake add another phpdoc remove not working cors annotations from files app
* | | | | | | | Merge pull request #16452 from owncloud/enc_ftp_uploadBjörn Schießle2015-05-263-12/+114
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | always write file, if fseek doesn't work we write the whole file
| * | | | | | | | flush() comments + perf optjknockaert2015-05-261-5/+7
| | | | | | | | |
| * | | | | | | | fix calculation of $count, $count is always 8129 so we need to check thisjknockaert2015-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | against the unencrypted file size
| * | | | | | | | test to simulate a non-seekable stream wrapperBjoern Schiessle2015-05-213-9/+102
| | | | | | | | |
| * | | | | | | | encrypted filesize calculation in flush()jknockaert2015-05-211-1/+8
| | | | | | | | |
* | | | | | | | | Merge pull request #16339 from owncloud/master-override-channelThomas Müller2015-05-263-2/+80
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow change update channel via public API
| * | | | | | | | | Test overriding channelVictor Dubiniuk2015-05-151-0/+47
| | | | | | | | | |
| * | | | | | | | | Allow change update channel via public APIVictor Dubiniuk2015-05-132-2/+33
| | | | | | | | | |
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-268-4/+18
| | | | | | | | | |
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-2512-10/+16
| | | | | | | | | |
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-2422-14/+252
| | | | | | | | | |
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-2326-2/+64
| | | | | | | | | |
* | | | | | | | | | Merge pull request #16536 from rullzer/unit_tests_16511Bernhard Posselt2015-05-221-0/+80
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Unit tests for #16511
| * | | | | | | | | | Unit tests for #16511Roeland Jago Douma2015-05-221-0/+80
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that password is updated on focusout of the password field or on pressing enter in the password field.
* | | | | | | | | | Merge pull request #16526 from owncloud/enc_fix_versions_webdav_uploadVincent Petry2015-05-223-2/+25
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | remove part file extension before we read a filekey
| * | | | | | | | | remove part file extension before we read a filekey to reuse a existing key ↵Bjoern Schiessle2015-05-223-2/+25
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | if possible, otherwise stuff like versioning will break
* | | | | | | | | Merge pull request #16493 from owncloud/cache-movewithcorrectmimetypeVincent Petry2015-05-222-8/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Get correct mimetype when moving and changing extension
| * | | | | | | | | Get correct mimetype when moving and changing extensionVincent Petry2015-05-212-8/+20
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue when restoring folders from trash cross-storage, as such folders have an extension ".d12345678". Fixes issue when moving folders between storages and at the same time changing their extension.
* | | | | | | | | Merge pull request #16516 from owncloud/fix-phpdoc-traitJoas Schilling2015-05-225-4/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix PHPDoc
| * | | | | | | | | Fix PHPDocLukas Reschke2015-05-225-4/+16
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Use correct parameters
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-2232-0/+82
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #16499 from owncloud/fix-phpdoc-annotationsLukas Reschke2015-05-211-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Fix PHPDoc :see_no_evil:
| * | | | | | | Fix PHPDoc :see_no_evil:Lukas Reschke2015-05-211-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | *sigh*
* | | | | | | Merge pull request #16473 from owncloud/occ_16221Joas Schilling2015-05-212-6/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | occ option to update all third party apps without disable
| * | | | | | | Skip disable3rdParty AppsSteffen Lindner2015-05-202-6/+31
| | |/ / / / / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-21136-98/+160
| | | | | | |
* | | | | | | Merge pull request #16469 from ↵Vincent Petry2015-05-201-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | oparoz/restore-minheight-for-single-public-previews Restore min-height for single previews
| * | | | | | Restore min-height for single previewsOlivier Paroz2015-05-201-0/+1
| | | | | | |
* | | | | | | Merge pull request #16322 from owncloud/trash-viewMorris Jobke2015-05-205-31/+125
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | dont go trough the view when moving to trash
| * | | | | | | add tests for copyFromStorage with same storageRobin Appelman2015-05-191-12/+25
| | | | | | | |
| * | | | | | | cleanup move/copy logic in trashRobin Appelman2015-05-191-20/+57
| | | | | | | |
| * | | | | | | use copy when doing a crossStorageCopy on the same storageRobin Appelman2015-05-192-3/+20
| | | | | | | |
| * | | | | | | adjust testRobin Appelman2015-05-181-1/+7
| | | | | | | |