summaryrefslogtreecommitdiffstats
path: root/settings/templates
Commit message (Expand)AuthorAgeFilesLines
* Display success and error iconsMarin Treselj2017-08-091-4/+4
* display error icon on non-successMaxence Lange2017-08-081-7/+9
* Merge branch 'clean-settings-layout' of github.com:andreasjacobsen93/nextclou...Marin Treselj2017-08-041-1/+1
|\
| * Merge branch 'master' into clean-settings-layoutMorris Jobke2017-08-031-1/+1
| |\
| | * Update server.phpJos Poortvliet2017-08-011-1/+1
* | | Fix federation icon menu and container paddings.Marin Treselj2017-08-041-2/+2
|/ /
* | Clean up HTML structure, fix labels.Marin Treselj2017-08-031-6/+4
* | Merge branch 'master' into clean-settings-layoutAndreas Jacobsen2017-07-1513-28/+158
|\|
| * this template file is no longer neededBjoern Schiessle2017-07-141-409/+0
| * Merge pull request #5662 from nextcloud/comradekingu-patch-1Morris Jobke2017-07-111-5/+5
| |\
| | * Spelling: No shouting at user, and FacebookAllan Nordhøy2017-07-091-5/+5
| * | Spelling: No "we" for recommendations.Allan Nordhøy2017-07-101-11/+11
| * | fix alignment of radio button and its label in encryption settingsArthur Schiwon2017-07-071-1/+1
| |/
| * Merge pull request #5342 from nextcloud/userlist-used-spaceMorris Jobke2017-07-051-0/+1
| |\
| | * show used space in user listRobin Appelman2017-06-151-0/+1
| * | Move sync client to the firstrunwizard appJoas Schilling2017-07-041-59/+0
| * | move admin templates to the right placeArthur Schiwon2017-06-276-0/+0
| * | adapt to force language changesArthur Schiwon2017-06-231-0/+2
| * | adapt twofactore_backupcodesArthur Schiwon2017-06-231-2/+1
| * | take over changes from #5166 and follow #5267Arthur Schiwon2017-06-232-57/+11
| * | remove obsolete filesArthur Schiwon2017-06-231-3/+0
| * | add Additional (+ Fallback) section for Personal settingsArthur Schiwon2017-06-232-0/+26
| * | sync clients have their own placeArthur Schiwon2017-06-232-36/+59
| * | take over app passwordsArthur Schiwon2017-06-233-3/+67
| * | convert Sessions sectionArthur Schiwon2017-06-231-0/+48
| * | add storage info, fix URL generationArthur Schiwon2017-06-231-0/+15
| * | completing PersonalInfoArthur Schiwon2017-06-231-0/+16
| * | brief, incomplete personal info settings implementationArthur Schiwon2017-06-231-0/+324
| * | one settings link, common template, stylingArthur Schiwon2017-06-231-1/+31
* | | Personal settings file changedAndreas Jacobsen2017-07-152-422/+347
* | | Updated layoutAndreas Jacobsen2017-07-141-2/+7
* | | Moved settings to leftAndreas Jacobsen2017-07-141-1/+1
* | | Update for settingsAndreas Jacobsen2017-06-291-2/+4
* | | Fixed typosAndreas Jacobsen2017-06-281-1/+1
* | | Cleaned up personal settings pageAndreas Jacobsen2017-06-281-70/+76
|/ /
* | Allow to force a language and set it via the ocs apiJoas Schilling2017-06-211-0/+2
* | Revert "allow admin to disable groups on personal page"Morris Jobke2017-06-131-2/+0
* | Merge pull request #5287 from nextcloud/personal-page-gs-modeJoas Schilling2017-06-081-16/+32
|\ \ | |/ |/|
| * unify look of disabled display name / email address and the other input fieldsBjoern Schiessle2017-06-071-10/+4
| * show input fields if they are not empty but disable them in global scale modeBjoern Schiessle2017-06-071-7/+29
* | Allow to change avatar when groups are disablesMorris Jobke2017-06-071-1/+3
|/
* Merge pull request #5267 from nextcloud/personal-sessions-renamweJoas Schilling2017-06-071-3/+3
|\
| * reword sessions to security in personal settingsRobin Appelman2017-06-061-3/+3
* | Merge pull request #5259 from nextcloud/disable-groups-on-personal-pageMorris Jobke2017-06-061-0/+2
|\ \
| * | allow admin to disable groups on personal pageBjoern Schiessle2017-06-061-0/+2
| |/
* / Bring back the description for app passwordsJoas Schilling2017-06-061-0/+4
|/
* Combine sessions and app passwords view into one single viewChristoph Wurst2017-05-301-16/+0
* Fix group restriction regressionMorris Jobke2017-05-191-2/+2
* Change cron wording to background jobsJan-Christoph Borchardt2017-05-161-5/+5
* fix email settingsRobin Appelman2017-05-011-1/+1