Commit Graph

Select branches

Hide Pull Requests

main

testing

Mono Color

• 9b4bfec933 Changed regex to basic email regex main Simon 2021-02-13 17:49:50 +01:00
• 5b3b5b35e5 Update README.md cato 2021-02-13 17:49:20 +01:00
• a49725cdd6 Delete logs directory cato 2021-02-13 17:37:30 +01:00
• 921ad8fde3 Delete Databases directory cato 2021-02-13 17:37:20 +01:00
• 292b71bd2d Privacy changes Simon 2021-02-13 17:37:04 +01:00
• 4371468bbd Update README.md cato 2021-02-13 17:34:13 +01:00
• 2491657be2 Update README.md cato 2021-01-27 19:22:18 +01:00
• 9e1aaaea7b Merge branch 'testing' into main Simon 2021-01-27 18:28:47 +01:00
• ddb84f26f1 Merge remote-tracking branch 'origin/testing' into testing testing Simon 2021-01-27 18:26:40 +01:00
• bd288d4d1c Cleaning up for publication Simon 2021-01-27 18:26:35 +01:00
• e44e5f80c6 Update README.md cato 2021-01-27 18:26:05 +01:00
• 48441e1924 Update README.md cato 2021-01-27 18:21:29 +01:00
• 179af51456 Updated Datelock Simon 2021-01-17 16:19:26 +01:00
• ddf670cc94 Prepared everything for the votings Simon 2021-01-17 15:54:32 +01:00
• ab3a36859a asdf3 Simon 2021-01-09 22:09:48 +01:00
• 4ec09ac16c asdf2 Simon 2021-01-09 22:08:55 +01:00
• 4e24723358 asdf Simon 2021-01-09 22:07:45 +01:00
• 3528c1d0d3 Final release Simon 2021-01-09 21:56:17 +01:00
• 69b320b28b Added exeptions Simon 2021-01-09 21:26:13 +01:00
• 7fd2221e0a reverse block Simon 2021-01-09 21:09:46 +01:00
• a14d2a6f33 temp Simon 2021-01-09 20:34:55 +01:00
• 577015fa3f BUGFIX Simon 2021-01-09 20:23:16 +01:00
• b5d18c63ce Fixed out of bounds exception Simon 2021-01-09 18:32:31 +01:00
• 4c56f2c0ab Back up of first Database Simon 2021-01-09 03:50:07 +01:00
• 436142f546 Added second voting Simon 2021-01-09 02:35:55 +01:00
• e9e9cfca97 Made final changes Simon 2021-01-04 02:22:00 +01:00
• dfaf2c55e2 Expanded the number of candidates from 5 to 10-15 Simon 2021-01-04 00:28:55 +01:00
• f63847a092 Updated Requierments Simon 2020-12-29 19:23:45 +01:00
• 907db5fb36 QOL Simon Bussmann 2020-12-27 23:33:56 +01:00
• 2a8ba84bec Added a datelock to end votes automatically Simon Bussmann 2020-12-27 23:23:41 +01:00
• 0597edf116 Changed to Voting Mode Simon Bussmann 2020-12-27 22:37:20 +01:00
• 4005fd4edb Google account go taken down switched it Simon 2020-12-25 22:20:26 +01:00
• d56514a712 Added names to the voter list Simon 2020-12-18 21:04:02 +01:00
• 63f4e7c907 Fix error message Simon 2020-12-18 20:11:28 +01:00
• 47beddf9c8 Final Simon 2020-12-18 20:01:54 +01:00
• d7b6283ffe End Simon 2020-12-18 19:25:40 +01:00
• fb7b0271b3 Removed code pass through Simon 2020-12-18 19:04:12 +01:00
• f65ff26e48 Finishing touches Simon 2020-12-18 18:57:29 +01:00
• d0f62b4ca6 Must function now Email is down Simon 2020-12-17 03:11:28 +01:00
• 221ebf1c2b fixed bug Simon 2020-12-16 23:49:50 +01:00
• 5cfade336e test Simon 2020-12-16 23:41:53 +01:00
• 80b20f2098 Test Simon 2020-12-16 20:03:14 +01:00
• a37a1e1a91 Changed categories Simon 2020-12-13 21:29:33 +01:00
• 6d83a513f1 Make input field static Simon 2020-12-13 17:25:27 +01:00
• 3b0d0ec982 Fixed email input bug Simon 2020-12-13 17:20:42 +01:00
• 8946853604 Css changes to start site Simon 2020-12-13 17:09:08 +01:00
• 03e5e1b455 Removed the dashboard because of the existence of phpmyadmin Simon 2020-12-12 00:02:47 +01:00
• b32cc63e76 Regex ignores whitespaces now and added all fallback pages Simon 2020-12-11 23:53:42 +01:00
• 3cd8670cef Merge remote-tracking branch 'origin/main' into main Simon 2020-12-11 21:21:35 +01:00
• efc2bd7501 added support of controling the behavoir of the program from the cli Simon Bussmann 2020-12-11 10:57:58 +01:00
• 5202042894 added Simon 2020-12-10 23:57:47 +01:00
• 512331d3ab added Simon 2020-12-10 23:57:47 +01:00
• 4dd3468bef Have to go to bed now need to write Simon 2020-12-10 23:50:44 +01:00
• 7a64b195ed QOL changes Simon 2020-12-09 21:38:43 +01:00
• 5204322f40 votingPhase can now be toggled from jar Simon 2020-12-08 23:32:20 +01:00
• 9bf9f8acdc Added dynamic resource parsing and fixed breaking bug Simon 2020-12-08 23:03:14 +01:00
• 525ba69689 Merge remote-tracking branch 'origin/main' into main Simon 2020-12-07 23:42:40 +01:00
• 1ee5174207 Made the transition of data between possibleCandidates and Candidates easier Simon 2020-12-07 23:42:29 +01:00
• 3effc5364e Update README.md cato 2020-12-07 23:25:27 +01:00
• 32894e5469 Fixed copying mechanism Simon 2020-12-06 23:31:44 +01:00
• 75ccf7d28e You know the drill Simon 2020-12-06 01:19:39 +01:00
• a642ea9890 Massive changes but I have to go to sleep now Simon 2020-12-05 06:05:56 +01:00
• 525074af15 PossibleCandidates get saved to their own database now Simon 2020-11-30 22:58:14 +01:00
• 361433bf22 Devided Candidates in PossibleCandidates and Candidates Simon Bussmann 2020-11-30 21:40:44 +01:00
• 6a6ef2b96d Added candidate suggestion Simon 2020-11-29 02:30:04 +01:00
• 81befda3a9 Change vote status of voter if voter voted Simon 2020-11-28 00:17:16 +01:00
• 7b4f460445 Created a success.html page Simon 2020-11-28 00:03:56 +01:00
• 75ad93bde0 Added the voting system Simon 2020-11-28 00:03:36 +01:00
• 23e4a27d38 Dashboard gets displayed horizontally Simon 2020-11-28 00:02:09 +01:00
• ae1ba8b9c5 Candidates get sorted descending by their votes within their categories Simon 2020-11-27 23:59:14 +01:00
• 780448537b Merge branch 'MailSystem' into main Simon 2020-11-27 23:56:55 +01:00
• 7690d05fd2 Added basics for the mail system Simon 2020-11-25 18:36:28 +01:00
• b52d4b47b9 Reset voting site to the basic Simon 2020-11-25 18:35:05 +01:00
• 6dfe2a3329 updated start site Simon 2020-11-24 17:11:16 +01:00
• 27f80636f0 Merge branch 'frontend' into main Simon 2020-11-14 17:12:33 +01:00
• 264bfa8bf0 Fixed damage done by false git usage Simon 2020-11-14 17:08:10 +01:00
• ad91dbd5e9 Updated the .gitignore file Simon 2020-11-14 15:15:14 +01:00
• c608a9d207 Merge branch 'backend' into main Simon 2020-11-14 15:07:52 +01:00
• e1d8d81095 .gitignore expanded, Votingsite expanded cato447 2020-11-14 13:03:43 +01:00
• 7713b1d3ec Skin changes cato447 2020-11-14 01:16:45 +01:00
• cd1e8787eb Basic sytling für die Startseite erstellt cato447 2020-11-12 20:43:06 +01:00
• d7185572fc All fallbacks added to the login site. Edited voting.html cato447 2020-11-14 01:11:17 +01:00
• ad944b9616 [FATAL ] SQL-Injektions werden verhindert cato447 2020-11-12 22:54:10 +01:00
• 37b45d998d Update README.md cato 2020-11-11 23:42:49 +01:00
• 55e2db138a Update README.md cato 2020-11-11 23:42:25 +01:00
• 64c7ed198f Update README.md cato 2020-11-11 23:42:02 +01:00
• 65cebb835a Got a server set up to host the VotingSystem. --------------------------------------------------- Internet address: http://abizeitung-voting.ddns.net Server IP address: 217.83.93.128 Port: 8000 -------------------------------------------------- Try to port the database to be hosted on the server rather than on be hosted on localhost cato447 2020-11-11 23:36:53 +01:00
• 496ec030cb encrypted the emails cato447 2020-11-10 23:50:45 +01:00
• 2a8d083e34 encrypted the database cato447 2020-11-10 23:49:16 +01:00
• dbbdf9e24c changes in the database simon 2020-11-10 23:44:06 +01:00
• de5634b10c q cato447 2020-11-10 23:38:09 +01:00
• 2a2390feac changed category_id cato447 2020-11-10 23:34:37 +01:00
• f108d12beb changed username of sql database simon 2020-11-10 23:30:43 +01:00
• 3ecfb34e97 transfer database cato447 2020-11-10 23:27:21 +01:00
• 281f8811ca testing2 cato447 2020-11-10 23:13:16 +01:00
• 64d6228bdd testing cato447 2020-11-10 22:57:36 +01:00
• 05877782a9 encrypting the database backup cato447 2020-11-10 22:50:39 +01:00
• 1f810dbde6 initial commit cato447 2020-11-09 23:51:28 +01:00
• 13ffe47bfc first commit Simon 2020-11-09 23:48:41 +01:00