summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7292 from Neraste/fix/4789_disabled_usersLukas Reschke2017-11-271-3/+3
|\ | | | | Fix #4789: Group admins cannot see disabled users
| * Fix #4789: Group admins cannot see disabled usersNeraste2017-11-271-3/+3
| |
* | Merge pull request #7264 from nextcloud/cache-fetched-appsLukas Reschke2017-11-272-14/+13
|\ \ | |/ |/| Cache fetched apps in update check
| * Make isUpdateAvailable non-staticMorris Jobke2017-11-251-7/+12
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Get the Installer via DIMorris Jobke2017-11-251-7/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2017-11-252-0/+20
|/
* [tx-robot] updated from transifexNextcloud bot2017-11-232-8/+8
|
* Make user-related icons bigger.Marin Treselj2017-11-203-2/+2
| | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* Re-optimize and clean up settings, social and logo iconsMarin Treselj2017-11-2010-16/+9
| | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* [tx-robot] updated from transifexNextcloud bot2017-11-204-20/+40
|
* [tx-robot] updated from transifexNextcloud bot2017-11-192-0/+2
|
* [tx-robot] updated from transifexNextcloud bot2017-11-162-0/+8
|
* [tx-robot] updated from transifexNextcloud bot2017-11-152-0/+10
|
* Fix search in user managent when no group is selectedMorris Jobke2017-11-141-1/+1
| | | | | | * also allows to search by displayname Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2017-11-148-2/+160
|
* [tx-robot] updated from transifexNextcloud bot2017-11-1210-108/+138
|
* [tx-robot] updated from transifexNextcloud bot2017-11-1188-86/+4554
|
* [tx-robot] updated from transifexNextcloud bot2017-11-1024-0/+4610
|
* [tx-robot] updated from transifexNextcloud bot2017-11-0956-56/+0
|
* Fix welcome text for better grammar in themed instancesMorris Jobke2017-11-091-1/+1
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2017-11-0970-252/+994
|
* Merge pull request #6788 from staabm/masterLukas Reschke2017-11-089-33/+33
|\ | | | | Prevent XSS in links which open a new browser window
| * Prevent XSS in links which open a new browser windowMarkus Staab2017-10-199-33/+33
| |
* | [tx-robot] updated from transifexNextcloud bot2017-11-084-28/+28
| |
* | [tx-robot] updated from transifexNextcloud bot2017-11-074-0/+1824
| |
* | Change @georgehrke's emailMorris Jobke2017-11-068-8/+8
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Update license headersMorris Jobke2017-11-0628-29/+83
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2017-11-062-6/+6
| |
* | Add variable for border-radiusJan-Christoph Borchardt2017-11-031-3/+3
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | [tx-robot] updated from transifexNextcloud bot2017-11-034-2/+1030
| |
* | Fix settings section whitespaceJan-Christoph Borchardt2017-11-021-1/+4
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | [tx-robot] updated from transifexNextcloud bot2017-11-022-0/+4
| |
* | Merge pull request #6667 from nextcloud/settings-headingJan-Christoph Borchardt2017-11-011-1/+8
|\ \ | | | | | | Adjust settings navigation headings to style used in Mail & Calendar
| * | Adjust settings navigation heading styleJan-Christoph Borchardt2017-09-281-1/+8
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | [tx-robot] updated from transifexNextcloud bot2017-11-012-0/+4
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-10-304-8/+8
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-10-274-30/+34
| | |
* | | Merge pull request #6973 from nextcloud/menu-highlightMorris Jobke2017-10-261-0/+2
|\ \ \ | | | | | | | | Add blue bar as highlight to active menu entry
| * | | Add blue highlight to active menu entryJan-Christoph Borchardt2017-10-241-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | [tx-robot] updated from transifexNextcloud bot2017-10-262-0/+4
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-10-254-2/+234
|/ / /
* | | Merge pull request #6919 from nextcloud/di-appmanager-encryption-migrationMorris Jobke2017-10-241-4/+13
|\ \ \ | | | | | | | | Use DI for IAppManager to encryption migration
| * | | Use DI for IAppManager to encryption migrationMorris Jobke2017-10-241-4/+13
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #6920 from nextcloud/appmanager-usageMorris Jobke2017-10-241-2/+3
|\ \ \ \ | | | | | | | | | | Use appmanager instead of OC_App for check for enabled app
| * | | | Use appmanager instead of OC_App for check for enabled appMorris Jobke2017-10-231-2/+3
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2017-10-2470-78/+1018
| | | |
* | | | Merge pull request #6916 from nextcloud/css-box-sizingJohn Molakvoæ2017-10-231-2/+0
|\ \ \ \ | | | | | | | | | | Box-sizing does not need vendor prefix anymore
| * | | | Box-sizing does not need vendor prefix anymoreMorris Jobke2017-10-231-2/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | http://caniuse.com/#search=box-sizing Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #6848 from nextcloud/user-app-nav-to-css-guidelinesJohn Molakvoæ2017-10-233-106/+45
|\ \ \ \ | |/ / / |/| | | User settings app-navigation to css guidelines
| * | | Fix deletion feedbackJohn Molakvoæ (skjnldsv)2017-10-212-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>