Commit Graph

376 Commits (master)

Author SHA1 Message Date
Tal Moran 06526a16db Clean up build files and remove dependency on local nexus repository 2017-01-24 17:17:09 +02:00
Tal Moran 53cc13b51b Cleaning up unchecked casts 2017-01-24 16:28:57 +02:00
Tal Moran ce0e0e0d62 Fix protobuf decoding bug 2017-01-23 15:41:27 +02:00
Tal Moran 5b7fbffb09 Update to gradle 3.3 2017-01-23 15:40:45 +02:00
Tal Moran c8f82223bc Merge branch 'master' of https://vcs.factcenter.org/meerkat/meerkat-java into mixer 2017-01-23 10:46:14 +02:00
Tal Moran f930a65c48 Added mixer documentation 2017-01-22 00:24:25 +02:00
Tal Moran 2744005263 Replaced generic RandomOracle with explicit SHA-256 to make description of random oracle simpler for external verifiers 2017-01-21 23:07:20 +02:00
Tal Moran 43d4fb75b2 More refactoring, wrote command-line mixer application (no BB access as of yet) 2017-01-21 21:42:10 +02:00
Tal Moran 273338010d More refactoring 2017-01-20 23:46:51 +02:00
Tal Moran b9abd847c7 Refactoring 2017-01-19 16:00:01 +02:00
Tal Moran deeed4f20f tests pass 2017-01-19 15:24:35 +02:00
Tal Moran fc2c26d7e9 Refactoring (tests currently fail) 2017-01-19 11:08:07 +02:00
Tal Moran 78f823f31e new benes code passes tests 2017-01-19 01:18:21 +02:00
Tal Moran 37d1857f9c Working on Benes network/testing 2017-01-18 21:54:42 +02:00
Tal Moran abf4cc5e54 Add task to download protoc (protobuf compiler) to root-level build/ directory 2017-01-18 21:54:22 +02:00
Tal Moran 0d416f0018 Rewriting Benes network code (in progress) 2017-01-18 11:47:52 +02:00
Tal Moran c2da5aa464 All tests pass 2017-01-14 02:42:02 +02:00
Laura Radaelli 5386acfd1b added css 2017-01-12 18:24:38 +02:00
Laura Radaelli 72d96c4d78 virtual printer (javaFX window) added 2017-01-12 18:03:40 +02:00
Laura Radaelli b8418156b1 got to Cast or Audit screen 2017-01-12 12:32:59 +02:00
Tal Moran a5cceaa6c0 Writing tests for new ZKPs 2017-01-12 11:05:38 +02:00
Tal Moran 723d348443 Working on mixing code rewrite 2017-01-11 22:09:01 +02:00
Tal Moran b7ef2c10e1 rewriting mixing proofs 2017-01-11 17:01:14 +02:00
Laura Radaelli 29b8ef9734 javafx integration runs till channel choice 2017-01-06 17:24:38 +02:00
Laura Radaelli c8044fc93d fx gui with mainController and navigator (incomplete again) 2016-12-16 22:11:00 +02:00
Laura Radaelli 5113c2235b fx gui with MainController and Navigator (incomplete) 2016-12-16 22:10:23 +02:00
Laura Radaelli c97519c28e starting fx window and communicating with graphicalUI thread 2016-12-16 17:55:56 +02:00
Laura Radaelli 0b1d334d3c start javaFX window from voting booth ToyRun 2016-12-13 10:23:51 +02:00
Laura Radaelli 971db5d89c barcode window always on top 2016-12-08 13:13:07 +02:00
Laura Radaelli 71076f5c7e fix NullPointerException when calling votersBallot.toString and add showBallot (new window) 2016-12-08 12:11:04 +02:00
Tal Moran 9db8efd75b Updated to gradle 3.2.1 2016-11-28 13:51:24 +02:00
VladimirEliTokarev 0509bf6dda Resolved the umextendablity of the summary ballot panel 2016-11-12 17:49:48 +02:00
VladimirEliTokarev 08cc50c22a Resulted the bug with the not expendable panel 2016-11-12 17:37:42 +02:00
VladimirEliTokarev 6161898805 Changed the configuration parser
The usage of \\z delimeter is mustable
2016-11-12 17:17:17 +02:00
VladimirEliTokarev 7b937cc754 Added the creator of the jar to compile and create jar
The jar converts json configuration into normal
2016-11-12 17:05:53 +02:00
Tal Moran 97f52bfd82 Fixed fatmain bug in build.gradle-template 2016-11-09 15:21:16 +02:00
Tal Moran e611d0c721 Removed generated files from repository 2016-11-05 23:58:33 +02:00
Tal Moran f5e71dec2f Added JOpt.simple dependency for command-line parsing; fixed bug in build.gradle to support alternative fatmain 2016-11-05 23:56:19 +02:00
VladimirEliTokarev d6ea9412e3 Changed the usage of json configuration
For now we use an binary file which contains all the protobuf ballot
quesitons.
However there is a problem, the jar that suppose to convert json into
binary configuraiton file doesnt work.
2016-11-05 18:00:28 +02:00
Tal Moran aac7a50a94 Yet more mixer refactoring 2016-11-02 11:59:20 +02:00
Tal Moran 5b268cd779 More refactoring for mixer 2016-11-02 00:31:49 +02:00
Tal Moran 1baa567d8e Starting to review and refactor mixer 2016-11-01 18:03:53 +02:00
Tal Moran c4e0e5f56d Allow using resource paths for images linked in the JSON configuration file 2016-10-30 15:34:58 +02:00
Tal Moran ac4d668984 Use configuration file from bundled resource in test 2016-10-30 13:32:39 +02:00
VladimirEliTokarev b601619d39 Changed the configuraitons tests 2016-10-29 23:10:18 +03:00
VladimirEliTokarev 555783d30c Removed unnsessery panels 2016-10-29 23:06:28 +03:00
VladimirEliTokarev c5dcb9f06e Added the description of the picture of the candidate 2016-10-29 09:48:29 +03:00
VladimirEliTokarev fbc1707b37 Added the validation that the answers given are valid strings and pictures 2016-10-28 20:02:27 +03:00
VladimirEliTokarev e440bb3e76 Added configuration validation 2016-10-28 19:55:51 +03:00
Tal Moran ca89514c97 Modified JSON and BARBECUE deps to use external maven sources 2016-10-26 00:50:23 +03:00