summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* 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
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-2226-0/+78
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-2180-76/+232
* | update grammarVolkan Gezer2014-11-211-1/+1
* | cleanup languages. closes #11274Volkan Gezer2014-11-206-228/+0
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-2024-48/+72
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-11-1974-78/+4
* User management search just searches users - adjust label of input field - fi...Morris Jobke2014-11-181-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2014-11-178-20/+28
* [tx-robot] updated from transifexJenkins for ownCloud2014-11-154-0/+8
* [tx-robot] updated from transifexJenkins for ownCloud2014-11-142-0/+4
* [tx-robot] updated from transifexJenkins for ownCloud2014-11-1328-8/+64
* Merge pull request #12110 from owncloud/fix-12080Thomas Müller2014-11-122-2/+2
|\
| * add 'namespace' for automatically created navigation divs, fixes #12080Arthur Schiwon2014-11-122-2/+2