summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add missing spaceLukas Reschke2017-05-011-1/+1
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Mark IP as whitelisted if brute force protection is disabledLukas Reschke2017-05-012-8/+55
| | | | | | | | Currently, when disabling the brute force protection no new brute force attempts are logged. However, the ones logged within the last 24 hours will still be used for throttling. This is quite an unexpected behaviour and caused some support issues. With this change when the brute force protection is disabled also the existing attempts within the last 24 hours will be disregarded. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #4610 from nextcloud/js-semicolonsLukas Reschke2017-05-018-16/+16
|\ | | | | Fix semicolon at end of JS lines
| * Fix semicolon at end of JS linesMorris Jobke2017-05-018-16/+16
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4614 from nextcloud/js-fix-dialogs-and-octemplateLukas Reschke2017-05-013-4/+6
|\ \ | | | | | | Fix variable definitions in oc dialogs
| * | Fix variable definitions in oc dialogsMorris Jobke2017-05-013-4/+6
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4513 from nextcloud/bump-version-to-beta1Lukas Reschke2017-05-011-1/+1
|\ \ | | | | | | Bump version to Nextcloud 12.0 beta 1
| * | Bump version to Nextcloud 12.0 beta 1Lukas Reschke2017-04-261-2/+2
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #4616 from ↵Roeland Jago Douma2017-05-011-7/+4
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/js-reduce-complexity-for-sharedialogview.js Fix variable definition in sharedialogview.js
| * | | Fix variable definition in sharedialogview.jsMorris Jobke2017-05-011-7/+4
|/ / / | | | | | | | | | | | | | | | | | | * improves readability of conditional statements and fixes warning in JSLint for varibale definition Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-05-01102-66/+630
| | |
* | | Merge pull request #4602 from nextcloud/make-tooltip-intransparentMorris Jobke2017-04-301-2/+2
|\ \ \ | |_|/ |/| | Make tooltip intransparent
| * | Make tooltip intransparentMorris Jobke2017-04-291-2/+2
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-04-30166-206/+274
| | |
* | | Merge pull request #4603 from nextcloud/basic-settingsblizzz2017-04-292-3/+3
|\ \ \ | | | | | | | | Rename “Server settings” to “Basic settings”
| * | | Rename “Server settings” to “Basic settings”Marius Blüm2017-04-292-3/+3
|/ / / | | | | | | | | | | | | | | | * fixes #4587 Signed-off-by: Marius Blüm <marius@lineone.io>
* | | Merge pull request #4583 from nextcloud/theming-fixes-adminJan-Christoph Borchardt2017-04-297-132/+114
|\ \ \ | |/ / |/| | Theming admin section fixes
| * | Code cleanup and preview for undo actionsJulius Härtl2017-04-293-34/+19
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Make sure that ThemingDefaults uses the correct default values from \OC_DefaultsJulius Härtl2017-04-293-56/+36
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Use generated SCSS for theming previewJulius Härtl2017-04-294-45/+62
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #4597 from nextcloud/tooltips-invertMorris Jobke2017-04-291-30/+31
|\ \ \ | | | | | | | | Invert tooltip color to white, fix #4563
| * | | Invert tooltip color to white, fix #4563Jan-Christoph Borchardt2017-04-291-30/+31
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #1234 from nextcloud/rebase-413-by-faldonMorris Jobke2017-04-2914-110/+878
|\ \ \ \ | |_|/ / |/| | | Disabling users in WebUI
| * | | align popovermenu next to … buttonthingyArthur Schiwon2017-04-291-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | consolidate setEnabled methodArthur Schiwon2017-04-292-88/+28
| | | | | | | | | | | | | | | | | | | | | | | | and fix a unit test Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | UserManager can now count disabled usersArthur Schiwon2017-04-294-8/+60
| | | | | | | | | | | | | | | | | | | | | | | | Users page takes advantage of that Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | Use short array syntaxChristoph Wurst2017-04-291-112/+111
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | fix unit testsMorris Jobke2017-04-291-16/+6
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | use proper return codes and handle failure casesMorris Jobke2017-04-293-7/+21
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Improve wording of error messagesMorris Jobke2017-04-293-11/+11
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | fix greyed out display nameMorris Jobke2017-04-291-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | fix unit testsMorris Jobke2017-04-291-24/+13
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | check $user object before using itMorris Jobke2017-04-291-24/+24
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | add unit tests for enable methodMorris Jobke2017-04-291-1/+221
| | | |
| * | | add unit tests for disable methodMorris Jobke2017-04-291-1/+219
| | | |
| * | | adjust tests to have at least one disabled userMorris Jobke2017-04-291-2/+13
| | | |
| * | | change group id to _disabledUsersMorris Jobke2017-04-295-15/+15
| | | |
| * | | optimize SVGsMorris Jobke2017-04-292-20/+4
| | | |
| * | | Fix unit testsRoeland Jago Douma2017-04-291-1/+59
| | | |
| * | | improve layoutMorris Jobke2017-04-291-5/+14
| | | |
| * | | Implemented visual feedback if a user is disabled in admin user menu.Thomas Pulzer2017-04-2910-41/+324
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented visuals for enabling/disabling user from admin user list. Added the controller functions for enabling/disabling a user. Added the route for changing user status (enabled/disabled) and added an additional route handler in the user controller. Finished the visuals to reflect current user status and changed user status respectively. Changed the single icon for enabling/disabling a user into a menu where deletion and state toggling of a user is selectable. Added displaying of disabled user count. Improved style of user action menu. Added proper counting of disabled users. Removed visual indicator for disabled users. Moved pseudo-group detection for disabled users from frontend to the controller. Changed units for newly introduced css values from em to px. Removed unnecessary png and optimized svg with scour. Changed the userlist template to display the user action menu with correct width. Style fixes for better readability and coding style conformity. Changed the icons for enabling, disabling and deleting a user in the action menu.
* | | Merge pull request #3869 from nextcloud/verify-personal-dataMorris Jobke2017-04-2923-56/+957
|\ \ \ | | | | | | | | Verify personal data
| * | | Fix unit testsMorris Jobke2017-04-291-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | send signature to lookup serverBjoern Schiessle2017-04-282-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | Updated autoloaderRoeland Jago Douma2017-04-282-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | fix unit testBjoern Schiessle2017-04-281-21/+24
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | fix path to the website proofBjoern Schiessle2017-04-282-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | don't add multiple retry jobsBjoern Schiessle2017-04-281-13/+21
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | cleanup templateBjoern Schiessle2017-04-283-18/+25
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | use already available instance if l10nBjoern Schiessle2017-04-281-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-09 15:57:00 +0000