summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix the test to expect the new behaviourJoas Schilling2015-12-181-2/+9
* 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-183-64/+109
|\
| * Make sure the interface and the implementation matchJoas Schilling2015-12-182-20/+17
| * Use the query builder for the joblist queriesJoas Schilling2015-12-182-44/+92
* | Merge pull request #21279 from owncloud/remove-tmp-methodsThomas Müller2015-12-1824-65/+30
|\ \
| * | OC_Helper::userAvatarSet is not used anymoreMorris Jobke2015-12-181-10/+0
| * | Use TempManager instead of tmpFileMorris Jobke2015-12-1810-26/+13
| * | Use TempManager instead of tmpFolderMorris Jobke2015-12-1817-29/+17
|/ /
* | Merge pull request #21278 from owncloud/exclude-scrutinizer-autofixerThomas Müller2015-12-181-1/+1
|\ \
| * | Exclude scrutinizer-auto-fixerLukas Reschke2015-12-181-1/+1
|/ /
* | Merge pull request #21268 from owncloud/cleanup-OC_Helper-getFileNameMimeTypeThomas Müller2015-12-188-24/+9
|\ \
| * | Use proper public API for OC_Helper::getFileNameMimeTypeMorris Jobke2015-12-178-24/+9
* | | Merge pull request #21264 from owncloud/deprecated_oc_user_methodsThomas Müller2015-12-1828-198/+125
|\ \ \ | |_|/ |/| |
| * | Removed deprecated function OC_User::deleteUserRoeland Jago Douma2015-12-1717-60/+66
| * | Removed unused deprecated methodsRoeland Jago Douma2015-12-171-38/+0
| * | Removed deprecated private OC_User::createUserRoeland Jago Douma2015-12-1717-62/+29
| * | Remove deprecated function OC_User::getManagerRoeland Jago Douma2015-12-1711-41/+33
* | | Merge pull request #21269 from owncloud/we-shall-cleanup-xml-parser-errorsThomas Müller2015-12-187-7/+22
|\ \ \
| * | | Clear xml errors in updaterThomas Müller2015-12-171-0/+2
| * | | Clear xml errors in ocs clientThomas Müller2015-12-171-0/+1
| * | | Only perform tearDown operations on the database if we have a connection to i...Thomas Müller2015-12-171-4/+6
| * | | Use proper base classThomas Müller2015-12-173-3/+6
| * | | Clear xml errorsThomas Müller2015-12-171-0/+1
| * | | Assert that there are no xml error leftThomas Müller2015-12-171-0/+6
* | | | Merge pull request #21190 from owncloud/bump_doctrine_depsThomas Müller2015-12-181-0/+0
|\ \ \ \
| * | | | [3rdparty] Bump doctrine depsRoeland Jago Douma2015-12-181-0/+0
| |/ / /
* | | | Merge pull request #21248 from owncloud/deprecated_oc_helper_linkToRouteThomas Müller2015-12-186-25/+12
|\ \ \ \
| * | | | Remove private deprecated OC_Helper::linkToRouteRoeland Jago Douma2015-12-171-13/+0
| * | | | OC_Helper::linkToRoute is deprecatedRoeland Jago Douma2015-12-176-12/+12
| |/ / /
* | | | Merge pull request #21247 from owncloud/placeholder_sizeThomas Müller2015-12-184-13/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Since avatar.js is now essentially empty remove itRoeland Jago Douma2015-12-172-6/+0
| * | | Add a default size to the avatar placeholdersRoeland Jago Douma2015-12-173-7/+7
| | |/ | |/|
* | | Merge pull request #20696 from owncloud/add-carddav-backends-to-ocp-contactsm...Thomas Müller2015-12-179-21/+1184
|\ \ \ | |/ / |/| |
| * | avoid duplicates on searchBjörn Schießle2015-12-152-15/+33
| * | Fix last Oracle issueThomas Müller2015-12-151-1/+1
| * | Fix Oracle insert errorThomas Müller2015-12-152-4/+8
| * | implement delete, create, update, search, get permissionsBjörn Schießle2015-12-1510-123/+1133
| * | save wipThomas Müller2015-12-112-0/+131
* | | Merge pull request #21255 from owncloud/usermanagement-show-password-error-te...Thomas Müller2015-12-171-1/+1
|\ \ \ | |_|/ |/| |
| * | Update users.jsmichag862015-12-171-1/+1
* | | Merge pull request #21260 from owncloud/fix-undefined-l10n-varThomas Müller2015-12-171-3/+1
|\ \ \
| * | | initialize l10n instance earlier, fixes an undefined var warning followed by ...Arthur Schiwon2015-12-171-3/+1
* | | | Merge pull request #21259 from owncloud/load_big_avatar_only_personalThomas Müller2015-12-172-2/+6
|\ \ \ \
| * | | | Only load the big (128x128) avatar on the perosnal pageRoeland Jago Douma2015-12-172-2/+6
| | |/ / | |/| |
* | | | Merge pull request #21251 from owncloud/make-occ-more-error-proofThomas Müller2015-12-171-0/+10
|\ \ \ \
| * | | | occ command can only be called from ownCloud root directoryMorris Jobke2015-12-171-0/+10
* | | | | Merge pull request #21200 from owncloud/files-authorizationheaderThomas Müller2015-12-178-14/+122
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Load base64 polyfill in IE and friendsVincent Petry2015-12-141-0/+2
| * | | | Add davidchambers/base64 JS libraryVincent Petry2015-12-145-1/+108
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-04 02:22:13 +0000