]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
8 years ago[stable10] Change app menu to white background with dark icons (#665)
Julius Härtl [Tue, 2 Aug 2016 17:18:00 +0000 (19:18 +0200)]
[stable10] Change app menu to white background with dark icons  (#665)

* Change app menu to white

* adjust opacity of icons in apps and user menu

* Move to svg filter on app menu to support IE9+

* fix shading of apps icon in app menu

* Fix wrong preserveAspectRatio at app menu icons

* Apply inverted app icon style to newly installed icons

8 years agoMerge pull request #696 from nextcloud/stable10-backport-shake-login
Jan-Christoph Borchardt [Tue, 2 Aug 2016 13:33:33 +0000 (15:33 +0200)]
Merge pull request #696 from nextcloud/stable10-backport-shake-login

[stable10] Shake the login fields if password is wrong

8 years agoRebranded to Nextcloud for the occ command line tool (#692)
Morris Jobke [Tue, 2 Aug 2016 08:14:19 +0000 (10:14 +0200)]
Rebranded to Nextcloud for the occ command line tool (#692)

8 years agoShake the login fields if password is wrong 696/head
Morris Jobke [Mon, 1 Aug 2016 19:29:30 +0000 (21:29 +0200)]
Shake the login fields if password is wrong

8 years agoMerge pull request #683 from nextcloud/stable10-fix-theming-logo
Jan-Christoph Borchardt [Mon, 1 Aug 2016 19:01:51 +0000 (21:01 +0200)]
Merge pull request #683 from nextcloud/stable10-fix-theming-logo

[stable10] fix missing semicolon to fix themed logo on log in page

8 years agoMerge pull request #593 from nextcloud/ldap-avoidneedlesssetemailonlogin-stable10
Morris Jobke [Mon, 1 Aug 2016 16:22:20 +0000 (18:22 +0200)]
Merge pull request #593 from nextcloud/ldap-avoidneedlesssetemailonlogin-stable10

[stable10] Prevent setting email and triggering events at login time (#25554)

8 years agoMerge pull request #668 from nextcloud/stable10-video-container-size
Morris Jobke [Mon, 1 Aug 2016 16:17:40 +0000 (18:17 +0200)]
Merge pull request #668 from nextcloud/stable10-video-container-size

[stable10] up the minimum size of the public share video a bit, use 16/9 ratio

8 years agofix missing semicolon to fix themed logo on log in page 683/head
Jan-Christoph Borchardt [Mon, 1 Aug 2016 06:39:40 +0000 (08:39 +0200)]
fix missing semicolon to fix themed logo on log in page

8 years agoMerge pull request #667 from thelinuxfr/stable10
Morris Jobke [Sat, 30 Jul 2016 07:58:53 +0000 (09:58 +0200)]
Merge pull request #667 from thelinuxfr/stable10

[Stable10] Transifex Owncloud > Nextcloud

8 years agoTransifex Owncloud > Nextcloud 667/head
Frédéric LIETART [Fri, 29 Jul 2016 20:33:10 +0000 (22:33 +0200)]
Transifex Owncloud > Nextcloud

Change transifex link Owncloud > Nextcloud

8 years agoup the minimum size of the public share video a bit, use 16/9 ratio, fix #603 668/head
Jan-Christoph Borchardt [Thu, 28 Jul 2016 09:49:08 +0000 (11:49 +0200)]
up the minimum size of the public share video a bit, use 16/9 ratio, fix #603

8 years agoMerge pull request #654 from nextcloud/add-quotaplugin-v2-stable10
Morris Jobke [Fri, 29 Jul 2016 12:10:57 +0000 (14:10 +0200)]
Merge pull request #654 from nextcloud/add-quotaplugin-v2-stable10

[stable10] Add quotaplugin v2 stable10

8 years agoAdding quota plugin to new dav endpoint (#25615) 654/head
Thomas Müller [Fri, 29 Jul 2016 04:40:39 +0000 (06:40 +0200)]
Adding quota plugin to new dav endpoint (#25615)

* Adding quota plugin to new dav endpoint

* Added integrated test failing in old endpoint

* Added 0B quota test

8 years agoMerge pull request #639 from nextcloud/theming-firstrunwizard-stable10
Björn Schießle [Fri, 29 Jul 2016 09:37:25 +0000 (11:37 +0200)]
Merge pull request #639 from nextcloud/theming-firstrunwizard-stable10

[stable10] apply theme to the firstrunwizard

8 years agoMerge pull request #641 from nextcloud/backport-566-stable10
Morris Jobke [Fri, 29 Jul 2016 06:59:36 +0000 (08:59 +0200)]
Merge pull request #641 from nextcloud/backport-566-stable10

[stable10] revert to old setup connection logic

8 years agorevert to old setup connection logic 641/head
Robin Appelman [Tue, 26 Jul 2016 09:44:15 +0000 (11:44 +0200)]
revert to old setup connection logic

8 years agoMerge pull request #618 from nextcloud/backport-519-stable10
Morris Jobke [Thu, 28 Jul 2016 21:13:21 +0000 (23:13 +0200)]
Merge pull request #618 from nextcloud/backport-519-stable10

Backport LDAPProvider to Nextcloud 10

8 years agoMerge pull request #610 from nextcloud/no-missing-preview-10
Morris Jobke [Thu, 28 Jul 2016 15:48:42 +0000 (17:48 +0200)]
Merge pull request #610 from nextcloud/no-missing-preview-10

[10] Don't try to load previews when we know there is none

8 years agofix background id selector for the first run wizard 639/head
Bjoern Schiessle [Thu, 28 Jul 2016 14:32:39 +0000 (16:32 +0200)]
fix background id selector for the first run wizard

8 years agofix unit tests
Bjoern Schiessle [Thu, 28 Jul 2016 09:45:42 +0000 (11:45 +0200)]
fix unit tests

8 years agore-use background color from theme in the firstrunwizard
Bjoern Schiessle [Thu, 28 Jul 2016 08:43:06 +0000 (10:43 +0200)]
re-use background color from theme in the firstrunwizard

8 years agoapply theme to the firstrunwizard
Bjoern Schiessle [Thu, 28 Jul 2016 08:33:07 +0000 (10:33 +0200)]
apply theme to the firstrunwizard

8 years agoMerge pull request #635 from nextcloud/stable10-backport-415
Björn Schießle [Thu, 28 Jul 2016 15:41:20 +0000 (17:41 +0200)]
Merge pull request #635 from nextcloud/stable10-backport-415

[stable10] Colorize checkboxes depending on theming color

8 years agoMerge pull request #619 from nextcloud/backport-494-systemtags-management
Morris Jobke [Thu, 28 Jul 2016 15:02:22 +0000 (17:02 +0200)]
Merge pull request #619 from nextcloud/backport-494-systemtags-management

[stable10] Add a simple Admin UI to manage systemtags

8 years agoMerge pull request #628 from nextcloud/stable10-backport-612
Morris Jobke [Thu, 28 Jul 2016 14:56:55 +0000 (16:56 +0200)]
Merge pull request #628 from nextcloud/stable10-backport-612

[stable10] libxml - compare against loaded version

8 years agoTheming: Cleanup and remove opacity from checkbox/radiobutton 634/head 635/head
Julius Haertl [Wed, 27 Jul 2016 18:03:53 +0000 (20:03 +0200)]
Theming: Cleanup and remove opacity from checkbox/radiobutton

8 years agoTheming: Generate colorized radio buttons dynamically
Julius Haertl [Mon, 25 Jul 2016 15:32:11 +0000 (17:32 +0200)]
Theming: Generate colorized radio buttons dynamically

8 years agoTheming: Colorize radio buttons and append new styles on preview
Julius Haertl [Mon, 25 Jul 2016 14:44:56 +0000 (16:44 +0200)]
Theming: Colorize radio buttons and append new styles on preview

8 years agoTheming: Clean up css generation and fix tests
Julius Haertl [Tue, 19 Jul 2016 12:39:53 +0000 (14:39 +0200)]
Theming: Clean up css generation and fix tests

8 years agoTheming: Colorize checkboxes depending on luminance
Julius Haertl [Tue, 19 Jul 2016 12:00:33 +0000 (14:00 +0200)]
Theming: Colorize checkboxes depending on luminance

8 years agoTheming: Preview for colorized checkboxes
Julius Haertl [Tue, 19 Jul 2016 11:53:47 +0000 (13:53 +0200)]
Theming: Preview for colorized checkboxes

8 years agoMerge pull request #622 from nextcloud/stable10-fix-searchbox-background
Morris Jobke [Thu, 28 Jul 2016 14:14:09 +0000 (16:14 +0200)]
Merge pull request #622 from nextcloud/stable10-fix-searchbox-background

[stable10] fix searchbox background

8 years agoMerge pull request #609 from nextcloud/stable10_606
Roeland Jago Douma [Thu, 28 Jul 2016 12:23:40 +0000 (14:23 +0200)]
Merge pull request #609 from nextcloud/stable10_606

Support subdir in the OCS v2 endpoint

8 years agolibxml - compare against loaded version 628/head
Morris Jobke [Wed, 27 Jul 2016 15:33:22 +0000 (17:33 +0200)]
libxml - compare against loaded version

* if the compiled in version is older than the loaded version Nextcloud doesn't work
* uses the loaded libxml version to check against

fixes #205

8 years agoSupport subdir in the OCS v2 endpoint 609/head
Roeland Jago Douma [Wed, 27 Jul 2016 13:28:35 +0000 (15:28 +0200)]
Support subdir in the OCS v2 endpoint

We should check against the ending substring since people could
run their nextcloud in a subfolder.

* Added test

8 years agoMerge pull request #614 from nextcloud/stable10-ns-server-contributing.md
Morris Jobke [Thu, 28 Jul 2016 09:08:59 +0000 (11:08 +0200)]
Merge pull request #614 from nextcloud/stable10-ns-server-contributing.md

[stable10] change core to server - backport of #533

8 years agoAdd a simple Admin UI to manage systemtags 619/head
Joas Schilling [Thu, 21 Jul 2016 08:51:42 +0000 (10:51 +0200)]
Add a simple Admin UI to manage systemtags

8 years agoBackport LDAPProvider to Nextcloud 10 618/head
root [Fri, 22 Jul 2016 08:46:29 +0000 (16:46 +0800)]
Backport LDAPProvider to Nextcloud 10

New LDAPProvider for user_ldap

final changes

comments amended

Nextcloud license header for new files

8 years agoFix unit tests 622/head
Morris Jobke [Thu, 21 Jul 2016 21:44:50 +0000 (23:44 +0200)]
Fix unit tests

8 years agoalso adjust log in background color in theme
Jan-Christoph Borchardt [Tue, 19 Jul 2016 10:08:59 +0000 (12:08 +0200)]
also adjust log in background color in theme

8 years agofix searchbox overlapping on mobile
Jan-Christoph Borchardt [Tue, 19 Jul 2016 10:05:57 +0000 (12:05 +0200)]
fix searchbox overlapping on mobile

8 years agochange core to server 614/head
Olivier Paroz [Thu, 28 Jul 2016 07:22:59 +0000 (09:22 +0200)]
change core to server

8 years agofix js test 610/head
Robin Appelman [Tue, 26 Jul 2016 13:10:37 +0000 (15:10 +0200)]
fix js test

8 years agoonly load sidebar previews when we know it's available
Robin Appelman [Tue, 26 Jul 2016 11:51:18 +0000 (13:51 +0200)]
only load sidebar previews when we know it's available

8 years agodont load filelist previews if we know we dont have one
Robin Appelman [Tue, 26 Jul 2016 11:40:44 +0000 (13:40 +0200)]
dont load filelist previews if we know we dont have one

8 years agoadd dav property to check if a file has a preview available
Robin Appelman [Tue, 26 Jul 2016 11:15:12 +0000 (13:15 +0200)]
add dav property to check if a file has a preview available

8 years agoMerge pull request #591 from nextcloud/fixing-undefined-OfflineUser-composeAndStoreDi...
Morris Jobke [Wed, 27 Jul 2016 13:25:31 +0000 (15:25 +0200)]
Merge pull request #591 from nextcloud/fixing-undefined-OfflineUser-composeAndStoreDisplayName-stable10

[stable10] Fix undefined OfflineUser::composeAndStoreDisplayName()

8 years agoMerge pull request #580 from nextcloud/backport-550-stable10
Morris Jobke [Wed, 27 Jul 2016 12:55:26 +0000 (14:55 +0200)]
Merge pull request #580 from nextcloud/backport-550-stable10

[stable10] fix autoloading in LPAP integration tests, resolves #544

8 years agoMerge pull request #599 from nextcloud/fix-defaultapp-master-stable10
Björn Schießle [Wed, 27 Jul 2016 12:30:56 +0000 (14:30 +0200)]
Merge pull request #599 from nextcloud/fix-defaultapp-master-stable10

Redirect to default page after login

8 years agoMerge pull request #588 from nextcloud/stable10-app-icons
Morris Jobke [Wed, 27 Jul 2016 11:03:51 +0000 (13:03 +0200)]
Merge pull request #588 from nextcloud/stable10-app-icons

[stable10] Add app icons for Comments and Tags

8 years agoRedirect to default page after login 599/head
Bjoern Schiessle [Wed, 27 Jul 2016 10:11:58 +0000 (12:11 +0200)]
Redirect to default page after login

8 years agoPrevent setting email and triggering events at login time (#25554) 593/head
Vincent Petry [Tue, 26 Jul 2016 19:09:25 +0000 (21:09 +0200)]
Prevent setting email and triggering events at login time (#25554)

Whenever an LDAP user also has an email address defined in LDAP, the
LDAP code will try and update the email address of the locally known
user. This happens at login time or every time the user's LDAP
attributes are processed.

There is code listening to the email setting hook which updates the
system address book, which also will trigger FS setup due to avatars
and other things.

This fix only sets the email address when really necessary.

8 years ago[stable9.1] Fix undefined OfflineUser::composeAndStoreDisplayName() - fixes #23248 591/head
Thomas Müller [Mon, 25 Jul 2016 07:46:19 +0000 (09:46 +0200)]
[stable9.1] Fix undefined OfflineUser::composeAndStoreDisplayName() - fixes #23248

8 years agoAdd icon for tags app 588/head
Marius Blüm [Wed, 27 Jul 2016 09:10:52 +0000 (11:10 +0200)]
Add icon for tags app

8 years agoAdd icon for comments app
Marius Blüm [Wed, 27 Jul 2016 09:09:32 +0000 (11:09 +0200)]
Add icon for comments app

8 years agoMerge pull request #569 from nextcloud/stable10-fix-theme-logo-position
Björn Schießle [Wed, 27 Jul 2016 08:21:45 +0000 (10:21 +0200)]
Merge pull request #569 from nextcloud/stable10-fix-theme-logo-position

[stable10] fix theme logo position

8 years agofix autoloading in LPAP integration tests, resolves #544 580/head
Arthur Schiwon [Mon, 25 Jul 2016 08:58:03 +0000 (10:58 +0200)]
fix autoloading in LPAP integration tests, resolves #544

8 years agoTheming: Fix preview and center alignment of logo 569/head
Julius Haertl [Mon, 25 Jul 2016 16:54:13 +0000 (18:54 +0200)]
Theming: Fix preview and center alignment of logo

8 years agoAdjust tests
Lukas Reschke [Fri, 22 Jul 2016 12:58:30 +0000 (14:58 +0200)]
Adjust tests

8 years agoUpdate header.css
Jos Poortvliet [Fri, 22 Jul 2016 12:23:00 +0000 (14:23 +0200)]
Update header.css

make the logo look good on the login page

8 years agoUpdate themingcontroller.php
Jos Poortvliet [Fri, 22 Jul 2016 10:25:58 +0000 (12:25 +0200)]
Update themingcontroller.php

8 years agoMerge pull request #562 from nextcloud/stable10-backport-557
Morris Jobke [Tue, 26 Jul 2016 10:06:49 +0000 (12:06 +0200)]
Merge pull request #562 from nextcloud/stable10-backport-557

[stable10] Add proper scope to files external CSS

8 years agoAdd proper scope to files external CSS 562/head
Morris Jobke [Mon, 25 Jul 2016 15:08:33 +0000 (17:08 +0200)]
Add proper scope to files external CSS

* for select2

8 years agoMerge pull request #551 from nextcloud/stable10-backport-547
Morris Jobke [Mon, 25 Jul 2016 14:08:14 +0000 (16:08 +0200)]
Merge pull request #551 from nextcloud/stable10-backport-547

[stable10] Fix error message while restoring all files

8 years agoFix error message while restoring all files 551/head
Morris Jobke [Mon, 25 Jul 2016 07:24:32 +0000 (09:24 +0200)]
Fix error message while restoring all files

* use $_POST['files'] only of ssinlge files are restored
* fixes #528

8 years agoMerge pull request #508 from nextcloud/stable10_ocs_appframework_xml
Morris Jobke [Mon, 25 Jul 2016 10:52:13 +0000 (12:52 +0200)]
Merge pull request #508 from nextcloud/stable10_ocs_appframework_xml

[Stable10] AppFramework do not get default response

8 years agoMerge pull request #548 from nextcloud/backport-530-theming-autoloading
Morris Jobke [Mon, 25 Jul 2016 09:10:01 +0000 (11:10 +0200)]
Merge pull request #548 from nextcloud/backport-530-theming-autoloading

[stable10] Make sure we try to autoload the class

8 years agoMake sure we try to autoload the class 548/head
Joas Schilling [Fri, 22 Jul 2016 14:49:33 +0000 (16:49 +0200)]
Make sure we try to autoload the class

8 years agoMerge pull request #513 from nextcloud/backport-505-license-mailmap
Morris Jobke [Fri, 22 Jul 2016 10:58:31 +0000 (12:58 +0200)]
Merge pull request #513 from nextcloud/backport-505-license-mailmap

[stable10] license and mailmap backports

8 years agoMerge pull request #515 from nextcloud/run-le-script-10
Morris Jobke [Fri, 22 Jul 2016 10:58:19 +0000 (12:58 +0200)]
Merge pull request #515 from nextcloud/run-le-script-10

[stable10] Run the license script

8 years agoRun the license script 515/head
Joas Schilling [Fri, 22 Jul 2016 07:45:36 +0000 (09:45 +0200)]
Run the license script

8 years agoFix e-mail in mailmap 513/head
Roeland Jago Douma [Thu, 21 Jul 2016 12:48:26 +0000 (14:48 +0200)]
Fix e-mail in mailmap

8 years agoFix more mailmap entries
Joas Schilling [Thu, 21 Jul 2016 15:32:03 +0000 (17:32 +0200)]
Fix more mailmap entries

8 years agoonly search the license header for @copyright statements
Bjoern Schiessle [Thu, 21 Jul 2016 16:01:31 +0000 (18:01 +0200)]
only search the license header for @copyright statements

8 years agoFix the license script
Joas Schilling [Thu, 21 Jul 2016 15:08:43 +0000 (17:08 +0200)]
Fix the license script

8 years agoMerge pull request #512 from nextcloud/backport-496-doc-fix-10
Roeland Douma [Fri, 22 Jul 2016 09:12:19 +0000 (11:12 +0200)]
Merge pull request #512 from nextcloud/backport-496-doc-fix-10

[stable10] Make the changes from doc fix persistant

8 years agoFIx typo 512/head
Joas Schilling [Fri, 22 Jul 2016 07:53:52 +0000 (09:53 +0200)]
FIx typo

8 years agoChange the app name
Joas Schilling [Thu, 21 Jul 2016 10:57:05 +0000 (12:57 +0200)]
Change the app name

8 years agoMake the changes from https://github.com/nextcloud/documentation/commit/6ccd2c5678b85...
Joas Schilling [Thu, 21 Jul 2016 10:26:48 +0000 (12:26 +0200)]
Make the changes from https://github.com/nextcloud/documentation/commit/6ccd2c5678b85d35a8673d784bef5c6c89e7ecb9 persistant

8 years agoAppFramework do not get default response 508/head
Roeland Jago Douma [Wed, 20 Jul 2016 19:30:39 +0000 (21:30 +0200)]
AppFramework do not get default response

The OCSResponse differs from other responses in that it defaults to
XML. However we fell back to json by default.

This makes sure that if nothing is set we don't pass anything.
Which defaults then to the controllers default (which is often 'json')
but in the case of the OCSResponse 'xml'.

8 years agoMerge pull request #495 from nextcloud/fix-layout-public-upload-stable10
Morris Jobke [Thu, 21 Jul 2016 17:50:42 +0000 (19:50 +0200)]
Merge pull request #495 from nextcloud/fix-layout-public-upload-stable10

[stable10] move closing div to the right place

8 years agomove closing div to the right place 495/head
Bjoern Schiessle [Wed, 20 Jul 2016 16:34:32 +0000 (18:34 +0200)]
move closing div to the right place

8 years agoMerge pull request #485 from nextcloud/stable10-reenable-help-section
Morris Jobke [Thu, 21 Jul 2016 07:18:50 +0000 (09:18 +0200)]
Merge pull request #485 from nextcloud/stable10-reenable-help-section

[Stable10] reenable help section

8 years agoMerge pull request #487 from nextcloud/stable10-link-proper
Morris Jobke [Thu, 21 Jul 2016 07:18:10 +0000 (09:18 +0200)]
Merge pull request #487 from nextcloud/stable10-link-proper

[stable10] Properly link to nextcloud

8 years agoMerge pull request #489 from nextcloud/stable10-brand-to-nextcloud
Morris Jobke [Thu, 21 Jul 2016 07:17:22 +0000 (09:17 +0200)]
Merge pull request #489 from nextcloud/stable10-brand-to-nextcloud

[stable10] Use proper branding

8 years agoUse proper branding 489/head
Lukas Reschke [Thu, 21 Jul 2016 00:20:29 +0000 (02:20 +0200)]
Use proper branding

Stable9 has this already

8 years ago[master] Properly link to nextcloud 487/head
Lukas Reschke [Thu, 21 Jul 2016 00:15:14 +0000 (02:15 +0200)]
[master] Properly link to nextcloud

8 years agoAdd proper links 485/head
Lukas Reschke [Thu, 21 Jul 2016 00:10:28 +0000 (02:10 +0200)]
Add proper links

8 years agoRevert "Remove "Help" link from personal sidebar"
Lukas Reschke [Thu, 21 Jul 2016 00:08:56 +0000 (02:08 +0200)]
Revert "Remove "Help" link from personal sidebar"

This reverts commit deef15a3c7119b2965e7212ce53ba70e6baed779.

8 years agoLink to proper clients
Lukas Reschke [Wed, 20 Jul 2016 23:56:47 +0000 (01:56 +0200)]
Link to proper clients

8 years agoPort 2d37341 to stable10
Lukas Reschke [Wed, 20 Jul 2016 23:46:11 +0000 (01:46 +0200)]
Port 2d37341 to stable10

8 years agoAdd ownCloud cert
Lukas Reschke [Wed, 20 Jul 2016 23:34:35 +0000 (01:34 +0200)]
Add ownCloud cert

8 years agoUse proper certificates
Lukas Reschke [Wed, 20 Jul 2016 23:32:59 +0000 (01:32 +0200)]
Use proper certificates

Ports https://github.com/nextcloud/server/commit/bcf693539be82e872ba4d6cceb1f430a4bb841d9

8 years agoMerge pull request #483 from nextcloud/use-proper-documentation-links
Lukas Reschke [Wed, 20 Jul 2016 22:47:27 +0000 (00:47 +0200)]
Merge pull request #483 from nextcloud/use-proper-documentation-links

Use proper documentation links

8 years agoUse proper documentation links 483/head
Lukas Reschke [Wed, 20 Jul 2016 22:36:52 +0000 (00:36 +0200)]
Use proper documentation links

Since it is just faking the 10 we need to hardcode this here...

8 years ago10.0 beta it is
Lukas Reschke [Wed, 20 Jul 2016 22:32:43 +0000 (00:32 +0200)]
10.0 beta it is

8 years agoMerge pull request #479 from nextcloud/add-bruteforce-throttler
Lukas Reschke [Wed, 20 Jul 2016 22:31:02 +0000 (00:31 +0200)]
Merge pull request #479 from nextcloud/add-bruteforce-throttler

Implement brute force protection

8 years agoMitigate race condition 479/head
Lukas Reschke [Wed, 20 Jul 2016 21:09:27 +0000 (23:09 +0200)]
Mitigate race condition

8 years agoJSON encode the values
Lukas Reschke [Wed, 20 Jul 2016 20:47:33 +0000 (22:47 +0200)]
JSON encode the values

8 years agoImplement brute force protection
Lukas Reschke [Wed, 20 Jul 2016 16:36:15 +0000 (18:36 +0200)]
Implement brute force protection

Class Throttler implements the bruteforce protection for security actions in
Nextcloud.

It is working by logging invalid login attempts to the database and slowing
down all login attempts from the same subnet. The max delay is 30 seconds and
the starting delay are 200 milliseconds. (after the first failed login)