Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Zhang <peter@innocraft.com>2022-07-08 14:24:54 +0300
committerGitHub <noreply@github.com>2022-07-08 14:24:54 +0300
commit5df7397b4276a8f23e5537b7ba84394f4238dbed (patch)
treef38e8706090a4fb6d687415a89b29377d9bfda11 /tests/resources/OmniFixture-dump.sql
parent49adc21534740eeb62a700562cdde095c7fa9589 (diff)
update invite user (#19366)4.11.0-rc2
* update invite update invite * update tests and VUE error update tests and VUE error * built vue files * update ui update ui * update vue update vue * update vue update vue * built vue files * Update UsersManager_spec.js update tests * update clean update clean * Update UsersManager_spec.js update success * Update UsersManager_spec.js remove popup error * update tests order update tests order * Update UsersManager_next_click.png updateui * revert screenshot revert screenshot * delete if user if declined delete use if declined add privacy split templated into 3 parts * remove decline remove decline * add invited by column add invited by column * Revert "add invited by column" This reverts commit e2358cb493684dc26fdf9a436d00a29981365861. * Update UserRepository.php add view user display * add email tests and update admin email add email tests and update admin email * update php cs update php cs * add expire task and default setting add expire task and default setting * add api tests add api tests * add filter add filter * update ui tests update ui tests * built vue files * update tests update tests * update signup and tests update signup and tests * update tests update tests * update screenshots update screenshots * update screenshots update screenshots * update ui update ui * update typo update typo * built vue files * Update core/Updates/4.12.0-b1.php Co-authored-by: Ben Burgess <88810029+bx80@users.noreply.github.com> * Update plugins/UsersManager/API.php Co-authored-by: Ben Burgess <88810029+bx80@users.noreply.github.com> * Update plugins/UsersManager/UsersManager.php Co-authored-by: Ben Burgess <88810029+bx80@users.noreply.github.com> * Update plugins/UsersManager/lang/en.json Co-authored-by: Ben Burgess <88810029+bx80@users.noreply.github.com> * Update config/global.ini.php Co-authored-by: Ben Burgess <88810029+bx80@users.noreply.github.com> * update email date update email date * update typo update typo * update UI update UI * Updated UI screenshot * Update plugins/Login/lang/en.json Co-authored-by: Stefan Giehl <stefan@matomo.org> * Update plugins/Login/templates/invitationDecline.twig Co-authored-by: Stefan Giehl <stefan@matomo.org> * update some feedbacks update some feedbacks * built vue files * update feedbacks update feedbacks * update filter update filter * pending your can't reset password pending your can't reset password * fix php cs fix php cs * update column update column * built vue files * set up terms in tests set up terms in tests * Update PendingUsers.php setup website * update tests and broken template update tests * update password update password * update screenshots update screenshots * add delete to admin add delete to admin * update invite success notification update invite success notification * add tests add tests * built vue files * update tests update tests * update UI and checkbox update UI and checkbox * Update Invite_spec.js show error screen * update tests update tests * update lang update lang * Update OmniFixture-dump.sql revert OmniFixture * update wording update wording * update version update version * fix change column fix change column * Update UsersManagerTest.php update tests * Update Model.php update tests * Update Model.php update tests * remove fixes remove fixes * Revert "remove fixes" This reverts commit f8fe33706513a32bf3386bc6b52800d68ec58562. * update tests update tests * revert password reset revert password reset * update tests update tests * update resend update resend * update tests update tests * Update PasswordResetter.php update tests * correct pending user from last time correct pending user from last time * apply some fixes /improvements * Apply suggestions from code review Co-authored-by: Ben Burgess <88810029+bx80@users.noreply.github.com> * Allow composer plugins for dev dependency codesniffer to fix travis builds. (#19468) Co-authored-by: peterhashair <peterhashair@users.noreply.github.com> Co-authored-by: Ben Burgess <88810029+bx80@users.noreply.github.com> Co-authored-by: Ben <ben.burgess@innocraft.com> Co-authored-by: Stefan Giehl <stefan@matomo.org> Co-authored-by: dizzy <diosmosis@users.noreply.github.com>
Diffstat (limited to 'tests/resources/OmniFixture-dump.sql')
-rw-r--r--tests/resources/OmniFixture-dump.sql3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/resources/OmniFixture-dump.sql b/tests/resources/OmniFixture-dump.sql
index 840d99ca7e..c49ddce62c 100644
--- a/tests/resources/OmniFixture-dump.sql
+++ b/tests/resources/OmniFixture-dump.sql
@@ -1256,7 +1256,6 @@ CREATE TABLE `user` (
`superuser_access` tinyint(2) unsigned NOT NULL DEFAULT '0',
`date_registered` timestamp NULL DEFAULT NULL,
`ts_password_modified` timestamp NULL DEFAULT NULL,
- `invite_status` enum('accept','pending','decline','expired'),
PRIMARY KEY (`login`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -1267,7 +1266,7 @@ CREATE TABLE `user` (
LOCK TABLES `user` WRITE;
/*!40000 ALTER TABLE `user` DISABLE KEYS */;
-INSERT INTO `user` VALUES ('superUserLogin','$2y$10$mbMrIm8ZN82gFoNsV76Z3.avOWosOlT.D/6Pz4EZzhmxbedUeOyzm','hello@example.org','',1,'2020-04-15 14:02:31','2020-04-15 14:02:31',null);
+INSERT INTO `user` VALUES ('superUserLogin','$2y$10$mbMrIm8ZN82gFoNsV76Z3.avOWosOlT.D/6Pz4EZzhmxbedUeOyzm','hello@example.org','',1,'2020-04-15 14:02:31','2020-04-15 14:02:31');
/*!40000 ALTER TABLE `user` ENABLE KEYS */;
UNLOCK TABLES;