aboutsummaryrefslogtreecommitdiffstats
path: root/settings/templates
Commit message (Expand)AuthorAgeFilesLines
* fix missing parameters in sharing settings pageArthur Schiwon2016-08-161-2/+0
* Merge branch 'master' into implement_712Lukas Reschke2016-08-151-3/+49
|\
| * Do not translate HTMLRoeland Jago Douma2016-08-131-13/+19
| * Remove accidentially added lineLukas Reschke2016-08-131-1/+1
| * adding rel="noreferrer noopener"Frank Karlitschek2016-08-131-5/+5
| * adding social buttonsFrank Karlitschek2016-08-131-4/+44
* | move mail settings and file handling to additional ones, thus files_external ...Arthur Schiwon2016-08-133-119/+145
* | make updatenotification settings appear as if it is part of the version part ...Arthur Schiwon2016-08-131-0/+1
* | mark current sectionArthur Schiwon2016-08-121-1/+2
* | Resolve conflictLukas Reschke2016-08-111-6/+6
* | Merge branch 'master' into implement_712Lukas Reschke2016-08-112-3/+9
|\|
| * Add clipboardjs for tokenRoeland Jago Douma2016-08-101-0/+1
| * Add note password is only shown onceRoeland Jago Douma2016-08-101-1/+4
| * Merge pull request #784 from nextcloud/admin_php_smtp_casingLukas Reschke2016-08-091-6/+6
| |\
| | * Admin setting PHP and SMTP casingRoeland Jago Douma2016-08-091-6/+6
| * | Remove AGPL titleRoeland Jago Douma2016-08-091-2/+4
| |/
* | Fallback for legacy settings. They are placed into Additional SettingsArthur Schiwon2016-08-091-0/+36
* | Initial work on Apps page split:Arthur Schiwon2016-08-097-578/+710
|/
* Transifex Owncloud > NextcloudFrédéric LIETART2016-07-291-1/+1
* Fix misspelling of database "READ COMMITTED"Stefan Weil2016-07-291-2/+2
* fix capitalization of text in users managementJan-Christoph Borchardt2016-07-283-8/+8
* Orders Admin Log Buttonroot2016-07-261-10/+10
* Merge pull request #484 from nextcloud/reenable-help-sectionMorris Jobke2016-07-211-4/+4
|\
| * Add proper linksLukas Reschke2016-07-211-4/+4
* | [master] Properly link to nextcloudLukas Reschke2016-07-211-1/+1
|/
* Change "recent activity" to "last activity"Robin Appelman2016-07-201-2/+2
* Merge pull request #452 from nextcloud/session-passwords-designMorris Jobke2016-07-191-6/+5
|\
| * simplify wording of Sessions and App passwords sectionsJan-Christoph Borchardt2016-07-191-6/+5
* | Merge pull request #451 from nextcloud/github-linkLukas Reschke2016-07-191-1/+1
|\ \
| * | fix Github link in Personal and Admin settings Version noteJan-Christoph Borchardt2016-07-191-1/+1
| |/
* / Use the themed radio buttons for cron selectionJoas Schilling2016-07-191-3/+3
|/
* Use tooltip for background job execution timeMorris Jobke2016-07-131-2/+2
* Remove unneeded checks if it runs on a Windows machineMorris Jobke2016-07-081-9/+0
* Merge branch 'master' into sync-masterMorris Jobke2016-07-074-11/+10
|\
| * Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-271-2/+10
| |\
| * | verify user password on changeBjoern Schiessle2016-06-271-2/+1
| * | Merge remote-tracking branch 'upstream/master' into master-upstream-syncLukas Reschke2016-06-261-38/+38
| |\ \
| * \ \ Merge pull request #122 from nextcloud/readd-labels-for-usabilityMorris Jobke2016-06-201-0/+2
| |\ \ \
| | * | | Re-add labels for password inputs for usabilityMorris Jobke2016-06-161-0/+2
| * | | | fix more stringsMorris Jobke2016-06-204-10/+10
| |/ / /
| * | | Merge pull request #112 from nextcloud/drop-useless-ie8-stuffblizzz2016-06-151-2/+0
| |\ \ \
| | * | | Drop useless IE8 rulesMorris Jobke2016-06-151-2/+0
| * | | | fix strengthify in personal settingsMorris Jobke2016-06-151-1/+0
| |/ / /
| * | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611Arthur Schiwon2016-06-111-0/+14
| |\ \ \
| * | | | Add user ID to log entries in admin pageLukas Reschke2016-06-101-0/+1
* | | | | remove svg classesHendrik Leppelsack2016-07-015-14/+14
| |_|_|/ |/| | |
* | | | Merge pull request #25261 from owncloud/app-password-login-nameVincent Petry2016-06-271-2/+10
|\ \ \ \
| * | | | fix layoutChristoph Wurst2016-06-241-3/+10
| * | | | show which login name to use for the new app passwordChristoph Wurst2016-06-241-0/+1
| | |_|/ | |/| |
* / | | remove ie8+9 supportHendrik Leppelsack2016-06-231-2/+2
|/ / /