Commit graph

Select branches

Hide pull requests

master

Mono Color

• c16ac87a98 Added fork source master Ben Goldsworthy 2022-08-01 15:04:50 +0000
• 08b5985396 ajg Rumperuu 2018-09-19 08:38:50 +0100
• dff885437e eat Rumperuu 2018-09-15 16:25:36 +0100
• cf2bf7de22 Committing Rumperuu 2018-09-11 08:31:47 +0100
• 7e601a25e3
  Merge pull request #24 from vincentmdealmeida/EventSetupDecrypt Vincent 2018-09-05 11:52:59 +0100
• bd9c35102e The generic functionality of the event_vote page has been replicated in the sense that if access is denied to event_setup or event_decrypt, a client is not directed to a page that they don't have access to. Instead, they're kept on the same page and are told why access to that page has been denied. Furthermore, the POSTing of data to the back-end on both of these updated page is now done using Ajax requests where dialogs update the user rather than redirecting to a page the user doesn't have access to. vince0656 2018-09-05 11:46:57 +0100
• b35495462b
  Merge pull request #23 from vincentmdealmeida/Base64Keys Vincent 2018-09-04 15:28:32 +0100
• da74180884 Public Keys and Secret Keys for Trustees are now Base64 encoded. I've tested this against 1 trustee and multiple trustees. vince0656 2018-09-04 15:21:31 +0100
• 801f6b274f
  Merge pull request #22 from vincentmdealmeida/FurtherFixes Vincent 2018-09-03 16:01:06 +0100
• 25a7f72160 Updated various parts of the application to improve usability. Started laying some of the ground work for a bulletin board. Added informative emails that keep voters, trustees and organisers updated with the state of an event. vince0656 2018-09-03 15:39:42 +0100
• 59d3b26e95
  Merge pull request #21 from vincentmdealmeida/Fixes Vincent 2018-08-31 19:42:33 +0100
• a168ba9e28 Fixed a number of bugs that arose from merging the code from Bens fork. Added an extra step when voting which asks the user to confirm their voting choices. The voter now gets an email when they've successfully submitted thier vote. vince0656 2018-08-31 19:39:12 +0100
• fc0d0ea21c
  Merge pull request #20 from Rumperuu/master Vincent 2018-08-29 18:02:59 +0100
• ac38a58a38
  Merge branch 'master' into master Vincent 2018-08-29 17:58:29 +0100
• de517c19c5 Ready for merge Rumperuu 2018-08-29 14:44:37 +0100
• 9ea59723a5 I really ought to be using branches Rumperuu 2018-08-29 14:29:27 +0100
• 0db8fa6320
  Merge pull request #17 from vincentmdealmeida/EventVote Vincent 2018-08-22 17:43:49 +0100
• 572600408c Updated polls/models to include a field for storing the ballot selected by the user on the front end. A few bugs have been fixed on the event voting page and new functionality has been added which allows a voter to restart the voting process. vince0656 2018-08-22 17:39:41 +0100
• 89533a54b1 Going home Rumperuu 2018-08-16 22:17:16 +0100
• 77508479b4 Added QR codes to ballot selection, and a couple other minor chchanges Rumperuu 2018-07-23 14:08:17 +0100
• 4f1bf927bb Merge remote-tracking branch 'upstream/master' Rumperuu 2018-07-18 08:41:40 +0100
• bab4aa29cf
  Merge pull request #15 from vincentmdealmeida/Results vincentmdealmeida 2018-07-17 12:16:48 +0100
• 33398b9993 Added a new UI feature which now shows all of the event results (once decrypted) in a basic but easy to read table which can be enhanced at a later point vince0656 2018-07-17 12:15:24 +0100
• 0ff10474c4
  Merge pull request #14 from vincentmdealmeida/BallotChoice vincentmdealmeida 2018-07-17 09:59:36 +0100
• d4756bb734 Added ballot choice UI that allows the user to choose between 2 generated ballots whilst showing the ballot's hash. When the user makes their choice, then the ballot is sent to server vince0656 2018-07-17 09:57:09 +0100
• 78d771405e
  Type Fix Rumperuu 2018-07-16 10:53:16 +0100
• 2e61ca7b94
  Updated README Rumperuu 2018-07-16 10:52:39 +0100
• 14e475cf3b
  Merge pull request #13 from vincentmdealmeida/ReCaptchaUpdate vincentmdealmeida 2018-07-16 10:18:06 +0100
• ff967877cb Made a number of small enhancements. The django-recaptcha fields have been removed from the django forms as they're a dependency nightmare. The module isn't really required and the same functionality can be serviced using HTML and JS and it also paves the way to perform testing with python 3 over python 2.7. The about page has been removed for now as it's not prod ready and all it currently does it mention the software used to build DEMOS2. vince0656 2018-07-16 10:16:06 +0100
• 4d4f77207b
  Merge pull request #12 from vincentmdealmeida/VotingDecryption vincentmdealmeida 2018-07-13 17:33:47 +0100
