summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-11-218-2/+48
|
* [tx-robot] updated from transifexNextcloud bot2016-11-208-2/+94
|
* [tx-robot] updated from transifexNextcloud bot2016-11-1932-32/+48
|
* Merge pull request #1447 from nextcloud/password-confirmation-for-some-actionsMorris Jobke2016-11-1814-95/+271
|\ | | | | Password confirmation for some actions
| * Fix user management callbacksMorris Jobke2016-11-181-34/+43
| | | | | | | | | | | | * properly handle user management actions like display name, email or password field change Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * fix displaynameMorris Jobke2016-11-181-1/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Fix error displaying on email and add confirmationJoas Schilling2016-11-181-21/+37
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Require password confirmation to change the QuotaJoas Schilling2016-11-182-3/+19
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Require confirmation to change the displaynameJoas Schilling2016-11-181-15/+31
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Confirm on create/delete groupJoas Schilling2016-11-181-2/+13
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * More fixesJoas Schilling2016-11-181-2/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Hide and show after updatingJoas Schilling2016-11-181-4/+10
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Require password confirmation for user managementJoas Schilling2016-11-186-14/+74
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Require confirmation when changing the email settingsJoas Schilling2016-11-182-10/+43
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Fix error message displayingJoas Schilling2016-11-181-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Require password confirmation for app passwordJoas Schilling2016-11-182-3/+10
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Require password confirmation for changing the emailJoas Schilling2016-11-182-0/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #2108 from nextcloud/properly-parse-ie-useragentLukas Reschke2016-11-181-1/+1
|\ \ | | | | | | Properly parse IE 11 user agent
| * | Properly parse IE 11 user agentMorris Jobke2016-11-141-1/+1
| | | | | | | | | | | | | | | | | | * fixes #2101 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2016-11-184-0/+12
| | |
* | | Merge pull request #2188 from nextcloud/remove-settings-pane-in-apps-managementMorris Jobke2016-11-171-5/+0
|\ \ \ | | | | | | | | Remove settings pane in app management
| * | | Remove settings pane in app managementMorris Jobke2016-11-171-5/+0
| | |/ | |/| | | | | | | | | | | | | | | | * experimental apps where removed with 32cf661215fb3926789054a3953b465fc2665330 (#1940) * fixes #2183 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #2163 from nextcloud/app-password-scope-warngingsMorris Jobke2016-11-171-2/+1
|\ \ \ | |/ / |/| | fix warnings when updating app password
| * | fix warnings when updating app passwordRobin Appelman2016-11-161-2/+1
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | [tx-robot] updated from transifexNextcloud bot2016-11-1722-26/+12
| | |
* | | Merge pull request #2131 from nextcloud/fix-tabs-in-translationRoeland Jago Douma2016-11-161-6/+10
|\ \ \ | | | | | | | | convert text to single line so tabs in translation issue is fixed
| * | | No HTML in stringRoeland Jago Douma2016-11-161-1/+10
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | convert text to single line so tabs in translation issue is fixedJan-Christoph Borchardt2016-11-161-6/+1
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #2146 from nextcloud/add_copy_tooltip_to_clipboardRoeland Jago Douma2016-11-161-10/+18
|\ \ \ \ | |_|/ / |/| | | Adds copy tooltip to clipboards
| * | | Fix tooltips - they now properly change on clickMorris Jobke2016-11-162-11/+19
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Adds copy tooltip to clipboardsRoeland Jago Douma2016-11-151-1/+1
| | |/ | |/| | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #719 from nextcloud/lockdownRoeland Jago Douma2016-11-163-12/+118
|\ \ \ | | | | | | | | Allow restricting of app password permissions
| * | | dropdown uiRobin Appelman2016-11-163-24/+40
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | enable deleting/configuring new tokensRobin Appelman2016-11-163-4/+12
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
| * | | allow configuring filesystem accessRobin Appelman2016-11-163-5/+73
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
| * | | app password scope wipRobin Appelman2016-11-163-7/+21
| | |/ | |/| | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
* | | left-align social media buttons correctly on Personal page tooJan-Christoph Borchardt2016-11-161-1/+1
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Move social buttons to bottom on admin pageRoeland Jago Douma2016-11-162-1/+3
|/ / | | | | | | | | | | For #2134 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / Adjust previous fallbacksLukas Reschke2016-11-151-4/+4
|/ | | | | | 11.0 is 11 and not 9.2 anymore Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #2093 from nextcloud/fix-single-author-with-detailsJoas Schilling2016-11-142-11/+33
|\ | | | | Fix single author with details
| * Fixes javascript tests for apps.jsRoeland Jago Douma2016-11-131-10/+21
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix single author with detailsJoas Schilling2016-11-111-1/+12
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2016-11-142-0/+6
| |
* | [tx-robot] updated from transifexNextcloud bot2016-11-134-2/+6
|/
* [tx-robot] updated from transifexNextcloud bot2016-11-1050-50/+8
|
* [tx-robot] updated from transifexNextcloud bot2016-11-0852-104/+104
|
* Merge pull request #2026 from nextcloud/setting_langMorris Jobke2016-11-074-56/+97
|\ | | | | Move setlanguage to controller
| * Fix route and jsRoeland Jago Douma2016-11-063-56/+11
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add settings PersonalControllerRoeland Jago Douma2016-11-061-0/+86
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2016-11-076-0/+18
| |