Commit Graph

38829 Commits

Author SHA1 Message Date
Lukas Reschke a5ccb31e85
Mark IP as whitelisted if brute force protection is disabled
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>
2017-05-01 18:31:45 +02:00
Lukas Reschke a2f6fea408 Merge pull request #4610 from nextcloud/js-semicolons
Fix semicolon at end of JS lines
2017-05-01 16:55:35 +02:00
Lukas Reschke 99f98ca343 Merge pull request #4614 from nextcloud/js-fix-dialogs-and-octemplate
Fix variable definitions in oc dialogs
2017-05-01 16:54:53 +02:00
Lukas Reschke 1e35c9d8b6 Merge pull request #4513 from nextcloud/bump-version-to-beta1
Bump version to Nextcloud 12.0 beta 1
2017-05-01 16:53:16 +02:00
Roeland Jago Douma 18b5e2fced Merge pull request #4616 from nextcloud/js-reduce-complexity-for-sharedialogview.js
Fix variable definition in sharedialogview.js
2017-05-01 14:21:28 +02:00
Morris Jobke 23858504eb
Fix variable definition in sharedialogview.js
* improves readability of conditional statements
  and fixes warning in JSLint for varibale definition

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 01:32:54 -03:00
Morris Jobke d222351c87
Fix variable definitions in oc dialogs
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 01:09:29 -03:00
Morris Jobke 11b9d224fd
Fix semicolon at end of JS lines
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 00:42:53 -03:00
Nextcloud bot 2152d5f1f6
[tx-robot] updated from transifex 2017-05-01 00:07:32 +00:00
Morris Jobke 285a5b98b0 Merge pull request #4602 from nextcloud/make-tooltip-intransparent
Make tooltip intransparent
2017-04-30 11:13:36 -03:00
Nextcloud bot 4518f6dc64
[tx-robot] updated from transifex 2017-04-30 00:07:21 +00:00
blizzz 9edd3916ff Merge pull request #4603 from nextcloud/basic-settings
Rename “Server settings” to “Basic settings”
2017-04-29 23:28:50 +02:00
Marius Blüm f26764c790
Rename “Server settings” to “Basic settings”
* fixes #4587

Signed-off-by: Marius Blüm <marius@lineone.io>
2017-04-29 17:13:21 +02:00
Jan-Christoph Borchardt fabaf09d4f Merge pull request #4583 from nextcloud/theming-fixes-admin
Theming admin section fixes
2017-04-29 17:05:11 +02:00
Morris Jobke 55da62a29c
Make tooltip intransparent
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-29 10:44:38 -03:00
Morris Jobke 9af26d1db5 Merge pull request #4597 from nextcloud/tooltips-invert
Invert tooltip color to white, fix #4563
2017-04-29 10:43:33 -03:00
Jan-Christoph Borchardt 41b67e3d17 Invert tooltip color to white, fix #4563
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-29 13:19:17 +02:00
Morris Jobke 854dfef199 Merge pull request #1234 from nextcloud/rebase-413-by-faldon
Disabling users in WebUI
2017-04-29 01:35:04 -03:00
Arthur Schiwon c0e4fd0605
align popovermenu next to … buttonthingy
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-29 00:59:09 -03:00
Arthur Schiwon 99e97f135d
consolidate setEnabled method
and fix a unit test

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-29 00:59:09 -03:00
Arthur Schiwon 668fe7df51
UserManager can now count disabled users
Users page takes advantage of that

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-29 00:59:09 -03:00
Christoph Wurst 8f5f26c88d
Use short array syntax
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-29 00:59:09 -03:00
Morris Jobke 4c37c38051
fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-29 00:59:09 -03:00
Morris Jobke 485d6d6577
use proper return codes and handle failure cases
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-29 00:59:09 -03:00
Morris Jobke 2507e7459d
Improve wording of error messages
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-29 00:59:09 -03:00
Morris Jobke 74802ca72f
fix greyed out display name
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-29 00:59:09 -03:00
Morris Jobke a8457df064
fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-29 00:59:09 -03:00
Morris Jobke 74e5091013
check $user object before using it
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-29 00:59:09 -03:00
Morris Jobke 72550377b4
add unit tests for enable method 2017-04-29 00:59:09 -03:00
Morris Jobke e521b6799f
add unit tests for disable method 2017-04-29 00:59:09 -03:00
Morris Jobke 79d74a1425
adjust tests to have at least one disabled user 2017-04-29 00:54:30 -03:00
Morris Jobke 7be031ae6d
change group id to _disabledUsers 2017-04-29 00:54:30 -03:00
Morris Jobke d91b4044fc
optimize SVGs 2017-04-29 00:54:30 -03:00
Roeland Jago Douma 84b4d448d0
Fix unit tests 2017-04-29 00:54:30 -03:00
Morris Jobke 0ab85018e3
improve layout 2017-04-29 00:54:30 -03:00
Thomas Pulzer 637c75bca1
Implemented visual feedback if a user is disabled in admin user menu.
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.
2017-04-29 00:54:30 -03:00
Julius Härtl 6e215a0874
Code cleanup and preview for undo actions
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-29 00:40:15 -03:00
Julius Härtl b436e43d68
Make sure that ThemingDefaults uses the correct default values from \OC_Defaults
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-29 00:40:15 -03:00
Julius Härtl 6b8341ce4b
Use generated SCSS for theming preview
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-29 00:40:15 -03:00
Morris Jobke 1307800561 Merge pull request #3869 from nextcloud/verify-personal-data
Verify personal data
2017-04-29 00:38:02 -03:00
Morris Jobke a0bf706983
Fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-29 00:13:41 -03:00
Bjoern Schiessle f488258d64
send signature to lookup server
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:38 -03:00
Roeland Jago Douma e3b10f3e6f
Updated autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-28 23:41:38 -03:00
Bjoern Schiessle 9b36f2d9ea
fix unit test
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:38 -03:00
Bjoern Schiessle 5464b14ef1
fix path to the website proof
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:38 -03:00
Bjoern Schiessle 7340d6a56c
don't add multiple retry jobs
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:38 -03:00
Bjoern Schiessle 4ec05ef050
cleanup template
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:38 -03:00
Bjoern Schiessle df1d1c6c8f
use already available instance if l10n
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:38 -03:00
Bjoern Schiessle 806ca43b52
allow to display the verification code also while verification is already running
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:38 -03:00
Bjoern Schiessle 9480b29413
move translatable strings out of the template
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:37 -03:00