summaryrefslogtreecommitdiffstats
path: root/lib
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
* | Merge pull request #20102 from owncloud/fix_subadminThomas Müller2015-10-281-4/+19
|\ \
| * | Make \OC\SubAdmin php-5.4 compatibleRoeland Jago Douma2015-10-281-4/+19
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-282-0/+4
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-10-272-0/+4
* | Merge pull request #19837 from owncloud/always-enabled-appsThomas Müller2015-10-263-37/+64
|\ \
| * | 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-263-9/+20
| * | Store list of apps which cannot be disabled in shipped.jsonThomas Müller2015-10-263-33/+53
* | | Update license headersLukas Reschke2015-10-2642-35/+42
* | | Merge pull request #20031 from owncloud/remove-dead-codeThomas Müller2015-10-261-8/+7
|\ \ \
| * | | Remove dead codeLukas Reschke2015-10-251-8/+7
| |/ /
* | | Merge pull request #19982 from owncloud/fix-link-sharing-regression-masterThomas Müller2015-10-262-11/+24
|\ \ \ | |/ / |/| |
| * | Fix for broken ajax/share.php endpointRoeland Jago Douma2015-10-232-11/+20
| * | 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
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-252-26/+34
* | | 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
* | | Use IRequest's `getScriptName` functionality instead of $_SERVER['SCRIPT_NAME']Lukas Reschke2015-10-211-1/+13
* | | 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
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-214-0/+10
| |_|/ |/| |
* | | 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-202-2/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Delete cookie instead of emptying valueLukas Reschke2015-10-192-2/+7
* | | | 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
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-202-0/+2
* | | | 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
|\ \ \ \ \ | |_|_|/ / |/| | | |