summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-03-184-26/+52
|
* Merge pull request #3875 from nextcloud/use-new-short-urlsRoeland Jago Douma2017-03-171-2/+2
|\ | | | | Use cleaner social media URLs
| * Use cleaner social media URLsLukas Reschke2017-03-161-2/+2
| | | | | | | | | | | | We now have nice cleaner URLs since a longer time, let's use them. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | [tx-robot] updated from transifexNextcloud bot2017-03-172-0/+16
|/
* Merge pull request #3008 from nextcloud/appmenu-experimentMorris Jobke2017-03-161-30/+75
|\ | | | | Show apps in header
| * Rebuild menu to keep order of icons correctJulius Haertl2017-03-161-28/+35
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * Make enabling/disabling apps work with the new menuJulius Haertl2017-03-161-19/+57
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | Harden t() with DOMPurifyLukas Reschke2017-03-161-1/+0
| | | | | | | | | | | | This mitigates issues where developers pass untrusted user-input through t() which may lead to XSS issues. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #3802 from Ko-/masterRoeland Jago Douma2017-03-162-1/+18
|\ \ | |/ |/| Check that set_time_limit is not disabled before calling it
| * Add warning on admin screen when set_time_limit is unavailableKo-2017-03-161-0/+15
| |
| * Check that set_time_limit is not disabled before calling itKo-2017-03-111-1/+3
| | | | | | | | Signed-off-by: Ko- <k.stoffelen@cs.ru.nl>
* | [tx-robot] updated from transifexNextcloud bot2017-03-156-0/+8
| |
* | [tx-robot] updated from transifexNextcloud bot2017-03-142-12/+16
| |
* | Remove the double password confirmation on changing cronJoas Schilling2017-03-131-3/+6
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #3819 from nextcloud/dont-add-user-to-subadminRoeland Jago Douma2017-03-131-1/+1
|\ \ | | | | | | Call right function after sudo mode
| * | Call right function after sudo modeLukas Reschke2017-03-131-1/+1
| | | | | | | | | | | | | | | | | | This should call the `applyGroupSelect` and not the `applySubadminSelect`. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #3803 from Thijsdh/masterLukas Reschke2017-03-131-0/+6
|\ \ \ | |/ / |/| | Create app password by pressing enter
| * | Create app password by pressing enterThijs den Hartog2017-03-131-0/+6
| |/ | | | | | | Signed-off-by: Thijs den Hartog <Thijs@thijsbeer.nl>
* | [tx-robot] updated from transifexNextcloud bot2017-03-136-2/+22
| |
* | [tx-robot] updated from transifexNextcloud bot2017-03-1216-14/+32
|/
* [tx-robot] updated from transifexNextcloud bot2017-03-116-0/+6
|
* Merge pull request #3755 from nextcloud/scan-tipstricksLukas Reschke2017-03-101-0/+1
|\ | | | | Add security scan to tips & tricks section
| * Add security scan to tips & tricks sectionMarius Blüm2017-03-071-0/+1
| | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* | Merge pull request #3690 from nextcloud/cleanup-legacy-groups-classMorris Jobke2017-03-091-1/+1
|\ \ | | | | | | Remove legacy class OC_Group and OC_User
| * | Remove legacy class OC_Group and OC_UserMorris Jobke2017-03-091-1/+1
| | | | | | | | | | | | | | | | | | * basically a straight replacement of the wrapped code at the calling code parts Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-03-102-0/+2
|/ /
* / [tx-robot] updated from transifexNextcloud bot2017-03-0912-2/+106
|/
* Merge pull request #3671 from nextcloud/1070-user-management-no-resultsJoas Schilling2017-03-072-0/+25
|\ | | | | FIX: Add feedback on user settings when no results
| * clean search when new user is addedgiorgia2017-03-032-7/+18
| | | | | | | | Signed-off-by: giorgia <g.sambrotta@gmail.com>
| * add emptycontent div, show/hide emptycontent div, fix #1070giorgia2017-03-032-0/+14
| | | | | | | | Signed-off-by: giorgia <g.sambrotta@gmail.com>
* | Avatar button layout improvementsMorris Jobke2017-03-061-1/+8
| | | | | | | | | | | | * fixes #3736 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2017-03-072-0/+30
| |
* | [tx-robot] updated from transifexNextcloud bot2017-03-062-2/+4
| |
* | [tx-robot] updated from transifexNextcloud bot2017-03-044-0/+8
|/
* [tx-robot] updated from transifexNextcloud bot2017-03-038-0/+16
|
* [tx-robot] updated from transifexNextcloud bot2017-03-0222-2/+10
|
* [tx-robot] updated from transifexNextcloud bot2017-03-0240-40/+0
|
* [tx-robot] updated from transifexNextcloud bot2017-03-014-12/+12
|
* Merge pull request #3635 from individual-it/fix_quota_validationMorris Jobke2017-02-281-1/+1
|\ | | | | better quota validation
| * better quota validationArtur Neumann2017-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | this fixes #3634 1. fixed computerFileSize to be more picky about incorrect values 2. more tests for computerFileSize 3. use computerFileSize to validate user quota Signed-off-by: Artur Neumann <info@individual-it.net>
* | [tx-robot] updated from transifexNextcloud bot2017-02-282-0/+4
| |
* | [tx-robot] updated from transifexNextcloud bot2017-02-274-2/+4
| |
* | [tx-robot] updated from transifexNextcloud bot2017-02-2518-6/+30
| |
* | Merge pull request #3489 from nextcloud/give-hint-about-opcacheMorris Jobke2017-02-241-0/+39
|\ \ | | | | | | Show info in admin settings about PHP opcache if disabled
| * | Show info in admin settings about PHP opcache if disabledMorris Jobke2017-02-221-0/+39
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-02-2448-46/+286
| | |
* | | Merge pull request #3590 from individual-it/correct_text_when_disabling_appLukas Reschke2017-02-231-1/+2
|\ \ \ | | | | | | | | show correct text when disabling App
| * | | show correct text when disabling App Artur Neumann2017-02-231-1/+2
| | |/ | |/| | | | | | | | | | | | | | | | during the process of disabling an App the button would show "Enabling app …" This is corrected by this patch Signed-off-by: Artur Neumann <info@individual-it.net>
* | | [tx-robot] updated from transifexNextcloud bot2017-02-2368-72/+98
| | |
* | | detail wording: password reset instead of recoveryJan-Christoph Borchardt2017-02-221-1/+1
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>