Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 8.0.3RC3v8.0.3RC3 | Frank Karlitschek | 2015-04-15 | 1 | -2/+2 |
| | |||||
* | Merge pull request #15577 from owncloud/isolation-level-stable8 | Thomas Müller | 2015-04-16 | 1 | -0/+2 |
|\ | | | | | Using TRANSACTION_READ_COMMITTED | ||||
| * | Using TRANSACTION_READ_COMMITTED | Thomas Müller | 2015-04-13 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #15666 from ↵ | Morris Jobke | 2015-04-16 | 3 | -16/+4 |
|\ \ | | | | | | | | | | | | | owncloud/revert-15572-stable8-shares-properlyformatmountpoint Revert "[stable8] Properly add trailing slash to mount point" | ||||
| * | | Revert "[stable8] Properly add trailing slash to mount point" | Thomas Müller | 2015-04-16 | 3 | -16/+4 |
|/ / | |||||
* | | Merge pull request #15572 from owncloud/stable8-shares-properlyformatmountpoint | Jörn Friedrich Dreyer | 2015-04-16 | 3 | -4/+16 |
|\ \ | | | | | | | [stable8] Properly add trailing slash to mount point | ||||
| * | | Properly add trailing slash to mount point | Vincent Petry | 2015-04-13 | 3 | -4/+16 |
| |/ | | | | | | | | | Fixes resolving mount points when shared mount point's target name has the same prefix as the source name | ||||
* | | 8.0.3 RC2v8.0.3RC2 | Frank Karlitschek | 2015-04-15 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #15558 from owncloud/backport-15541 | Lukas Reschke | 2015-04-13 | 3 | -14/+16 |
|\ \ | |/ |/| | [stable8] Add "Reply-To" support for sharing notifications | ||||
| * | Add "Reply-To" support for sharing notifications | Lukas Reschke | 2015-04-12 | 3 | -14/+16 |
|/ | | | | Very hacky backport of https://github.com/owncloud/core/pull/15541 - I changed the code path to use OC_Mail instead the OCP pendant since I didn't want to modify the public API. (OCP\Util::sendMail() is anyways deprecated with 8.1) | ||||
* | Merge pull request #15539 from ↵ | Morris Jobke | 2015-04-10 | 1 | -1/+3 |
|\ | | | | | | | | | owncloud/stable8-fixRenameFailDeleteTargetKeepSource [stable8] Fix renameFailDeleteTargetKeepSource | ||||
| * | fixes #15326 | Jörn Friedrich Dreyer | 2015-04-10 | 1 | -1/+3 |
|/ | |||||
* | Merge pull request #15425 from owncloud/failing-stable8-tests | Thomas Müller | 2015-04-07 | 4 | -17/+29 |
|\ | | | | | Fix failing tests related to timezones on stable8 | ||||
| * | Select the timezone on the right timestamp and assert it | Joas Schilling | 2015-04-07 | 1 | -8/+11 |
| | | |||||
| * | When guessing the timezone, the offset might only be valid on a given timestamp | Joas Schilling | 2015-04-07 | 2 | -5/+14 |
| | | |||||
| * | Remove server timezone dependency from files list test | Joas Schilling | 2015-04-07 | 1 | -4/+4 |
|/ | |||||
* | Merge pull request #15422 from ↵ | Thomas Müller | 2015-04-07 | 2 | -2/+2 |
|\ | | | | | | | | | owncloud/backport-15383-insertifnotexists-exception-message Fix the exception messages | ||||
| * | Fix the exception messages | Joas Schilling | 2015-04-07 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #15378 from owncloud/issue/15377-fix-enable-for-group-stable8 | Morris Jobke | 2015-04-03 | 1 | -2/+2 |
|\ | | | | | Correctly split and join group list with | instead of , | ||||
| * | Correctly split and join group list with | instead of , | Joas Schilling | 2015-04-02 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #15302 from owncloud/update-3rdparty-stable8 | Morris Jobke | 2015-03-30 | 1 | -0/+0 |
|\ | | | | | update 3rdparty to match stable8 HEAD of repo | ||||
| * | update 3rdparty to match stable8 HEAD of repo | Morris Jobke | 2015-03-30 | 1 | -0/+0 |
|/ | |||||
* | Merge pull request #15275 from owncloud/fix-stable-8v8.0.3RC1 | Thomas Müller | 2015-03-27 | 1 | -1/+1 |
|\ | | | | | Increment version | ||||
| * | Increment version | Lukas Reschke | 2015-03-27 | 1 | -1/+1 |
|/ | | | Fixes https://github.com/owncloud/core/issues/15273 | ||||
* | This is RC1 and not RC | Frank Karlitschek | 2015-03-26 | 1 | -1/+1 |
| | |||||
* | 8.0.3 RC | Frank Karlitschek | 2015-03-26 | 1 | -2/+2 |
| | |||||
* | Merge pull request #15246 from owncloud/stable8-share-partfilepermissions | Morris Jobke | 2015-03-27 | 5 | -28/+225 |
|\ | | | | | [stable8] Fix share permission checks | ||||
| * | Fix share permission related unit tests | Vincent Petry | 2015-03-26 | 2 | -11/+15 |
| | | |||||
| * | Rename must be possible with update-only permission | Vincent Petry | 2015-03-26 | 1 | -17/+23 |
| | | | | | | | | and this as long as the rename is done within the same folder. | ||||
| * | Fix permission checks in Sabre connector | Vincent Petry | 2015-03-26 | 1 | -6/+15 |
| | | | | | | | | | | This fixes moving files in and out of shared folders with some exotic permission combinations. | ||||
| * | Reenable trashbin after failed rename | Vincent Petry | 2015-03-26 | 1 | -0/+16 |
| | | | | | | | | | | | | After a failed rename, the post_rename hook is not called. This quickfix makes sure the trashbin storage logic is reenabled also after a failed rename. | ||||
| * | Fix shared storage permission checks | Vincent Petry | 2015-03-26 | 2 | -4/+166 |
| | | |||||
* | | Merge pull request #15249 from owncloud/fix_group_share_oc8_backport | Morris Jobke | 2015-03-27 | 1 | -4/+5 |
|\ \ | | | | | | | also call generateTarget for group shares | ||||
| * | | also call generateTarget for group share to add the correct prefix if ↵ | Bjoern Schiessle | 2015-03-26 | 1 | -4/+5 |
| | | | | | | | | | | | | share_folder is defined in config.php | ||||
* | | | Merge pull request #15250 from owncloud/use_default_share_folder_oc8 | Morris Jobke | 2015-03-27 | 3 | -5/+20 |
|\ \ \ | | | | | | | | | always fall back to default share folder | ||||
| * | | | always fall back to default share folder | Bjoern Schiessle | 2015-03-26 | 3 | -5/+20 |
| |/ / | |||||
* | | | Merge pull request #14497 from owncloud/kill-substr-mssql-stable8 | Lukas Reschke | 2015-03-26 | 1 | -102/+0 |
|\ \ \ | |/ / |/| | | [stable8] Remove hacky Substring support for MSSQL | ||||
| * | | Remove hacky Substring support for MSSQL | Lukas Reschke | 2015-02-25 | 1 | -102/+0 |
| | | | | | | | | | | | | Substring() is not required for the core functionality and this allows us to get rid of a huge hack... | ||||
* | | | Merge pull request #15238 from owncloud/stable8-fileid-increment | Morris Jobke | 2015-03-26 | 7 | -1/+218 |
|\ \ \ | | | | | | | | | [stable8] SQLite autoincrement fix backport | ||||
| * | | | SQLite autoincrement fix backport | Vincent Petry | 2015-03-26 | 7 | -1/+218 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | Add custom sqlite platform to set auto increment Add repair step to fix SQLite autoincrement Force Doctrine to generate alter table SQL statements for SQLite to make sure the code from OCSqlitePlatform is triggered. | ||||
* | | | Merge pull request #14860 from owncloud/stable8-fix-sizepropagationwithshares | Morris Jobke | 2015-03-26 | 2 | -0/+112 |
|\ \ \ | |/ / |/| | | [stable8] Fix size propagation over shared storage boundary | ||||
| * | | Add unit test for size propagation across share boundaries | Vincent Petry | 2015-03-13 | 1 | -0/+90 |
| | | | |||||
| * | | Fix size propagation over shared storage boundary | Vincent Petry | 2015-03-13 | 1 | -0/+22 |
| | | | |||||
* | | | Merge pull request #15231 from owncloud/synchronize-php-setting | Lukas Reschke | 2015-03-26 | 2 | -0/+4 |
|\ \ \ | | | | | | | | | Synchronize PHP settings with master | ||||
| * | | | Synchronize PHP settings with master | Lukas Reschke | 2015-03-26 | 2 | -0/+4 |
| | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/15044 | ||||
* | | | | Merge pull request #15193 from owncloud/stable8-15145 | Vincent Petry | 2015-03-26 | 5 | -23/+130 |
|\ \ \ \ | |/ / / |/| | | | Stable8: 15145 | ||||
| * | | | when the path doesnt exist show a proper error page | Robin Appelman | 2015-03-25 | 1 | -0/+2 |
| | | | | |||||
| * | | | Properly catch whether a share is `null` | Lukas Reschke | 2015-03-25 | 5 | -23/+128 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Despite it's PHPDoc the function might return `null` which was not properly catched and thus in some situations the share was resolved to the sharing users root directory. To test this perform the following steps: * Share file in owncloud 7 (7.0.4.2) * Delete the parent folder of the shared file * The share stays is in the DB and the share via the sharelink is inaccessible. (which is good) * Upgrade to owncloud 8 (8.0.2) (This step is crucial. The bug is not reproduceable without upgrading from 7 to 8. It seems like the old tokens are handled different than the newer ones) * Optional Step: Logout, Reset Browser Session, etc. * Access the share via the old share url: almost empty page, but there is a dowload button which adds a "/download" to the URL. * Upon clicking, a download.zip is downloaded which contains EVERYTHING from the owncloud directory (of the user who shared the file) * No exception is thrown and no error is logged. This will add a check whether the share is a valid one and also adds unit tests to prevent further regressions in the future. Needs to be backported to ownCloud 8. Adding a proper clean-up of the orphaned shares is out-of-scope and would probably require some kind of FK or so. Fixes https://github.com/owncloud/core/issues/15097 | ||||
* | | | | Merge pull request #14914 from ↵ | Vincent Petry | 2015-03-26 | 12 | -121/+231 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/backport-14766-compare-array-insertifnotexists [Stable8] Backport 14766 compare array insertifnotexists | ||||
| * | | | | Also add a note that clob does not work in the compare array | Joas Schilling | 2015-03-16 | 4 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/appframework/db/db.php |