summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Do not delete background jobs, in case an exception occuredJoas Schilling2015-12-181-1/+0
* Merge pull request #21277 from owncloud/querybuild-joblistThomas Müller2015-12-182-55/+105
|\
| * Make sure the interface and the implementation matchJoas Schilling2015-12-182-20/+17
| * Use the query builder for the joblist queriesJoas Schilling2015-12-181-35/+88
* | OC_Helper::userAvatarSet is not used anymoreMorris Jobke2015-12-181-10/+0
* | Use TempManager instead of tmpFileMorris Jobke2015-12-187-20/+7
* | Use TempManager instead of tmpFolderMorris Jobke2015-12-185-16/+4
* | Merge pull request #21268 from owncloud/cleanup-OC_Helper-getFileNameMimeTypeThomas Müller2015-12-183-10/+2
|\ \
| * | Use proper public API for OC_Helper::getFileNameMimeTypeMorris Jobke2015-12-173-10/+2
* | | Merge pull request #21264 from owncloud/deprecated_oc_user_methodsThomas Müller2015-12-183-103/+21
|\ \ \ | |_|/ |/| |
| * | Removed deprecated function OC_User::deleteUserRoeland Jago Douma2015-12-171-18/+0
| * | Removed unused deprecated methodsRoeland Jago Douma2015-12-171-38/+0
| * | Removed deprecated private OC_User::createUserRoeland Jago Douma2015-12-171-18/+0
| * | Remove deprecated function OC_User::getManagerRoeland Jago Douma2015-12-173-31/+23
| |/
* | Merge pull request #21269 from owncloud/we-shall-cleanup-xml-parser-errorsThomas Müller2015-12-183-0/+4
|\ \
| * | Clear xml errors in updaterThomas Müller2015-12-171-0/+2
| * | Clear xml errors in ocs clientThomas Müller2015-12-171-0/+1
| * | Clear xml errorsThomas Müller2015-12-171-0/+1
| |/
* | Merge pull request #21248 from owncloud/deprecated_oc_helper_linkToRouteThomas Müller2015-12-184-22/+9
|\ \
| * | Remove private deprecated OC_Helper::linkToRouteRoeland Jago Douma2015-12-171-13/+0
| * | OC_Helper::linkToRoute is deprecatedRoeland Jago Douma2015-12-174-9/+9
| |/
* / Since avatar.js is now essentially empty remove itRoeland Jago Douma2015-12-171-1/+0
|/
* Merge pull request #21200 from owncloud/files-authorizationheaderThomas Müller2015-12-171-0/+2
|\
| * Load base64 polyfill in IE and friendsVincent Petry2015-12-141-0/+2
* | Merge pull request #21240 from owncloud/avatar_speedupThomas Müller2015-12-172-18/+62
|\ \
| * | [Avatars] Add function to get the Node of the avatarRoeland Jago Douma2015-12-162-18/+62
* | | Merge pull request #21253 from owncloud/deprecated_oc_helper_linkToThomas Müller2015-12-175-23/+8
|\ \ \
| * | | Remove deprecated OC_Helper::linkTo functionRoeland Jago Douma2015-12-171-15/+0
| * | | OC_Helper::linkTo is deprecatedRoeland Jago Douma2015-12-175-8/+8
* | | | Merge pull request #21241 from owncloud/fix_21226Thomas Müller2015-12-171-1/+7
|\ \ \ \
| * | | | Do not try to get the avatar if there is no userRoeland Jago Douma2015-12-171-1/+7
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-178-0/+8
| |/ / |/| |
* | | Merge pull request #21184 from owncloud/cli-logger-embedded-webserverThomas Müller2015-12-161-0/+3
|\ \ \ | |/ / |/| |
| * | Let's print error messages to the builtin webserver console ... makes develop...Thomas Müller2015-12-141-0/+3
| |/
* / don't allow to create a federated share if source and target server are the sameBjörn Schießle2015-12-142-2/+45
|/
* Check if user isset in $_REQUEST firstRobin Appelman2015-12-141-3/+5
* [tx-robot] updated from transifexJenkins for ownCloud2015-12-132-2/+10
* Merge pull request #20878 from owncloud/proper-htaccess-support-in-code-signi...Thomas Müller2015-12-111-25/+8
|\
| * Don't write directives from CLILukas Reschke2015-12-081-0/+5
| * Run .htaccess updates in any caseLukas Reschke2015-12-081-5/+3
| * Remove version check out of .htaccessLukas Reschke2015-12-081-20/+0
* | Merge pull request #21135 from owncloud/add-polyfillThomas Müller2015-12-118-102/+25
|\ \
| * | Use PHP polyfillsLukas Reschke2015-12-118-102/+25
* | | Merge pull request #21020 from owncloud/add-directory-slash-to-setup-codeThomas Müller2015-12-111-0/+3
|\ \ \
| * | | Add DirectorySlash to dynamic .htaccess writeLukas Reschke2015-12-081-0/+3
| | |/ | |/|
* | | Merge pull request #21045 from owncloud/scrutinizer-patch-1Thomas Müller2015-12-112-4/+3
|\ \ \
| * | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-102-4/+3
* | | | Merge pull request #21128 from owncloud/dav-fopen-non-existingThomas Müller2015-12-111-8/+14
|\ \ \ \
| * | | | Dont do a seperate request to check if a file exists for dav->fopenRobin Appelman2015-12-101-8/+14
* | | | | IMemcacheTTL was backported to 8.2.2Morris Jobke2015-12-101-2/+2
| |_|_|/ |/| | |