Commit Graph

Select branches

Hide Pull Requests

main

testing

Mono Color

• 795ad8f699 Changed regex to basic email regex main Casually9790 2021-02-13 17:49:50 +01:00
• 470c722fca Update README.md catoandGitHub 2021-02-13 17:49:20 +01:00
• 55be1d7b84 Privacy changes Casually9790 2021-02-13 17:37:04 +01:00
• 1e40243d42 Update README.md catoandGitHub 2021-02-13 17:34:13 +01:00
• 161959f798 Update README.md catoandGitHub 2021-01-27 19:22:18 +01:00
• cc8230fcee Merge branch 'testing' into main Casually9790 2021-01-27 18:28:47 +01:00
• 5bba424c34 Merge remote-tracking branch 'origin/testing' into testing testing Casually9790 2021-01-27 18:26:40 +01:00
• f5e714883d Cleaning up for publication Casually9790 2021-01-27 18:26:35 +01:00
• c890b66693 Update README.md catoandGitHub 2021-01-27 18:26:05 +01:00
• c6e1a963be Update README.md catoandGitHub 2021-01-27 18:21:29 +01:00
• 6cae7d78ae Updated Datelock Casually9790 2021-01-17 16:19:26 +01:00
• def3ed6309 Prepared everything for the votings Casually9790 2021-01-17 15:54:32 +01:00
• bbc83031b2 asdf3 Casually9790 2021-01-09 22:09:48 +01:00
• 57589e402c asdf2 Casually9790 2021-01-09 22:08:55 +01:00
• fe5a91455c asdf Casually9790 2021-01-09 22:07:45 +01:00
• 63aa795086 Final release Casually9790 2021-01-09 21:56:17 +01:00
• 91874abe4e Added exeptions Casually9790 2021-01-09 21:26:13 +01:00
• 0036b19721 reverse block Casually9790 2021-01-09 21:09:46 +01:00
• 6ed12992c9 temp Casually9790 2021-01-09 20:34:55 +01:00
• 865c3e778f BUGFIX Casually9790 2021-01-09 20:23:16 +01:00
• 8da69f0170 Fixed out of bounds exception Casually9790 2021-01-09 18:32:31 +01:00
• 7ee603d5df Added second voting Casually9790 2021-01-09 02:35:55 +01:00
• 149a0dece3 Made final changes Casually9790 2021-01-04 02:22:00 +01:00
• 937971da63 Expanded the number of candidates from 5 to 10-15 Casually9790 2021-01-04 00:28:55 +01:00
• 0b9d5cc90c Updated Requierments Casually9790 2020-12-29 19:23:45 +01:00
• 880dd12a6f QOL Casually9790 2020-12-27 23:33:56 +01:00
• 11e2906271 Added a datelock to end votes automatically Casually9790 2020-12-27 23:23:41 +01:00
• ffea848311 Changed to Voting Mode Casually9790 2020-12-27 22:37:20 +01:00
• d1c8f24d3d Fix error message Casually9790 2020-12-18 20:11:28 +01:00
• be8d49ff9e Final Casually9790 2020-12-18 20:01:54 +01:00
• 506e2285fd End Casually9790 2020-12-18 19:25:40 +01:00
• 14ab45227a Removed code pass through Casually9790 2020-12-18 19:04:12 +01:00
• 8f65d9cc26 Finishing touches Casually9790 2020-12-18 18:57:29 +01:00
• cf138cd8cf Must function now Email is down Casually9790 2020-12-17 03:11:28 +01:00
• 629d4076f8 fixed bug Casually9790 2020-12-16 23:49:50 +01:00
• b48453c300 test Casually9790 2020-12-16 23:41:53 +01:00
• 7aff0c5b02 Test Casually9790 2020-12-16 20:03:14 +01:00
• e863d288ee Changed categories Casually9790 2020-12-13 21:29:33 +01:00
• 3e69fcf97f Make input field static Casually9790 2020-12-13 17:25:27 +01:00
• 97a1313524 Fixed email input bug Casually9790 2020-12-13 17:20:42 +01:00
• 3be9c3b665 Css changes to start site Casually9790 2020-12-13 17:09:08 +01:00
• 0cffad8ed0 Removed the dashboard because of the existence of phpmyadmin Casually9790 2020-12-12 00:02:47 +01:00
• 5cb73a5a1a Regex ignores whitespaces now and added all fallback pages Casually9790 2020-12-11 23:53:42 +01:00
• 9b9d754713 Merge remote-tracking branch 'origin/main' into main Casually9790 2020-12-11 21:21:35 +01:00
• 7429462f91 added support of controling the behavoir of the program from the cli Casually9790 2020-12-11 10:57:58 +01:00
• d629cec557 added Casually9790 2020-12-10 23:57:47 +01:00
• ec60234d7c added Casually9790 2020-12-10 23:57:47 +01:00
• 0a33b55a61 Have to go to bed now need to write Casually9790 2020-12-10 23:50:44 +01:00
• e503b0df61 QOL changes Casually9790 2020-12-09 21:38:43 +01:00
• aa036fb07b votingPhase can now be toggled from jar Casually9790 2020-12-08 23:32:20 +01:00
• f0ada512ca Added dynamic resource parsing and fixed breaking bug Casually9790 2020-12-08 23:03:14 +01:00
• faa1cea8e2 Merge remote-tracking branch 'origin/main' into main Casually9790 2020-12-07 23:42:40 +01:00
• 3186b63f35 Made the transition of data between possibleCandidates and Candidates easier Casually9790 2020-12-07 23:42:29 +01:00
• 11b704a7e2 Update README.md catoandGitHub 2020-12-07 23:25:27 +01:00
• 301ffc60f0 Fixed copying mechanism Casually9790 2020-12-06 23:31:44 +01:00
• 7e39d2dab9 You know the drill Casually9790 2020-12-06 01:19:39 +01:00
• 9531dadd69 Massive changes but I have to go to sleep now Casually9790 2020-12-05 06:05:56 +01:00
• 56d3f9875c PossibleCandidates get saved to their own database now Casually9790 2020-11-30 22:58:14 +01:00
• 0b138d647d Devided Candidates in PossibleCandidates and Candidates Casually9790 2020-11-30 21:40:44 +01:00
• 20df7cc38c Added candidate suggestion Casually9790 2020-11-29 02:30:04 +01:00
• 910a110921 Change vote status of voter if voter voted Casually9790 2020-11-28 00:17:16 +01:00
• 16f947aaab Created a success.html page Casually9790 2020-11-28 00:03:56 +01:00
• 38ee5d4178 Added the voting system Casually9790 2020-11-28 00:03:36 +01:00
• 8b2d1f89f6 Dashboard gets displayed horizontally Casually9790 2020-11-28 00:02:09 +01:00
• 423b307c66 Candidates get sorted descending by their votes within their categories Casually9790 2020-11-27 23:59:14 +01:00
• 1b49a241cc Merge branch 'MailSystem' into main Casually9790 2020-11-27 23:56:55 +01:00
• c0e3ed1f3f Added basics for the mail system Casually9790 2020-11-25 18:36:28 +01:00
• 71ac8d2feb Reset voting site to the basic Casually9790 2020-11-25 18:35:05 +01:00
• d265677b55 updated start site Casually9790 2020-11-24 17:11:16 +01:00
• d8db603ab6 Merge branch 'frontend' into main Casually9790 2020-11-14 17:12:33 +01:00
• 51d464f0e0 Fixed damage done by false git usage Casually9790 2020-11-14 17:08:10 +01:00
• 25484250d6 Updated the .gitignore file Casually9790 2020-11-14 15:15:14 +01:00
• 72f1ff6c70 Merge branch 'backend' into main Casually9790 2020-11-14 15:07:52 +01:00
• a746110991 .gitignore expanded, Votingsite expanded Casually9790 2020-11-14 13:03:43 +01:00
• c8f5b32879 Skin changes Casually9790 2020-11-14 01:16:45 +01:00
• 0887b54b23 Basic sytling für die Startseite erstellt Casually9790 2020-11-12 20:43:06 +01:00
• 40655b2130 All fallbacks added to the login site. Edited voting.html Casually9790 2020-11-14 01:11:17 +01:00
• ccc6190344 [FATAL ] SQL-Injektions werden verhindert Casually9790 2020-11-12 22:54:10 +01:00
• 5e4608f40a Update README.md catoandGitHub 2020-11-11 23:42:49 +01:00
• 18ba0d756a Update README.md catoandGitHub 2020-11-11 23:42:25 +01:00
• 6598122c93 Update README.md catoandGitHub 2020-11-11 23:42:02 +01:00
• 40d931ec0c Got a server set up to host the VotingSystem. --------------------------------------------------- Internet address: http://***REMOVED*** Server IP address: ***REMOVED*** Port: 8000 -------------------------------------------------- Try to port the database to be hosted on the server rather than on be hosted on localhost Casually9790 2020-11-11 23:36:53 +01:00
• 8649301613 changed username of sql database Casually9790 2020-11-10 23:30:43 +01:00
• ab38911327 initial commit Casually9790 2020-11-09 23:51:28 +01:00
• 13ffe47bfc first commit Casually9790 2020-11-09 23:48:41 +01:00