summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Fix the share mail notification when the item is in a folderJoas Schilling2015-05-081-0/+5
| | | | | |
* | | | | | Merge pull request #16110 from owncloud/stable8-backport-15510-and-15465Lukas Reschke2015-05-082-14/+27
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | [stable8] block cron.php and OCS API when in single user mode or maintenance mode
| * | | | | Fix singe user mode on public.php - take twoThomas Müller2015-05-061-1/+5
| | | | | |
| * | | | | Fix single user check in case no user is logged inThomas Müller2015-05-061-13/+19
| | | | | |
| * | | | | block webdav in single user modeRobin Appelman2015-05-061-0/+3
| | |_|/ / | |/| | |
* | | | | Don't depend on always_populate_raw_post_dataLukas Reschke2015-05-061-19/+0
| | | | |
* | | | | Don't display errors and log themLukas Reschke2015-05-061-5/+4
|/ / / / | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16014
* | / / Add use statementLukas Reschke2015-05-021-0/+1
| |/ / |/| | | | | | | | Just fixes the PHPDoc and also fixes #16011
* | | Merge pull request #15533 from owncloud/stable8-davclient-catchmoreexceptionsMorris Jobke2015-04-281-61/+36
|\ \ \ | | | | | | | | [stable8] Catch more exceptions when connecting to remote DAV server
| * | | Catch more exceptions when connecting to remote DAV serverVincent Petry2015-04-101-61/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added InvalidArgumentException to catch HTML parsing errors when XML was expected. Made convertSabreException more generic to be able to handle more exception cases.
* | | | Merge pull request #15609 from owncloud/stable8-share-donotreturntrashedfilesMorris Jobke2015-04-281-11/+48
|\ \ \ \ | | | | | | | | | | [stable8] Do not return shares for files outside "files"
| * | | | Do not return shares for files outside "files"Vincent Petry2015-04-141-11/+48
| | | | |
* | | | | Merge pull request #15672 from ↵Morris Jobke2015-04-281-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/revert-15666-revert-15572-stable8-shares-properlyformatmountpoint [stable8] Properly add trailing slash to mount point
| * | | | | Revert "Revert "[stable8] Properly add trailing slash to mount point""Morris Jobke2015-04-161-1/+3
| | | | | |
* | | | | | Merge pull request #15287 from dratini0/stable8Morris Jobke2015-04-281-1/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Backporting #14125 to stable8, as called for by @LukasReschke
| * | | | | Backporting #14125 to stable8, as called for by @LukasReschkedratini02015-03-271-1/+7
| | |_|_|/ | |/| | |
* | | | | 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
| | | | |
* | | | | Revert "[stable8] Properly add trailing slash to mount point"Thomas Müller2015-04-161-3/+1
| | | | |
* | | | | Merge pull request #15572 from owncloud/stable8-shares-properlyformatmountpointJörn Friedrich Dreyer2015-04-161-1/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | [stable8] Properly add trailing slash to mount point
| * | | | Properly add trailing slash to mount pointVincent Petry2015-04-131-1/+3
| |/ / / | | | | | | | | | | | | | | | | Fixes resolving mount points when shared mount point's target name has the same prefix as the source name
* / / / Add "Reply-To" support for sharing notificationsLukas Reschke2015-04-122-12/+14
|/ / / | | | | | | | | | 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)
* | / fixes #15326Jörn Friedrich Dreyer2015-04-101-1/+3
| |/ |/|
* | When guessing the timezone, the offset might only be valid on a given timestampJoas Schilling2015-04-072-5/+14
| |
* | Fix the exception messagesJoas Schilling2015-04-072-2/+2
|/
* Merge pull request #15246 from owncloud/stable8-share-partfilepermissionsMorris Jobke2015-03-271-6/+15
|\ | | | | [stable8] Fix share permission checks
| * 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.
* | 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 #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...
* | | SQLite autoincrement fix backportVincent Petry2015-03-264-0/+123
| |/ |/| | | | | | | | | | | | | | | 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 #15193 from owncloud/stable8-15145Vincent Petry2015-03-261-0/+43
|\ \ | | | | | | Stable8: 15145
| * | Properly catch whether a share is `null`Lukas Reschke2015-03-251-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2610-107/+105
|\ \ \ | | | | | | | | | | | | | | | | 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
| * | | The key is over configkey, user and app, not the valueJoas Schilling2015-03-161-1/+1
| | | | | | | | | | | | | | | | stupid me :(
| * | | Also use all keys for an empty array, just in caseJoas Schilling2015-03-162-2/+2
| | | |
| * | | Throw a RuntimeException in the cache aswellJoas Schilling2015-03-162-4/+9
| | | |
| * | | Fix doc blocks of insertIfNotExists() methodJoas Schilling2015-03-165-46/+40
| | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/appframework/db/db.php
| * | | let insertIfNotExist() throw the native DBALException - no need to hide the ↵Thomas Müller2015-03-167-52/+20
| | | | | | | | | | | | | | | | real exception
| * | | Get the id before using itJoas Schilling2015-03-161-1/+2
| | | |
| * | | Better save then sorryJoas Schilling2015-03-161-0/+2
| | | |
| * | | insertIfNotExists() for storage insertionJoas Schilling2015-03-161-3/+9
| | | |
| * | | Only check unique keys for the comparison on filecache insert & update otherwiseJoas Schilling2015-03-161-1/+6
| | | |
| * | | Allow specifying the compare-array for insertIfNotExists()Joas Schilling2015-03-167-19/+32
| | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/appframework/db/db.php
* | | | Merge pull request #15192 from owncloud/stable8-15153Lukas Reschke2015-03-262-0/+21
|\ \ \ \ | | | | | | | | | | Stable8: Add `getNonExistingName()` to the node api
| * | | | Add `getNonExistingName()` to the node apiRobin Appelman2015-03-252-0/+21
| | |/ / | |/| |
* | | | Merge pull request #15208 from owncloud/fix-15146-stable8Thomas Müller2015-03-261-0/+2
|\ \ \ \ | | | | | | | | | | Do not use APCu when apc.enabled is Off.
| * | | | Do not use APCu when apc.enabled is Off.Andreas Fischer2015-03-261-0/+2
| |/ / /