summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-122-0/+14
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-112-31/+227
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-101-2/+2
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-092-0/+5
* Merge pull request #10863 from owncloud/removeWarningWhenCheckIsDisabledVicDeo2014-09-092-2/+2
|\
| * Don't show warning when has_internet_connection is set to falseLukas Reschke2014-09-052-2/+2
* | Merge pull request #10740 from owncloud/fix-everyone-group-countLukas Reschke2014-09-085-21/+82
|\ \
| * | Using countUsers method to return true count of usersClark Tomlinson2014-09-055-21/+82
* | | Check for admin user instead of subadminLukas Reschke2014-09-081-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-071-0/+1
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2014-09-052-2/+22
* | [tx-robot] updated from transifexJenkins for ownCloud2014-09-034-1/+19
* | [tx-robot] updated from transifexJenkins for ownCloud2014-09-0251-0/+155
* | [tx-robot] updated from transifexJenkins for ownCloud2014-09-0166-66/+68
* | Merge pull request #10420 from owncloud/external-share-self-signedLukas Reschke2014-08-317-94/+219
|\ \
| * | Add unit tests and fix rootcerts creation bugLukas Reschke2014-08-313-7/+11
| * | Cleanup routesRobin Appelman2014-08-313-5/+4
| * | Cleanup certificate codeRobin Appelman2014-08-311-7/+6
| * | remove outdated checksRobin Appelman2014-08-312-4/+0
| * | Move certificate management interface from files_external to coreRobin Appelman2014-08-317-93/+220
* | | Use public api for getting l10nRobin Appelman2014-08-3116-20/+20
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-319-10/+90
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-303-0/+30
* | move hardcoded color to CSS class - for themeabilityMorris Jobke2014-08-291-2/+2
* | color quota bar yellow for feedback if usage is over 90%Jan-Christoph Borchardt2014-08-291-1/+2
|/
* Merge pull request #9684 from owncloud/fix-9367Morris Jobke2014-08-295-46/+72
|\
| * user mgmt: move 'Show storage location' and 'Show last log in' to settings areaJan-Christoph Borchardt2014-08-294-56/+46
| * Adds 2 checkboxes at the top of userlist in the settings, to display/hide opt...Stephane V2014-08-283-1/+37
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-293-0/+9
|/
* Merge pull request #10647 from owncloud/implementing_momentjsClark Tomlinson2014-08-281-3/+2
|\
| * Implementing moment.jsClark Tomlinson2014-08-281-3/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-281-0/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-08-273-17/+50
* Set email input field to type=email for better UXDan Callahan2014-08-261-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2014-08-266-27/+80
* [tx-robot] updated from transifexJenkins for ownCloud2014-08-253-4/+12
* [tx-robot] updated from transifexJenkins for ownCloud2014-08-2411-2/+30
* [tx-robot] updated from transifexJenkins for ownCloud2014-08-232-0/+4
* Merge pull request #10584 from owncloud/simple-wizard-trusted-domainsThomas Müller2014-08-222-2/+28
|\
| * Redirect user after clicking on linkLukas Reschke2014-08-222-4/+6
| * Add a trusted domain wizardLukas Reschke2014-08-212-2/+26
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-221-0/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-08-211-0/+2
* [tx-robot] updated from transifexJenkins for ownCloud2014-08-2014-12/+38
* Merge pull request #9866 from owncloud/app-upgradeRobin Appelman2014-08-191-0/+3
|\
| * Set maintaince mode when updating an app from the app storeRobin Appelman2014-08-041-0/+3
* | Merge pull request #10500 from owncloud/fix_userlist_settings_ajaxMorris Jobke2014-08-191-3/+3
|\ \
| * | properly encode groups as json, not ',' separatedJörn Friedrich Dreyer2014-08-181-3/+3
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-194-3/+15
|/ /
* | Merge pull request #10339 from owncloud/users-defaultquotafixVincent Petry2014-08-183-57/+55
|\ \