summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Use SystemConfig internallyRoeland Jago Douma2015-12-185-19/+19
| * | | | | Inject Config into SystemConfigRoeland Jago Douma2015-12-185-15/+32
| * | | | | Get rid of legacy OC_ConfigRoeland Jago Douma2015-12-187-118/+29
* | | | | | Merge pull request #21280 from owncloud/drop-unused-methodsThomas Müller2015-12-185-182/+15
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Move OC_Helper code to OCP\Util for linkToRemoteMorris Jobke2015-12-183-59/+5
| * | | | | properly use OCP\Util instead of OC_HelperMorris Jobke2015-12-185-69/+10
| * | | | | OC_Helper::makeURLAbsolute is not used anymoreMorris Jobke2015-12-182-54/+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
| | |/ / | |/| |