summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #20060 from owncloud/cache-move-final-update-transactionRobin Appelman2015-10-291-2/+6
|\ | | | | include the final update in the transaction when moving a folder in the cache
| * include the final update in the transaction when moving a folder in the cacheRobin Appelman2015-10-291-2/+6
| |
* | Merge pull request #19592 from owncloud/availability-root-always-existsThomas Müller2015-10-291-0/+3
|\ \ | |/ |/| The root of a storage always exists
| * The root of a storage always existsRobin Appelman2015-10-291-0/+3
| |
* | Merge pull request #19869 from owncloud/cache-adjustcurrentmtimeonrenameThomas Müller2015-10-292-1/+23
|\ \ | | | | | | On rename, also refresh storage_mtime of the target file
| * | Also adjust storage_mtime of target after renameVincent Petry2015-10-262-1/+23
| | | | | | | | | | | | Some storages like Dropbox change their mtime on rename...
* | | Merge pull request #11509 from owncloud/internal_email_templateThomas Müller2015-10-291-5/+5
|\ \ \ | | | | | | | | Allow separate templates for internal and external share notifications
| * | | Allow separate templates for internal and external share notificationsStephen Colebrook2015-10-291-5/+5
| | |/ | |/|
* / | Add a repair step that checks for group membership on sharesJoas Schilling2015-10-291-0/+13
|/ /
* | Merge pull request #19182 from cweiske/support-bzip2Thomas Müller2015-10-282-2/+2
|\ \ | | | | | | Fix #19181: Support .bz2 app archives
| * | Fix #19181: Support .bz2 app archivesChristian Weiske2015-10-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | At first a bz2 handling in needs to be fixed; PEAR's Archive_Tar otherwise gives the following error: > Unsupported compression type "bz" > Supported types are "gz", "bz2" and "lzma2" After that we can whitelist the application/bz2 MIME type in the installer.
* | | Make \OC\SubAdmin php-5.4 compatibleRoeland Jago Douma2015-10-281-4/+19
| | | | | | | | | | | | * Also close some cursors while we are at it
* | | Merge pull request #19837 from owncloud/always-enabled-appsThomas Müller2015-10-262-37/+51
|\ \ \ | | | | | | | | Store list of apps which cannot be disabled in shipped.json
| * | | Fail hard if shipped.json is missingThomas Müller2015-10-261-9/+5
| | | |
| * | | Don't show apps which are always enabled in the app managerThomas Müller2015-10-262-9/+14
| | | |
| * | | Store list of apps which cannot be disabled in shipped.jsonThomas Müller2015-10-262-33/+46
| | | |
* | | | Update license headersLukas Reschke2015-10-2631-28/+31
| |_|/ |/| |
* | | Merge pull request #19982 from owncloud/fix-link-sharing-regression-masterThomas Müller2015-10-261-8/+20
|\ \ \ | |/ / |/| | Ensure the password is only hashed in case it's changed on the client…
| * | Fix for broken ajax/share.php endpointRoeland Jago Douma2015-10-231-8/+16
| | | | | | | | | | | | | | | Even more code mess :( All tests pass again. But I'm really not happy with this endpoint.
| * | Ensure the password is only hashed in case it's changed on the client - ↵Thomas Müller2015-10-221-7/+11
| | | | | | | | | | | | fixes #19950
* | | Throw exception on `getPath` if file does not existLukas Reschke2015-10-253-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the `getPath` methods returned `NULL` in case when a file with the specified ID does not exist. This however mandates that developers are checking for the `NULL` case and if they do not the door for bugs with all kind of impact is widely opened. This is especially harmful if used in context with Views where the final result is limited based on the result of `getPath`, if `getPath` returns `NULL` PHP type juggles this to an empty string resulting in all possible kind of bugs. While one could argue that this is a misusage of the API the fact is that it is very often misused and an exception will trigger an immediate stop of execution as well as log this behaviour and show a pretty error page. I also adjusted some usages where I believe that we need to catch these errors, in most cases this is though simply an error that should hard-fail.
* | | Dont lock /$user/filesRobin Appelman2015-10-231-1/+1
| | |
* | | Expose syslog tag in the configurationVolker Fröhlich2015-10-221-1/+1
|/ /
* | Merge pull request #19890 from owncloud/db-keep-shared-locksThomas Müller2015-10-222-18/+107
|\ \ | | | | | | Keep shared locks until the end of the request so we can reuse them
| * | add phpdocRobin Appelman2015-10-212-0/+13
| | |
| * | Keep shared locks until the end of the request so we can reuse themRobin Appelman2015-10-212-18/+94
| |/
* | Remove dependency on ICrypto + use XORLukas Reschke2015-10-213-21/+15
| |
* | Merge pull request #19918 from owncloud/send-begin-messageThomas Müller2015-10-211-0/+6
|\ \ | | | | | | Update: state which step we are going to start and warn if it might b…
| * | Update: state which step we are going to start and warn if it might be slowJoas Schilling2015-10-211-0/+6
| |/
* | Merge pull request #19927 from owncloud/install-shipped-apps-on-upgradeThomas Müller2015-10-211-0/+3
|\ \ | | | | | | Install new shipped apps on upgrade
| * | Install new shipped apps on upgrade -fixes #19925Thomas Müller2015-10-211-0/+3
| | |
* | | Legacy OC_SubAdmin is now just a wrapperRoeland Jago Douma2015-10-211-79/+57
| | |
* | | New \OC\SubAdmin classRoeland Jago Douma2015-10-213-95/+369
|/ / | | | | | | | | | | | | * DI * Tests * moved OC_SubAdmin to legacy * Added to private OC\GroupManager
* | Merge pull request #19883 from owncloud/provide-iappcontainerThomas Müller2015-10-211-0/+4
|\ \ | | | | | | Provide IAppContainer as dependency injection
| * | Provide IAppContainer as dependency injectionMorris Jobke2015-10-201-0/+4
| | |
* | | Merge pull request #18184 from owncloud/ocs-merge-headersThomas Müller2015-10-212-8/+14
|\ \ \ | |_|/ |/| | Merge headers of ocs results
| * | fix PHPDocThomas Müller2015-09-211-0/+1
| | |
| * | Merge headers of ocs resultsThomas Müller2015-09-212-8/+13
| | |
* | | Merge pull request #19884 from owncloud/locking_exceptionThomas Müller2015-10-201-1/+1
|\ \ \ | | | | | | | | catch all exception if table doesn't exists
| * | | catch all exception if table doesn't existsBjörn Schießle2015-10-201-1/+1
| | | |
* | | | Merge pull request #19874 from ↵Thomas Müller2015-10-201-1/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | owncloud/delete-cookie-instead-of-setting-value-to-empty Delete cookie instead of emptying value
| * | | Delete cookie instead of emptying valueLukas Reschke2015-10-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP will handle session cookies with an empty values as an E_WARNING error. ([php/#68063](https://bugs.php.net/bug.php?id=68063)) ownCloud sets the cookie to an empty value in case the session expires, it however after this starts a new session. Due to potential race conditions this can in unlikely cases lead to the fact that the session never gets restarted and the user is left with an empty cookie. PHP tries then to use the empty cookie which makes the instance not usable. To work around any race condition we now tell PHP to explicitly delete the value which can be done by using `null` as value, PHP will then send a cookie with the value "deleted". Also theepiration has been set to -1.
* | | | Merge pull request #19666 from owncloud/fix_13002Thomas Müller2015-10-201-46/+0
|\ \ \ \ | |_|_|/ |/| | | Combine OCS API getUser method code into provisioning_api app
| * | | Combine OCS API getUser method code into provisioning_api appRoeland Jago Douma2015-10-131-46/+0
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #13002 Move the cloud/users/{userid} code in total to the provisioning API.
* | | | [OCI setup] remove static logger/config callsMorris Jobke2015-10-201-15/+17
| | | | | | | | | | | | | | | | * logger/config object are already injected - this only uses it
* | | | Merge pull request #17641 from owncloud/fix_objectstore_renameJörn Friedrich Dreyer2015-10-193-10/+14
|\ \ \ \ | | | | | | | | | | don't move files in cache twice, fixes renaming for objectstores
| * | | | fix objectstore files having create permissionsRobin Appelman2015-10-161-2/+2
| | | | |
| * | | | detect object homestorage in share codeRobin Appelman2015-10-161-1/+3
| | | | |
| * | | | don't move files in cache twice, fixes renaming for objectstoresJörn Friedrich Dreyer2015-10-161-7/+9
| | | | |
* | | | | Merge pull request #19833 from owncloud/fix_view_rmdirRobin Appelman2015-10-191-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Removemount expects absolutePath