summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-12-204-0/+4
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-12-192-0/+4
|
* Merge pull request #21281 from owncloud/allow-di-for-background-jobsThomas Müller2015-12-185-11/+127
|\ | | | | Allow background jobs to be service names for DI
| * Add methods to interface which have always been requiredJoas Schilling2015-12-182-2/+19
| |
| * Allow dependency injection for background jobsJoas Schilling2015-12-181-9/+15
| |
| * Look up services in the app container before trying the core containerJoas Schilling2015-12-181-0/+24
| |
| * Register app containers in the OC containerJoas Schilling2015-12-183-1/+70
| |
* | Merge pull request #21290 from owncloud/public-api-usage-getversionThomas Müller2015-12-1810-23/+23
|\ \ | | | | | | Use OCP\Util::getVersion instead of the internal private implementation
| * | Use OCP\Util::getVersion instead of the internal private implementationMorris Jobke2015-12-1810-23/+23
| | |
* | | Merge pull request #21288 from owncloud/deprecated_helper_mimetypesThomas Müller2015-12-183-49/+2
|\ \ \ | |/ / |/| | Remove deprecated OC_Helper mimetype functions
| * | Removed deprecated OC_Helper::mimeTypeIcon functionRoeland Jago Douma2015-12-183-27/+2
| | |
| * | Removed deprecated unsused function OC_Helper::getStringMimeTypeRoeland Jago Douma2015-12-181-11/+0
| | |
| * | Removed deprecated OC_Helper::getSecureMimeTypeRoeland Jago Douma2015-12-181-11/+0
| | |
* | | Merge pull request #21283 from owncloud/cleanup_configThomas Müller2015-12-188-123/+42
|\ \ \ | | | | | | | | Cleanup OC_Config mess
| * | | Use SystemConfig internallyRoeland Jago Douma2015-12-185-19/+19
| | | |
| * | | Inject Config into SystemConfigRoeland Jago Douma2015-12-183-10/+18
| | | |
| * | | Get rid of legacy OC_ConfigRoeland Jago Douma2015-12-187-118/+29
| | | | | | | | | | | | | | | | | | | | We were still using the lecagy class OC_Config all over the place. Which was a wrapper around the new class OC\Config
* | | | Merge pull request #21280 from owncloud/drop-unused-methodsThomas Müller2015-12-183-60/+13
|\ \ \ \ | |_|_|/ |/| | | OC_Helper::makeURLAbsolute is not used anymore
| * | | Move OC_Helper code to OCP\Util for linkToRemoteMorris Jobke2015-12-182-27/+5
| | | |
| * | | properly use OCP\Util instead of OC_HelperMorris Jobke2015-12-183-21/+8
| | | |
| * | | OC_Helper::makeURLAbsolute is not used anymoreMorris Jobke2015-12-181-12/+0
| |/ /
* | | Merge pull request #21277 from owncloud/querybuild-joblistThomas Müller2015-12-182-55/+105
|\ \ \ | |_|/ |/| | Use the query builder for the joblist queries
| * | 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::getFileNameMimeType
| * | 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
|\ \ \ | |_|/ |/| | Cleanup OC_User deprecated methods
| * | Removed deprecated function OC_User::deleteUserRoeland Jago Douma2015-12-171-18/+0
| | | | | | | | | | | | Replaced with proper OCP calls
| * | Removed unused deprecated methodsRoeland Jago Douma2015-12-171-38/+0
| | |
| * | Removed deprecated private OC_User::createUserRoeland Jago Douma2015-12-171-18/+0
| | | | | | | | | | | | | | | All function calls are replaced with the recommended (which was already the body of the function).
| * | Remove deprecated function OC_User::getManagerRoeland Jago Douma2015-12-173-31/+23
| |/ | | | | | | | | Private deprecated function => removed Replaced all instances with suggested replacement
* | Merge pull request #21269 from owncloud/we-shall-cleanup-xml-parser-errorsThomas Müller2015-12-183-0/+4
|\ \ | | | | | | Assert that there are no xml error left
| * | 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
|\ \ | | | | | | Replace deprecated OC_Helper::linkToRoute calls
| * | Remove private deprecated OC_Helper::linkToRouteRoeland Jago Douma2015-12-171-13/+0
| | |
| * | OC_Helper::linkToRoute is deprecatedRoeland Jago Douma2015-12-174-9/+9
| |/ | | | | | | | | Replaced all calls to OC_Helper::linkToRoute with OC::$server->getURLGenerator()->linkToRoute
* / 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
|\ | | | | Use Authorization headers for public webdav in web UI
| * 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
|\ \ | | | | | | Avatar speedup
| * | [Avatars] Add function to get the Node of the avatarRoeland Jago Douma2015-12-162-18/+62
| | | | | | | | | | | | | | | Since we usually just get the avatar and stream the content to the users there is no need to first create an image in memory.
* | | Merge pull request #21253 from owncloud/deprecated_oc_helper_linkToThomas Müller2015-12-175-23/+8
|\ \ \ | | | | | | | | Remove deprecated OC_Helper::linkTo
| * | | Remove deprecated OC_Helper::linkTo functionRoeland Jago Douma2015-12-171-15/+0
| | | |
| * | | OC_Helper::linkTo is deprecatedRoeland Jago Douma2015-12-175-8/+8
| | | | | | | | | | | | | | | | Replaced with suggested (and calling body of)
* | | | 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 user