summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-02-024-2/+4
|
* [tx-robot] updated from transifexNextcloud bot2017-02-014-34/+54
|
* [tx-robot] updated from transifexNextcloud bot2017-01-314-4/+4
|
* [tx-robot] updated from transifexNextcloud bot2017-01-304-2/+8
|
* [tx-robot] updated from transifexNextcloud bot2017-01-2818-220/+420
|
* [tx-robot] updated from transifexNextcloud bot2017-01-276-2/+310
|
* Merge pull request #3208 from ↵Morris Jobke2017-01-251-8/+7
|\ | | | | | | | | nextcloud/issue-3125-bring-user-management-endpoints-in-line Error out when subadmin doesn't select any group
| * Error out when subadmin doesn't select any groupJoas Schilling2017-01-231-8/+7
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #3252 from nextcloud/remove-activity-icon-hackingMorris Jobke2017-01-252-7/+0
|\ \ | | | | | | Remove the icon since it's defined by the app itself
| * | Remove the icon since it's defined by the app itselfJoas Schilling2017-01-252-7/+0
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #3255 from nextcloud/fix-password-formMorris Jobke2017-01-252-7/+9
|\ \ \ | | | | | | | | fix personal page password form layout
| * | | fix personal page password form layoutJan-Christoph Borchardt2017-01-252-7/+9
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | [tx-robot] updated from transifexNextcloud bot2017-01-268-4/+52
|/ / /
* | | Merge pull request #3241 from nextcloud/fix-padding-settingsJoas Schilling2017-01-251-1/+1
|\ \ \ | |/ / |/| | Fix left padding for settings sidebar
| * | Fix left padding for settings sidebarMorris Jobke2017-01-241-1/+1
| | | | | | | | | | | | | | | | | | * followup to #3151 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #3239 from nextcloud/added-inline-buttonChristoph Wurst2017-01-251-1/+1
|\ \ \ | | | | | | | | fix #3235
| * | | fix #3235John Molakvoæ (skjnldsv)2017-01-241-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | [tx-robot] updated from transifexNextcloud bot2017-01-2510-10/+26
| |/ / |/| |
* | | Merge pull request #3151 from nextcloud/navigation-iconsMorris Jobke2017-01-249-5/+75
|\ \ \ | |/ / |/| | add icons to navigation of personal & admin settings
| * | Add the icon for the default sectionsJoas Schilling2017-01-196-34/+0
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Allow apps to specify an icon with the sections via the APIJoas Schilling2017-01-193-6/+35
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | add viewBox to not run into scaling issuesMorris Jobke2017-01-194-4/+4
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | add icons to admin settings navigationJan-Christoph Borchardt2017-01-197-2/+40
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | add icons to personal settings navigationJan-Christoph Borchardt2017-01-197-2/+39
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | [tx-robot] updated from transifexNextcloud bot2017-01-24120-354/+356
| | |
* | | Merge pull request #3192 from nextcloud/fix-app-settings-layout-minorMorris Jobke2017-01-232-1/+11
|\ \ \ | | | | | | | | Fix gap by filter svg and empty search message overflow
| * | | Add classJohn Molakvoæ (skjnldsv)2017-01-232-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Fix gap by filter svg and empty search message overflowFelix A. Epp2017-01-222-1/+11
| |/ / | | | | | | | | | Signed-off-by: Felix A. Epp <work@felixepp.de>
* | | Merge pull request #3141 from ↵Joas Schilling2017-01-233-120/+51
|\ \ \ | |_|/ |/| | | | | | | | nextcloud/subadmin-check-on-removing-user-from-group Subadmin check on removing user from group
| * | Remove the old ajax fileJoas Schilling2017-01-181-92/+0
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Use the provisioning api in the user management to handle group membershipsJoas Schilling2017-01-182-28/+51
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2017-01-232-4/+4
| |
* | Merge pull request #3187 from nextcloud/inputs-scss-optimisationMorris Jobke2017-01-221-4/+4
|\ \ | | | | | | Inputs.scss rewritting and optimisation
| * | Fixed edit icon positionJohn Molakvoæ (skjnldsv)2017-01-211-1/+1
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fixed strengthify wrapperJohn Molakvoæ (skjnldsv)2017-01-211-3/+3
| |/ | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* / [tx-robot] updated from transifexNextcloud bot2017-01-222-6/+6
|/
* [tx-robot] updated from transifexNextcloud bot2017-01-182-2/+2
|
* Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptionsJoas Schilling2017-01-174-5/+99
|\ | | | | Markdown support for app descriptions
| * add a bit of space around paragraphsMorris Jobke2017-01-161-0/+3
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * fix list style of app descriptionMorris Jobke2017-01-162-4/+18
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Allow ordered lists as wellJoas Schilling2017-01-161-1/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Manually whitelist tagsLukas Reschke2017-01-131-1/+16
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Apply DOMPurify over HTMLLukas Reschke2017-01-132-2/+3
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Fix JSUnit testsMorris Jobke2017-01-131-0/+10
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Don't render non HTTP links, images and quotesJoas Schilling2017-01-131-1/+47
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Render markdownJoas Schilling2017-01-132-2/+6
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #3070 from dnel/Clarify-English-settingJoas Schilling2017-01-161-1/+1
|\ \ | | | | | | Clarify that English refers to US English
| * | Update personal.phpDavid Nelson2017-01-131-1/+1
| |/
* | [tx-robot] updated from transifexNextcloud bot2017-01-164-12/+12
| |
* | use tooltip in user listChristoph Wurst2017-01-131-2/+2
|/ | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>