aboutsummaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-172-0/+20
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-164-0/+20
* Merge pull request #12625 from owncloud/app-dependencies-libs-and-commandsBernhard Posselt2014-12-153-7/+12
|\
| * rework api of DependencyAnalyzerThomas Müller2014-12-121-3/+3
| * adjust styling of missing dependencies in apps managementThomas Müller2014-12-112-4/+9
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-154-0/+14
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-1416-0/+46
* | Merge pull request #12726 from owncloud/add-filter-for-backend-to-rest-indexMorris Jobke2014-12-131-17/+41
|\ \
| * | Make comment clearLukas Reschke2014-12-121-1/+1
| * | Comment code pathLukas Reschke2014-12-121-0/+1
| * | Use limit and offsetLukas Reschke2014-12-121-1/+1
| * | Use array key instead of valueLukas Reschke2014-12-121-1/+1
| * | Break loopLukas Reschke2014-12-111-0/+1
| * | Add filter for 'backend' to user REST routeLukas Reschke2014-12-101-17/+39
* | | Show user backend in user managementMorris Jobke2014-12-125-22/+47
* | | Merge pull request #12790 from owncloud/user-mngt-js-onlyMorris Jobke2014-12-124-112/+70
|\ \ \
| * | | add comments to user list JS for better understandingMorris Jobke2014-12-121-0/+26
| * | | move loading of JS and CSS to templateMorris Jobke2014-12-122-8/+13
| * | | remove PHP generated user list and move all to the existing JS partMorris Jobke2014-12-123-104/+31
| | |/ | |/|
* / | [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