summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* [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>
| * Fix editing form visibilityJohn Molakvoæ (skjnldsv)2017-10-211-1/+1
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Edit form to guidelinesJohn Molakvoæ (skjnldsv)2017-10-213-62/+16
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * User settings app-navigation to css guidelinesJohn Molakvoæ (skjnldsv)2017-10-212-42/+27
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | [tx-robot] updated from transifexNextcloud bot2017-10-232-2/+2
| |
* | Merge pull request #6758 from nextcloud/allow-0-quota-againblizzz2017-10-221-1/+1
|\ \ | |/ |/| Allow quota of 0 again
| * Allow quota of 0 againJoas Schilling2017-10-191-1/+1
| | | | | | | | | | | | Regression from f1fccaca0605a5d183f78b2c39d2e09a54753787 Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2017-10-212-0/+4
| |
* | [tx-robot] updated from transifexNextcloud bot2017-10-202-2/+168
|/
* [tx-robot] updated from transifexNextcloud bot2017-10-1968-238/+238
|
* Set the data from the templateJoas Schilling2017-10-183-14/+4
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Set the subject with the email template to allow themingJoas Schilling2017-10-183-4/+10
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2017-10-182-0/+4
|
* fix urlBjoern Schiessle2017-10-171-2/+2
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* [tx-robot] updated from transifexNextcloud bot2017-10-172-0/+4
|
* EllipsisJohn Molakvoæ (skjnldsv)2017-10-141-0/+5
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Fix popover position and avatar loadingJohn Molakvoæ (skjnldsv)2017-10-143-36/+46
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* [tx-robot] updated from transifexNextcloud bot2017-10-144-16/+110
|
* [tx-robot] updated from transifexNextcloud bot2017-10-138-0/+110
|
* Correct class to quotaJohn Molakvoæ (skjnldsv)2017-10-121-3/+2
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* [tx-robot] updated from transifexNextcloud bot2017-10-1216-0/+60
|
* [tx-robot] updated from transifexNextcloud bot2017-10-1180-150/+150
|
* App management: Do not show udpdate category if no updates are availableJulius Härtl2017-10-101-3/+30
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* App management: Show proper message when no updates are availableJulius Härtl2017-10-102-6/+31
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* App management: do not reset update counter to 0 on category changeJulius Härtl2017-10-101-1/+0
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* App management: add update sectionJulius Härtl2017-10-103-16/+47
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* [tx-robot] updated from transifexNextcloud bot2017-10-102-10/+10
|
* [tx-robot] updated from transifexNextcloud bot2017-10-072-0/+2
|
* Merge pull request #6750 from nextcloud/fix-language-when-setting-passwordJoas Schilling2017-10-041-8/+8
|\ | | | | Fix language when trying to change password
| * Fix language when trying to change passwordJoas Schilling2017-10-041-8/+8
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | App management: add update availability to sortingJulius Härtl2017-10-031-2/+4
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2017-10-012-0/+4
| |
* | [tx-robot] updated from transifexNextcloud bot2017-09-304-2/+26
|/
* Merge pull request #6669 from nextcloud/various-css-fixesJohn Molakvoæ2017-09-284-61/+59
|\ | | | | Various css fixes
| * Popover to css guidelinesJohn Molakvoæ (skjnldsv)2017-09-283-38/+19
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Fix testsJohn Molakvoæ (skjnldsv)2017-09-281-1/+1
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>