• 745fdf06b1 Updated the voting and event decryption pages. On the voting page, added the ability to vote by selecting checkboxes instead of a drop down select menu. This adds flexibility at event creation to specify a wide range of min and max option selections for polls. On the event decryption page, SK validation was added based on the stored trustee PK as well as a dialog to display any validation errors. Most of the updates took place behind the scenes at the backend. vince0656 2018-07-13 17:19:35 +0100
• 3fd9173666
  Merge pull request #11 from vincentmdealmeida/PartialDecryption vincentmdealmeida 2018-07-11 14:35:29 +0100
• 5b746ad406 Full end-to-end voting is working using the new binary encoding scheme, ballot combination and trustee partial decryption with tallies working perfectly. This required updating the Node server as well as Django models and views to support this. Emails to voters and trustees have also been updated to be more informative and look more professional. It could probably do at this point with using email templates and in the future HTML emails. vince0656 2018-07-11 14:25:36 +0100
• 571cd723bc
  Merge pull request #10 from vincentmdealmeida/BinaryEncoding vincentmdealmeida 2018-07-07 09:54:59 +0100
• e33b91f852 Implemented full end-to-end encryption and decryption of an event using trustee public and secret keys. This required modification of the NodeJS crypto server to receive post data from the crypto_rpc py methods and for combining SKs together. Additionally, the new binary voting encoding scheme has been implemented for encryption and decryption of the event. General UI improvements have been made and as well as some other bug fixes vince0656 2018-07-07 09:52:47 +0100
• 0c354cd542
  Merge pull request #9 from vincentmdealmeida/EventPrep vincentmdealmeida 2018-07-02 10:17:59 +0100
• f82a380fa4 General housekeeping such as adding package.json for Node server, bash script for launching a celery worker and updating the readme to assist with launching the DEMOS2 app. Updated some models to include UI helper functions. Main work done is around event preparation - with a Celery worker running and the Node server, trustees are now emailed a link to prepare events. The event detail page has also had a bit of an overhaul to include additional information and to make it easier to use vince0656 2018-07-02 10:06:05 +0100
• de9eaa7881
  Merge pull request #8 from vincentmdealmeida/BackendValidation vincentmdealmeida 2018-06-26 17:14:23 +0100
• 5f32806506 Updated create_event view backend to perform full form validation as a backup in the event the front end validation is incorrect and or is disabled. In the event that the back-end validation detects an error, the form is returned with the original data and errors informing the user on what pieces of information need corrected vince0656 2018-06-26 17:02:36 +0100
• e7440e6d6e
  Merge pull request #7 from vincentmdealmeida/ValidationV2.3 vincentmdealmeida 2018-06-20 17:42:48 +0100
• 8210ef6995 Modified the polls view for an event to show not only the list of polls but the options as well as the min and max selections. Updated the updateForm() JS method to update the IDs of the form inputs for each polls so that they're in sync with the poll count. This completes the front-end JS validation and the create event form. vince0656 2018-06-20 17:36:22 +0100
• dd3fdbd41e
  Merge pull request #6 from vincentmdealmeida/ValidationV2.2 vincentmdealmeida 2018-06-19 15:22:58 +0100
• 7b2ac3ec38 Added delete functionality for events. Additionally, made improvements and fixed to the validation for event creation. vince0656 2018-06-19 15:15:42 +0100
• 11abbb8a64
  Merge pull request #5 from vincentmdealmeida/MultiplePolls vincentmdealmeida 2018-06-18 17:12:37 +0100
• 1314e3be1a Upgraded the Create Event page and back-end view to handle the creation of multiple polls in one go. The validation has been appropriately updated to cope with the UI changes but requires further testing. Event list has been updated to include a delete action which requires wiring up to a back-end function which hasn't been created yet vince0656 2018-06-18 17:09:44 +0100
• 6b70b01e06
  Merge pull request #4 from vincentmdealmeida/ValidationV2.1 vincentmdealmeida 2018-06-15 10:11:03 +0100
• 498b87dba5 Fixed a validation error where the form wouldn't validate after the deletion of a row within any table vince0656 2018-06-15 10:09:15 +0100
• 6fc6628995
  Merge pull request #3 from vincentmdealmeida/ValidationV2 vincentmdealmeida 2018-06-14 17:04:09 +0100
• 7fb52678ef Added full input validation to the Create Event including unique event name and slug validation as well as email validation. The appropriate template data required for this from Event and DemoUser model is passed in upon rendering the create_event html template vince0656 2018-06-14 17:01:14 +0100
• 4ca3398683
  Merge pull request #2 from vincentmdealmeida/ValidationV1 vincentmdealmeida 2018-06-13 13:05:10 +0100
• 6dcafb2e9a Laid the ground work for client-side input validation by setting up a fn that's triggered before the form is submitted. The vote start and end date time is now being validated both server side and client side and now includes UTC offsets vince0656 2018-06-13 13:01:55 +0100
• a0863e4ade
  Merge pull request #1 from vincentmdealmeida/reCAPTCHAv2Fix vincentmdealmeida 2018-06-12 14:34:41 +0100
• 49ed8a3ec9 Updated README to include details on dependency requirements. Updated Create Event page to disable the create button when the reCAPTCHA expires vince0656 2018-06-12 14:30:23 +0100
• c2010f5a4f Updated the README vince0656 2018-06-12 13:52:41 +0100
• 7084bd1b16 Initial commit of DEMOS2 with the upgraded 'Create Event' UI. However, there is no input validation currently vince0656 2018-06-12 13:31:38 +0100