summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19182 from cweiske/support-bzip2Thomas Müller2015-10-282-2/+2
|\
| * Fix #19181: Support .bz2 app archivesChristian Weiske2015-10-202-2/+2
* | Make \OC\SubAdmin php-5.4 compatibleRoeland Jago Douma2015-10-281-4/+19
* | Merge pull request #19837 from owncloud/always-enabled-appsThomas Müller2015-10-262-37/+51
|\ \
| * | 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
|\ \ \ | |/ / |/| |
| * | Fix for broken ajax/share.php endpointRoeland Jago Douma2015-10-231-8/+16
| * | Ensure the password is only hashed in case it's changed on the client - fixes...Thomas Müller2015-10-221-7/+11
* | | Throw exception on `getPath` if file does not existLukas Reschke2015-10-253-7/+17
* | | 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
|\ \
| * | 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 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 -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
|/ /
* | Merge pull request #19883 from owncloud/provide-iappcontainerThomas Müller2015-10-211-0/+4
|\ \
| * | 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
|\ \ \ | |_|/ |/| |
| * | 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 existsBjörn Schießle2015-10-201-1/+1
* | | | Merge pull request #19874 from owncloud/delete-cookie-instead-of-setting-valu...Thomas Müller2015-10-201-1/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Delete cookie instead of emptying valueLukas Reschke2015-10-191-1/+5
* | | | Merge pull request #19666 from owncloud/fix_13002Thomas Müller2015-10-201-46/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Combine OCS API getUser method code into provisioning_api appRoeland Jago Douma2015-10-131-46/+0
* | | | [OCI setup] remove static logger/config callsMorris Jobke2015-10-201-15/+17
* | | | Merge pull request #17641 from owncloud/fix_objectstore_renameJörn Friedrich Dreyer2015-10-193-10/+14
|\ \ \ \
| * | | | 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 absolutePathRoeland Jago Douma2015-10-161-1/+1
* | | | | The full name has to be tested if it's a dir - fixes #19854Thomas Müller2015-10-191-1/+1
| |/ / / |/| | |
* | | | Merge pull request #19843 from owncloud/an-app-is-identified-by-having-a-info...Thomas Müller2015-10-161-1/+1
|\ \ \ \
| * | | | an-app-is-identified-by-having-a-info.xml-app.php-should-not-be-mandatoryThomas Müller2015-10-161-1/+1
* | | | | Check for error when resharingRoeland Jago Douma2015-10-161-4/+4
* | | | | When sharing with the owner show the pathRoeland Jago Douma2015-10-161-1/+4
|/ / / /
* | | | Remove $ETagFunction - it was never usedThomas Müller2015-10-161-7/+1
* | | | Consolidate webdav code - move all to one appThomas Müller2015-10-1626-3873/+1
|/ / /
* | | check if fopen was successful before continueBjoern Schiessle2015-10-151-3/+7