summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-128-0/+56
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-1116-6/+44
* Merge pull request #12611 from owncloud/use-uid-instead-of-loginnameLukas Reschke2014-12-101-1/+1
|\
| * Use UID instead of login nameLukas Reschke2014-12-041-1/+1
* | Merge pull request #12711 from owncloud/add-backend-to-rest-indexLukas Reschke2014-12-102-51/+52
|\ \
| * | Expose backend type via REST APILukas Reschke2014-12-092-51/+52
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-1070-70/+156
* | | Merge pull request #11214 from owncloud/issue/10836Morris Jobke2014-12-092-1/+7
|\ \ \
| * | | Add an option to disallow sending sharing emails to non-owncloud usersJoas Schilling2014-12-092-1/+7
* | | | Fix namespace of Files_Encryption outside of the appJoas Schilling2014-12-092-2/+2
|/ / /
* | | Merge pull request #12406 from owncloud/drop-getApps-getUsersThomas Müller2014-12-095-12/+15
|\ \ \
| * | | reduce OC_Preferences, OC_Config and \OCP\Config usageMorris Jobke2014-12-085-12/+15
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2014-12-09118-600/+2
|/ /
* | Merge pull request #12618 from owncloud/initial-work-migrate-to-appframeworkLukas Reschke2014-12-0816-358/+589
|\ \
| * | React on other statuscodes than 200Lukas Reschke2014-12-084-67/+45
| * | 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-082-13/+27
| * | | Fix urlLukas Reschke2014-12-081-1/+1
| |/ /
| * | Add REST route for user & group managementLukas Reschke2014-12-0815-301/+542
* | | Remove unexisting `htAccessWorkinght`Lukas Reschke2014-12-081-1/+1
|/ /
* | Merge pull request #12657 from owncloud/ajaxify-htaccess-checkMorris Jobke2014-12-083-19/+4
|\ \
| * | Check for working .htaccess via AJAXLukas Reschke2014-12-063-19/+4
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-082-0/+4
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-0712-0/+12
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-0614-2/+20
* | 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
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-0582-156/+14
* | Merge pull request #12607 from owncloud/this-is-an-awesome-dayClark Tomlinson2014-12-042-16/+1
|\ \
| * | PHP 5.4 is now required for masterLukas Reschke2014-12-042-16/+1
* | | adding supported databasesThomas Müller2014-12-041-1/+1
* | | display missing dependencies in the apps management pageThomas Müller2014-12-042-0/+17
* | | introduce dependency analyzer to take care of app dependenciesThomas Müller2014-12-041-1/+9
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-042-0/+4
* | Merge pull request #12552 from szlwzl/masterThomas Müller2014-12-031-1/+1
|\ \ | |/ |/|
| * adding @ sign between email address and domain name to make the syntax clearerSimon Whittaker2014-12-021-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-0322-86/+126
|/
* Merge pull request #12419 from owncloud/read-only-configThomas Müller2014-12-012-3/+18
|\
| * Allow read-only configurationLukas Reschke2014-11-252-3/+18
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-012-2/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-294-2/+10
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-282-0/+60
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-272-0/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-262-2/+2
|/
* Merge pull request #12303 from owncloud/windows-unknown-command-commandMorris Jobke2014-11-241-17/+1
|\
| * Deduplicate function by moving it to the OC_HelperJoas Schilling2014-11-201-17/+1
| * Remove exec() call with invalid name on windowsJoas Schilling2014-11-191-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-242-0/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-232-0/+2