summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 8.0.3RC3v8.0.3RC3Frank Karlitschek2015-04-151-2/+2
|
* Merge pull request #15577 from owncloud/isolation-level-stable8Thomas Müller2015-04-161-0/+2
|\ | | | | Using TRANSACTION_READ_COMMITTED
| * Using TRANSACTION_READ_COMMITTEDThomas Müller2015-04-131-0/+2
| |
* | Merge pull request #15666 from ↵Morris Jobke2015-04-163-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üller2015-04-163-16/+4
|/ /
* | Merge pull request #15572 from owncloud/stable8-shares-properlyformatmountpointJörn Friedrich Dreyer2015-04-163-4/+16
|\ \ | | | | | | [stable8] Properly add trailing slash to mount point
| * | Properly add trailing slash to mount pointVincent Petry2015-04-133-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.3RC2Frank Karlitschek2015-04-151-2/+2
| |
* | Merge pull request #15558 from owncloud/backport-15541Lukas Reschke2015-04-133-14/+16
|\ \ | |/ |/| [stable8] Add "Reply-To" support for sharing notifications
| * Add "Reply-To" support for sharing notificationsLukas Reschke2015-04-123-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 Jobke2015-04-101-1/+3
|\ | | | | | | | | owncloud/stable8-fixRenameFailDeleteTargetKeepSource [stable8] Fix renameFailDeleteTargetKeepSource
| * fixes #15326Jörn Friedrich Dreyer2015-04-101-1/+3
|/
* Merge pull request #15425 from owncloud/failing-stable8-testsThomas Müller2015-04-074-17/+29
|\ | | | | Fix failing tests related to timezones on stable8
| * Select the timezone on the right timestamp and assert itJoas Schilling2015-04-071-8/+11
| |
| * When guessing the timezone, the offset might only be valid on a given timestampJoas Schilling2015-04-072-5/+14
| |
| * Remove server timezone dependency from files list testJoas Schilling2015-04-071-4/+4
|/
* Merge pull request #15422 from ↵Thomas Müller2015-04-072-2/+2
|\ | | | | | | | | owncloud/backport-15383-insertifnotexists-exception-message Fix the exception messages
| * Fix the exception messagesJoas Schilling2015-04-072-2/+2
|/
* Merge pull request #15378 from owncloud/issue/15377-fix-enable-for-group-stable8Morris Jobke2015-04-031-2/+2
|\ | | | | Correctly split and join group list with | instead of ,
| * Correctly split and join group list with | instead of ,Joas Schilling2015-04-021-2/+2
|/
* Merge pull request #15302 from owncloud/update-3rdparty-stable8Morris Jobke2015-03-301-0/+0
|\ | | | | update 3rdparty to match stable8 HEAD of repo
| * update 3rdparty to match stable8 HEAD of repoMorris Jobke2015-03-301-0/+0
|/
* Merge pull request #15275 from owncloud/fix-stable-8v8.0.3RC1Thomas Müller2015-03-271-1/+1
|\ | | | | Increment version
| * Increment versionLukas Reschke2015-03-271-1/+1
|/ | | Fixes https://github.com/owncloud/core/issues/15273
* This is RC1 and not RCFrank Karlitschek2015-03-261-1/+1
|
* 8.0.3 RCFrank Karlitschek2015-03-261-2/+2
|
* Merge pull request #15246 from owncloud/stable8-share-partfilepermissionsMorris Jobke2015-03-275-28/+225
|\ | | | | [stable8] Fix share permission checks
| * Fix share permission related unit testsVincent Petry2015-03-262-11/+15
| |
| * Rename must be possible with update-only permissionVincent Petry2015-03-261-17/+23
| | | | | | | | and this as long as the rename is done within the same folder.
| * Fix permission checks in Sabre connectorVincent Petry2015-03-261-6/+15
| | | | | | | | | | This fixes moving files in and out of shared folders with some exotic permission combinations.
| * Reenable trashbin after failed renameVincent Petry2015-03-261-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 checksVincent Petry2015-03-262-4/+166
| |
* | Merge pull request #15249 from owncloud/fix_group_share_oc8_backportMorris Jobke2015-03-271-4/+5
|\ \ | | | | | | also call generateTarget for group shares
| * | also call generateTarget for group share to add the correct prefix if ↵Bjoern Schiessle2015-03-261-4/+5
| | | | | | | | | | | | share_folder is defined in config.php
* | | Merge pull request #15250 from owncloud/use_default_share_folder_oc8Morris Jobke2015-03-273-5/+20
|\ \ \ | | | | | | | | always fall back to default share folder
| * | | always fall back to default share folderBjoern Schiessle2015-03-263-5/+20
| |/ /
* | | Merge pull request #14497 from owncloud/kill-substr-mssql-stable8Lukas Reschke2015-03-261-102/+0
|\ \ \ | |/ / |/| | [stable8] Remove hacky Substring support for MSSQL
| * | Remove hacky Substring support for MSSQLLukas Reschke2015-02-251-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-incrementMorris Jobke2015-03-267-1/+218
|\ \ \ | | | | | | | | [stable8] SQLite autoincrement fix backport
| * | | SQLite autoincrement fix backportVincent Petry2015-03-267-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-sizepropagationwithsharesMorris Jobke2015-03-262-0/+112
|\ \ \ | |/ / |/| | [stable8] Fix size propagation over shared storage boundary
| * | Add unit test for size propagation across share boundariesVincent Petry2015-03-131-0/+90
| | |
| * | Fix size propagation over shared storage boundaryVincent Petry2015-03-131-0/+22
| | |
* | | Merge pull request #15231 from owncloud/synchronize-php-settingLukas Reschke2015-03-262-0/+4
|\ \ \ | | | | | | | | Synchronize PHP settings with master
| * | | Synchronize PHP settings with masterLukas Reschke2015-03-262-0/+4
| | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/15044
* | | | Merge pull request #15193 from owncloud/stable8-15145Vincent Petry2015-03-265-23/+130
|\ \ \ \ | |/ / / |/| | | Stable8: 15145
| * | | when the path doesnt exist show a proper error pageRobin Appelman2015-03-251-0/+2
| | | |
| * | | Properly catch whether a share is `null`Lukas Reschke2015-03-255-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 Petry2015-03-2612-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 arrayJoas Schilling2015-03-164-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/appframework/db/db.php