Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

R5.10 kompatibel machen #33

Merged
merged 3 commits into from
Mar 16, 2020
Merged

R5.10 kompatibel machen #33

merged 3 commits into from
Mar 16, 2020

Conversation

bloep
Copy link
Member

@bloep bloep commented Mar 15, 2020

ich habe ein update auf R5.10 gemacht und einen neuen export erstellt.

@bloep bloep self-assigned this Mar 15, 2020
@bloep bloep changed the title WIP: R5.10 kompatibel machen R5.10 kompatibel machen Mar 15, 2020
@bloep bloep marked this pull request as ready for review March 15, 2020 15:03
@bloep bloep requested review from polarpixel and schuer March 15, 2020 15:05
@schuer
Copy link
Member

schuer commented Mar 16, 2020

Passt für mich, Danke! 🙌

@schuer schuer merged commit 8682649 into master Mar 16, 2020
@delete-merged-branch delete-merged-branch bot deleted the bloep-patch-1 branch March 16, 2020 14:00
Comment on lines +667 to +700
DROP TABLE IF EXISTS `rex_user`;
CREATE TABLE `rex_user` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`name` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
`description` text COLLATE utf8_unicode_ci,
`login` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
`password` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
`email` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
`status` tinyint(1) NOT NULL,
`admin` tinyint(1) NOT NULL,
`language` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
`startpage` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
`role` text COLLATE utf8_unicode_ci,
`login_tries` tinyint(4) DEFAULT NULL,
`createdate` datetime NOT NULL,
`lasttrydate` datetime NOT NULL,
`lastlogin` datetime DEFAULT NULL,
`session_id` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
`cookiekey` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
`revision` int(10) unsigned NOT NULL,
`createuser` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
`updatedate` datetime NOT NULL,
`updateuser` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `login` (`login`)
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

LOCK TABLES `rex_user` WRITE;
/*!40000 ALTER TABLE `rex_user` DISABLE KEYS */;
INSERT INTO `rex_user` VALUES
(1,'Administrator',NULL,'admin','$2y$10$xMbThw7FOeRoqKsQ7cT4Mu5kYj7oCyJ6./lCPMEOGhq39E//CcFvu',NULL,1,1,'','',NULL,0,'2020-03-08 15:27:05','2020-03-15 15:52:23','2020-03-15 15:52:23','ftufnn5agtkvlcvmugribv4is2',NULL,0,'setup','0000-00-00 00:00:00','');
/*!40000 ALTER TABLE `rex_user` ENABLE KEYS */;
UNLOCK TABLES;

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@schuer mist, das ist hier mit reingerutscht....

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kein Ding. Soll ich mal ein neues Release erstellen, oder bist du dran? @bloep

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ich bin da net dran, wenn es im release fertig ist, könnte man danach direkt das docker-image fertig haben. den rest habe ich soweit am stehen.

wenn du ein korrigiertes release machen könntest wäre super 😘

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hah, will do!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants