Commit Graph

  • cf891549bb Fixed typo in mixer docs master Tal Moran 2018-05-10 18:07:59 +0300
  • 21ad93f4e1 Updated to gradle 4.2.1 Tal Moran 2017-10-16 17:02:35 +0300
  • 24d00a89fb added proto for audit voting-booth-gui Laura Radaelli 2017-07-17 16:01:15 +0300
  • ce2fe0e8f2 ignoring election params. dat files. Audit ballot QRcode. Laura Radaelli 2017-07-17 13:37:39 +0300
  • dadf301fcf Merge branch 'master' of https://vcs.factcenter.org/meerkat/meerkat-java into voting-booth-gui Laura Radaelli 2017-07-09 11:48:03 +0300
  • 73619b0c9e Better win compatibility for bb-server frontent Tal Moran 2017-07-09 11:09:07 +0300
  • 8ace24677b Merge branch 'master' of https://vcs.factcenter.org/meerkat/meerkat-java into voting-booth-gui Laura Radaelli 2017-07-08 14:09:18 +0300
  • 252a761005 Better cross-platform support for building bb-server frontend Tal Moran 2017-07-06 12:00:04 +0300
  • 931bb56378 Fixed npm_install dependency that broke clean builds bb-server Tal Moran 2017-07-03 02:51:02 -0400
  • 95700f360e fixed printing auditing. Added separator. Laura Radaelli 2017-07-03 08:14:59 +0300
  • fa4656f0a9 added dependency on npmInstall to ensure protobufjs is installed in bb server frontend Tal Moran 2017-07-03 03:37:32 +0300
  • 08d9bd6217 Integrated bb-server angular frontend in gradle build Tal Moran 2017-07-03 03:24:00 +0300
  • 173b952e09 Added proxy to bb frontend (no need for cross-origin headers); support periodic status calls Tal Moran 2017-07-02 17:54:36 +0300
  • c0b21f82ee Added toy angular application (for bulletin-board frontend) Tal Moran 2017-07-02 16:42:45 +0300
  • 05c7a25bb7 Renamed proto files to use standard (lowercase-underscore) naming convention); added a separate proto for bb webapp Tal Moran 2017-06-30 02:28:03 +0300
  • 9db8d8708a fixed alignment of welcome screen Laura Radaelli 2017-06-27 16:02:17 +0300
  • b9613ed693 added summary screen after voting Laura Radaelli 2017-06-27 14:19:30 +0300
  • 19a7d5731c added page number to question screen Laura Radaelli 2017-06-26 13:25:07 +0300
  • 68e1737f22 Dependency cleaning; more spongification; use composite build to include qilin (need qilin 1.3+ now) android-scanner Tal Moran 2017-06-26 01:59:32 +0300
  • 3c52eb2e8d Done refactoring scannerAPI; fixed android scanner to use modern settings api and allow URL+nonce Tal Moran 2017-06-26 00:22:20 +0300
  • 0dfd2480d2 Added connection to android scanner; problems with missing crypto providers Tal Moran 2017-06-25 19:27:38 +0300
  • 291f7d93c0 Scanner serverdata now tries to get a non-localhost IPV4 address if possible Tal Moran 2017-06-25 18:54:34 +0300
  • 6b47387920 Code now builds Tal Moran 2017-06-25 18:05:52 +0300
  • 324a079a90 Refactored and fixed NetworkVirtualPrinter Tal Moran 2017-06-25 17:51:25 +0300
  • 6f35f105c5 Mostly finished with scanAPI refactoring Tal Moran 2017-06-25 16:20:28 +0300
  • cb1d2343c4 More refactoring for scannerAPI Tal Moran 2017-06-25 10:15:09 +0300
  • 7e4260b8d5 Added signature key generation to crypto API Tal Moran 2017-06-24 03:15:59 +0300
  • ceba09e65c working on scanner API refactoring (doesn't compile yet) Tal Moran 2017-06-22 17:56:59 +0300
  • c7dd5bd663 Added settings activity to android scanner; started refactoring scanner api Tal Moran 2017-06-22 11:50:59 +0300
  • 24e3556320 fixed build so android-scanner compiles; changed android-scanner to use meerkat scanner API rather than custom REST library Tal Moran 2017-06-22 02:58:01 +0300
  • 62349f9fe7 removed apparently unecessary file Tal Moran 2017-06-22 01:45:48 +0300
  • 3b3a6a09b2 Removed debug printout Tal Moran 2017-06-22 01:42:24 +0300
  • 1387de97e2 Updated gradlew Tal Moran 2017-06-22 01:42:08 +0300
  • ef2e09ba6b Added appcompat dependency to scanner to allow build Tal Moran 2017-06-22 01:41:50 +0300
  • c921fef055 Added fixed version of osdetector that is compatible with android plugin Tal Moran 2017-06-22 01:41:08 +0300
  • ea8813bade Updated voting-booth-gui build script to work without local nexus repository Tal Moran 2017-06-21 17:28:07 +0300
  • 355ea1758b Imported scanner project; doesn't compile yet Tal Moran 2017-06-21 13:19:00 +0300
  • 9ad0828eb2 Removed .orig files Tal Moran 2017-06-20 23:41:53 +0300
  • 33a5c493f0 Upgraded to gradle 4.0 Tal Moran 2017-06-20 23:17:21 +0300
  • 24b111a20b voting questions flow fixed (removed button cancel) Laura Radaelli 2017-06-14 19:15:13 +0300
  • f813cf49ee channel single question Laura Radaelli 2017-06-14 18:17:07 +0300
  • 646824de44 parse ScannedData serial number Laura Radaelli 2017-04-27 16:32:12 +0300
  • 4e1b66f890 ip address set to work on tethering Laura Radaelli 2017-04-27 14:43:23 +0300
  • cc3e151a26 main that starts threads added Laura Radaelli 2017-04-16 17:09:35 +0300
  • 29f6b244d7 polling station server and client communicate (reading scannedData works) Laura Radaelli 2017-04-16 14:59:44 +0300
  • ed7b50de23 fixed ScanErrorCallback error in ReceiverWebAPI Laura Radaelli 2017-03-20 18:20:30 +0200
  • 09ee63eca4 polling station server and scanner client communicate (but missing response) Laura Radaelli 2017-03-20 18:03:08 +0200
  • 11b86dd2aa new files with new names (old test passed) Laura Radaelli 2017-03-20 10:37:02 +0200
  • db4cf6a734 QR code for cast (missing QR code for audit) + test interaction polling station Laura Radaelli 2017-03-20 09:34:21 +0200
  • 6350da1fc2 Merge branch 'master' of https://vcs.factcenter.org/meerkat/meerkat-java into voting-booth-gui Laura Radaelli 2017-03-19 10:33:24 +0200
  • 181f49145f Allow specifying elliptic curve name when generating keys on mixer command-line Tal Moran 2017-02-01 21:34:18 +0200
  • 97fbfcecaf remove unused import and fixed cast/audit buttons width Laura Radaelli 2017-01-25 22:10:09 +0200
  • 17d7d5eca4 Merge branch 'master' of https://vcs.factcenter.org/meerkat/meerkat-java into voting-booth-gui Laura Radaelli 2017-01-25 21:45:50 +0200
  • f393825b26 printer added clean() method Laura Radaelli 2017-01-25 19:12:30 +0200
  • b360ae81bb Fix gradle build files to work without nexus repository credentials Tal Moran 2017-01-25 19:10:18 +0200
  • 480f4e52bb moved code for fx to voting-booth-gui Laura Radaelli 2017-01-25 16:01:13 +0200
  • 0cf9390fa5 prints test qr-code to virtual printer Laura Radaelli 2017-01-25 12:50:01 +0200
  • e60e76f104 changed titles of FX windows Laura Radaelli 2017-01-25 10:46:13 +0200
  • 06526a16db Clean up build files and remove dependency on local nexus repository Tal Moran 2017-01-24 17:17:09 +0200
  • 53cc13b51b Cleaning up unchecked casts Tal Moran 2017-01-24 16:28:57 +0200
  • ce0e0e0d62 Fix protobuf decoding bug Tal Moran 2017-01-23 15:41:27 +0200
  • 5b7fbffb09 Update to gradle 3.3 Tal Moran 2017-01-23 15:40:45 +0200
  • c8f82223bc Merge branch 'master' of https://vcs.factcenter.org/meerkat/meerkat-java into mixer Tal Moran 2017-01-23 10:46:14 +0200
  • f930a65c48 Added mixer documentation mixer Tal Moran 2017-01-22 00:24:25 +0200
  • 2744005263 Replaced generic RandomOracle with explicit SHA-256 to make description of random oracle simpler for external verifiers Tal Moran 2017-01-21 23:07:20 +0200
  • 43d4fb75b2 More refactoring, wrote command-line mixer application (no BB access as of yet) Tal Moran 2017-01-21 21:42:10 +0200
  • 273338010d More refactoring Tal Moran 2017-01-20 23:46:51 +0200
  • b9abd847c7 Refactoring Tal Moran 2017-01-19 16:00:01 +0200
  • deeed4f20f tests pass Tal Moran 2017-01-19 15:24:35 +0200
  • fc2c26d7e9 Refactoring (tests currently fail) Tal Moran 2017-01-19 11:08:07 +0200
  • 78f823f31e new benes code passes tests Tal Moran 2017-01-19 01:18:21 +0200
  • 37d1857f9c Working on Benes network/testing Tal Moran 2017-01-18 21:54:42 +0200
  • abf4cc5e54 Add task to download protoc (protobuf compiler) to root-level build/ directory Tal Moran 2017-01-18 21:54:22 +0200
  • 0d416f0018 Rewriting Benes network code (in progress) Tal Moran 2017-01-18 11:47:52 +0200
  • c2da5aa464 All tests pass Tal Moran 2017-01-14 02:42:02 +0200
  • 5386acfd1b added css Laura Radaelli 2017-01-12 18:24:38 +0200
  • 72d96c4d78 virtual printer (javaFX window) added Laura Radaelli 2017-01-12 18:03:40 +0200
  • b8418156b1 got to Cast or Audit screen Laura Radaelli 2017-01-12 12:32:59 +0200
  • a5cceaa6c0 Writing tests for new ZKPs Tal Moran 2017-01-12 11:05:38 +0200
  • 723d348443 Working on mixing code rewrite Tal Moran 2017-01-11 22:09:01 +0200
  • b7ef2c10e1 rewriting mixing proofs Tal Moran 2017-01-11 17:01:14 +0200
  • 29b8ef9734 javafx integration runs till channel choice Laura Radaelli 2017-01-06 17:24:38 +0200
  • c8044fc93d fx gui with mainController and navigator (incomplete again) Laura Radaelli 2016-12-16 22:11:00 +0200
  • 5113c2235b fx gui with MainController and Navigator (incomplete) Laura Radaelli 2016-12-16 22:10:23 +0200
  • c97519c28e starting fx window and communicating with graphicalUI thread Laura Radaelli 2016-12-16 17:55:56 +0200
  • 0b1d334d3c start javaFX window from voting booth ToyRun Laura Radaelli 2016-12-13 10:23:51 +0200
  • 971db5d89c barcode window always on top Laura Radaelli 2016-12-08 13:13:07 +0200
  • 71076f5c7e fix NullPointerException when calling votersBallot.toString and add showBallot (new window) Laura Radaelli 2016-12-08 12:11:04 +0200
  • 9db8efd75b Updated to gradle 3.2.1 Tal Moran 2016-11-28 13:51:24 +0200
  • 0509bf6dda Resolved the umextendablity of the summary ballot panel VladimirEliTokarev 2016-11-12 17:49:48 +0200
  • 08cc50c22a Resulted the bug with the not expendable panel VladimirEliTokarev 2016-11-12 17:37:42 +0200
  • 6161898805 Changed the configuration parser VladimirEliTokarev 2016-11-12 17:17:17 +0200
  • 7b937cc754 Added the creator of the jar to compile and create jar VladimirEliTokarev 2016-11-12 17:05:53 +0200
  • 97f52bfd82 Fixed fatmain bug in build.gradle-template Tal Moran 2016-11-09 15:21:16 +0200
  • e611d0c721 Removed generated files from repository Tal Moran 2016-11-05 23:58:33 +0200
  • f5e71dec2f Added JOpt.simple dependency for command-line parsing; fixed bug in build.gradle to support alternative fatmain Tal Moran 2016-11-05 23:56:19 +0200
  • d6ea9412e3 Changed the usage of json configuration VladimirEliTokarev 2016-11-05 18:00:28 +0200
  • aac7a50a94 Yet more mixer refactoring Tal Moran 2016-11-02 11:59:20 +0200
  • 5b268cd779 More refactoring for mixer Tal Moran 2016-11-02 00:31:49 +0200
  • 1baa567d8e Starting to review and refactor mixer Tal Moran 2016-11-01 18:03:53 +0200