| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #14925 from owncloud/ext-mountoptions-ui | Robin McCorkell | 2015-03-26 | 1 | -1/+1 |
| |\ | | | | | Mount options GUI for external storage | ||||
| | * | Make sure mountOptions keep their data type | Vincent Petry | 2015-03-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | str_replace for $user substitution was converting the data type of mountOptions to string. This fix prevents this to happen by making sure only strings are processed by substitution. Also added a int conversion when reading the watcher policy | ||||
| * | | Merge pull request #13802 from owncloud/share-partfilepermissions | Morris Jobke | 2015-03-26 | 1 | -6/+15 |
| |\ \ | | | | | | | Fix share permission checks | ||||
| | * | | Fix permission checks in Sabre connector | Vincent Petry | 2015-03-19 | 1 | -6/+15 |
| | | | | | | | | | | | | | | | | This fixes moving files in and out of shared folders with some exotic permission combinations. | ||||
| * | | | Merge pull request #14488 from owncloud/enhancement/security/inline-disposition | Morris Jobke | 2015-03-26 | 1 | -0/+19 |
| |\ \ \ | | | | | | | | | Serve all files with a Content-Disposition of 'attachment' via WebDAV | ||||
| | * | | | Remove unneeded argument | Lukas Reschke | 2015-03-26 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Serve all files with a Content-Disposition of 'attachment' via WebDAV | Lukas Reschke | 2015-03-26 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As an additional security hardening it's sensible to serve these files with a Content-Disposition of 'attachment'. Currently they are served 'inline' and get a "secure mimetype" assigned in case of potential dangerous files. To test this change ensure that: - [ ] Syncing with the Desktop client still works - [ ] Syncing with the Android client still works - [ ] Syncing with the iOS client still works I verified that the 1.8 OS X and iOS client still work with this change. | ||||
| * | | | | Merge pull request #15234 from owncloud/encryption2_core | Thomas Müller | 2015-03-26 | 16 | -2/+2244 |
| |\ \ \ \ | | | | | | | | | | | core part of encryption 2.0 | ||||
| | * | | | | implement basic encryption functionallity in core to enable multiple ↵ | Bjoern Schiessle | 2015-03-26 | 16 | -2/+2244 |
| | | | | | | | | | | | | | | | | | | | | | encryption modules | ||||
| * | | | | | Merge pull request #14399 from owncloud/ignore-empty-plurals | Lukas Reschke | 2015-03-26 | 2 | -21/+3 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Ignore empty plurals just like with singulars | ||||
| | * | | | | Revert "Correctly fallback to english, if the plural case is not translated" | Joas Schilling | 2015-02-20 | 2 | -21/+3 |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit cbad5c998b260040523ac8e6a2797591d0086938. | ||||
| * | | | | | Merge pull request #15129 from owncloud/version-command-bus | Lukas Reschke | 2015-03-26 | 3 | -3/+16 |
| |\ \ \ \ \ | | | | | | | | | | | | | expire versions in a background command | ||||
| | * | | | | | check limit of serialized command in unit tests | Robin Appelman | 2015-03-26 | 1 | -0/+3 |
| | | | | | | | |||||
| | * | | | | | ensure commands can be serialized in unit tests | Robin Appelman | 2015-03-26 | 1 | -1/+4 |
| | | | | | | | |||||
| | * | | | | | Handle exceptions thrown during hooks when running unit tests | Robin Appelman | 2015-03-26 | 1 | -0/+3 |
| | | | | | | | |||||
| | * | | | | | Force test cases using background commands to handle setting up the filesystem | Robin Appelman | 2015-03-26 | 2 | -2/+6 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #15232 from owncloud/remove-arg-separator-magic | Lukas Reschke | 2015-03-26 | 1 | -1/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove custom `arg_separator.output` | ||||
| | * | | | | | | Remove custom `arg_separator.output` | Lukas Reschke | 2015-03-26 | 1 | -1/+0 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This seems unrequired nowadays and like a legacy fragment. It should be safe to remove. Fixes https://github.com/owncloud/core/issues/14782 | ||||
| * | | | | | | Merge pull request #14665 from owncloud/fileid-increment | Morris Jobke | 2015-03-26 | 4 | -0/+123 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | SQLite autoincrement test | ||||
| | * | | | | | | Add repair step to fix SQLite autoincrement | Vincent Petry | 2015-03-26 | 2 | -0/+87 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Force Doctrine to generate alter table SQL statements for SQLite to make sure the code from OCSqlitePlatform is triggered. | ||||
| | * | | | | | | Rename platform | Robin Appelman | 2015-03-25 | 2 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Add custom sqlite platform to set auto increment | Robin Appelman | 2015-03-25 | 2 | -0/+36 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #14495 from owncloud/update-mailmap-01 | Thomas Müller | 2015-03-26 | 473 | -3403/+8997 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Updating .mailmap | ||||
| | * | | | | | | Update license headers | Jenkins for ownCloud | 2015-03-26 | 473 | -3403/+8997 |
| | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | | Merge pull request #15224 from owncloud/issue/15191-app-code-checker-error-list | Joas Schilling | 2015-03-26 | 1 | -2/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Correctly only send the errors of the current file to the event | ||||
| | * | | | | | | Correctly only send the errors of the current file to the event | Joas Schilling | 2015-03-26 | 1 | -2/+3 |
| | | | | | | | | |||||
| * | | | | | | | Revert "adding OC-ETag header" | Vincent Petry | 2015-03-26 | 2 | -20/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 30ee8b6f998b4b2e27da92b3adcdbc4683d3bcde. | ||||
| * | | | | | | | Revert "adding unit tests" | Vincent Petry | 2015-03-26 | 1 | -2/+5 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | This reverts commit 8d327c94a844804d0e7af057866e552bd5aafd17. | ||||
| * | | | | | | Merge pull request #15168 from owncloud/oc-etag-master | Vincent Petry | 2015-03-26 | 2 | -2/+17 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | adding OC-ETag header | ||||
| | * | | | | | | adding unit tests | Thomas Müller | 2015-03-26 | 1 | -5/+2 |
| | | | | | | | | |||||
| | * | | | | | | adding OC-ETag header | Thomas Müller | 2015-03-24 | 2 | -2/+20 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #14125 from dratini0/master | Lukas Reschke | 2015-03-26 | 1 | -1/+7 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | [nginx] Extending X-Accel-Redirect support | ||||
| | * | | | | | | Removed simplified X-accel-redirect even further | dratini0 | 2015-03-23 | 1 | -6/+1 |
| | | | | | | | | |||||
| | * | | | | | | Changed the disputed while loop to a single if. | dratini0 | 2015-03-23 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Extending the X-accel redirect functionality with a more scalable approach. | dratini0 | 2015-02-11 | 1 | -1/+10 |
| | | | | | | | | |||||
| | * | | | | | | Revert "Fix: X-Accel-Redirect did not support custom data dir and local mounts" | dratini0 | 2015-02-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f2075f803fc59918cc20071cf174d6b5f81f5eed. | ||||
| | * | | | | | | Revert "removed a little duplication" | dratini0 | 2015-02-11 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 31970ee7409ff2ed303b728ea4fd6f8d10302649. | ||||
| * | | | | | | | Merge pull request #15195 from owncloud/reanimate-add-guzzle | Morris Jobke | 2015-03-26 | 14 | -174/+812 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add wrapper for Guzzle | ||||
| | * | | | | | | | Add wrapper for Guzzle | Lukas Reschke | 2015-03-25 | 14 | -174/+812 |
| | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | | Merge pull request #15194 from owncloud/fix-15146 | Thomas Müller | 2015-03-26 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Do not use APCu when apc.enabled is Off. | ||||
| | * | | | | | | | Do not use APCu when apc.enabled is Off. | Andreas Fischer | 2015-03-25 | 1 | -0/+2 |
| | |/ / / / / / | |||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-26 | 2 | -0/+30 |
| | | | | | | | | |||||
| * | | | | | | | Revert "FIX for webdav.mediencenter.t-online.de" | Morris Jobke | 2015-03-26 | 1 | -5/+0 |
| | | | | | | | | |||||
| * | | | | | | | FIX for webdav.mediencenter.t-online.de | Oliver Kohl D.Sc. | 2015-03-25 | 1 | -0/+5 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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"} | ||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-25 | 8 | -0/+18 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #15171 from owncloud/sabre-logforbiddenasdebug | Thomas Müller | 2015-03-24 | 1 | -0/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Log forbidden in debug level | ||||
| | * | | | | | | Log forbidden in debug level | Vincent Petry | 2015-03-24 | 1 | -0/+3 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #14949 from owncloud/sabre-2.1.3 | Lukas Reschke | 2015-03-24 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Update sabre-2.1.3 thirdparty submodule | ||||
| | * | | | | | | Fix Principal connector override | Vincent Petry | 2015-03-17 | 1 | -1/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #15153 from owncloud/uniquename-node | Lukas Reschke | 2015-03-24 | 2 | -0/+21 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Add `getNonExistingName()` to the node api | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |