summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12406 from owncloud/drop-getApps-getUsersThomas Müller2014-12-0939-841/+1034
|\
| * drop unused isDebugMode and setDebugMode of OC_ConfigMorris Jobke2014-12-082-51/+0
| * reduce OC_Preferences, OC_Config and \OCP\Config usageMorris Jobke2014-12-0821-49/+70
| * Workaround to fix the too early init dilemmaMorris Jobke2014-12-083-5/+42
| * introduce preCondition for setUserValue to provide atomic check-and-updateMorris Jobke2014-12-086-15/+153
| * Refactoring of OC_Preferences to AllConfigMorris Jobke2014-12-088-681/+600
| * fix base.php for not installed systemsMorris Jobke2014-12-081-25/+25
| * migrate \OC\AllConfig to \OCP\IConfigMorris Jobke2014-12-086-14/+17
| * introduce deleteAllUserValuesMorris Jobke2014-12-082-0/+16
| * introduce proper interface for deleteAppValueMorris Jobke2014-12-083-0/+17
| * use old methods and redirect in deprecated methodsMorris Jobke2014-12-082-4/+4
| * @deprecated messages for \OCP\Config and \OCP\AppConfigMorris Jobke2014-12-082-2/+8
| * Extract interaction with config.php into SystemConfigMorris Jobke2014-12-086-22/+109
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-09288-862/+36
* | Merge pull request #12577 from owncloud/public-mount-apiLukas Reschke2014-12-0826-90/+346
|\ \ | |/ |/|
| * Use the mount config api for files_externalRobin Appelman2014-12-044-18/+48
| * Add public api for mount configurationsRobin Appelman2014-12-0422-72/+298
* | Merge pull request #12618 from owncloud/initial-work-migrate-to-appframeworkLukas Reschke2014-12-0826-397/+1332
|\ \
| * | React on other statuscodes than 200Lukas Reschke2014-12-086-89/+54
| * | Merge branch 'initial-work-migrate-to-appframework' of https://github.com/own...Lukas Reschke2014-12-081-7/+5
| |\ \
| | * | fix updated URL schema in JS unit testsMorris Jobke2014-12-081-7/+5
| * | | Add statuscodesLukas Reschke2014-12-084-23/+113
| * | | Fix urlLukas Reschke2014-12-081-1/+1
| |/ /
| * | Add REST route for user & group managementLukas Reschke2014-12-0825-340/+1222
* | | Merge pull request #12704 from owncloud/fix-12647-2Lukas Reschke2014-12-082-3/+9
|\ \ \
| * | | add docArthur Schiwon2014-12-081-0/+1
| * | | preserve an asterisk at the start when escaping a search termArthur Schiwon2014-12-082-3/+8
* | | | Merge pull request #12621 from owncloud/add-right-marginJoas Schilling2014-12-081-3/+2
|\ \ \ \
| * | | | Add right margin to codestyle fileLukas Reschke2014-12-041-3/+2
* | | | | Merge pull request #12696 from owncloud/trashbin-selected-deleteRobin Appelman2014-12-081-0/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix deleting selected files in the trashbinRobin Appelman2014-12-081-0/+4
| | |/ / | |/| |
* | | | Merge pull request #12452 from owncloud/server2server-ng-ocsMorris Jobke2014-12-0814-55/+612
|\ \ \ \
| * | | | OCS API for server-to-server sharingBjoern Schiessle2014-12-0414-55/+612
* | | | | Merge pull request #12691 from owncloud/i-shall-improve-my-grep-skillsMorris Jobke2014-12-081-1/+1
|\ \ \ \ \
| * | | | | Remove unexisting `htAccessWorkinght`Lukas Reschke2014-12-081-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #12394 from owncloud/files-fileactionsimprovementsLukas Reschke2014-12-083-128/+314
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Improve FileActions JS to allow for custom renderingVincent Petry2014-11-243-128/+314
* | | | | Merge pull request #12657 from owncloud/ajaxify-htaccess-checkMorris Jobke2014-12-084-20/+10
|\ \ \ \ \
| * | | | | Check for working .htaccess via AJAXLukas Reschke2014-12-064-20/+10
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-0880-68/+18
* | | | | | Remove changes which were inadvertently pushed to masterOlivier Paroz2014-12-081-78/+0
* | | | | | Dump Arrays, Objects and Exceptions to the logOlivier Paroz2014-12-081-0/+78
* | | | | | Merge pull request #12644 from owncloud/add-hack-for-configLukas Reschke2014-12-071-1/+9
|\ \ \ \ \ \
| * | | | | | Create config if it does not existsLukas Reschke2014-12-061-1/+9
| |/ / / / /
* | | | | | Merge pull request #12668 from owncloud/keepspaceThomas Müller2014-12-071-1/+1
|\ \ \ \ \ \
| * | | | | | Keep spaces out of the stringVolkan Gezer2014-12-071-1/+1
| |/ / / / /
* / / / / / [tx-robot] updated from transifexJenkins for ownCloud2014-12-0732-4/+40
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-0694-252/+62
* | | | | Merge pull request #12636 from owncloud/fix-ie9-placeholderRaghu Nayyar2014-12-061-1/+8
|\ \ \ \ \
| * | | | | fix placeholder fake in IE8 & 9 that brokes group listing in user management ...Morris Jobke2014-12-051-1/+8