Laura Radaelli
							
						 | 
						
							
							
							
							
								
							
								24b111a20b
								
							
								
							
						 | 
						
							
							
								
								voting questions flow fixed (removed button cancel)
							
							
							
							
							
						 | 
						
							2017-06-14 19:15:13 +03:00 | 
						
					
				
					
						
							
							
								 
								Laura Radaelli
							
						 | 
						
							
							
							
							
								
							
								f813cf49ee
								
							
								
							
						 | 
						
							
							
								
								channel single question
							
							
							
							
							
						 | 
						
							2017-06-14 18:17:07 +03:00 | 
						
					
				
					
						
							
							
								 
								Laura Radaelli
							
						 | 
						
							
							
							
							
								
							
								646824de44
								
							
								
							
						 | 
						
							
							
								
								parse ScannedData serial number
							
							
							
							
							
						 | 
						
							2017-04-27 16:32:12 +03:00 | 
						
					
				
					
						
							
							
								 
								Laura Radaelli
							
						 | 
						
							
							
							
							
								
							
								4e1b66f890
								
							
								
							
						 | 
						
							
							
								
								ip address set to work on tethering
							
							
							
							
							
						 | 
						
							2017-04-27 14:43:23 +03:00 | 
						
					
				
					
						
							
							
								 
								Laura Radaelli
							
						 | 
						
							
							
							
							
								
							
								cc3e151a26
								
							
								
							
						 | 
						
							
							
								
								main that starts threads added
							
							
							
							
							
						 | 
						
							2017-04-16 17:09:35 +03:00 | 
						
					
				
					
						
							
							
								 
								Laura Radaelli
							
						 | 
						
							
							
							
							
								
							
								29f6b244d7
								
							
								
							
						 | 
						
							
							
								
								polling station server and client communicate (reading scannedData works)
							
							
							
							
							
						 | 
						
							2017-04-16 14:59:44 +03:00 | 
						
					
				
					
						
							
							
								 
								Laura Radaelli
							
						 | 
						
							
							
							
							
								
							
								ed7b50de23
								
							
								
							
						 | 
						
							
							
								
								fixed ScanErrorCallback error in ReceiverWebAPI
							
							
							
							
							
						 | 
						
							2017-03-20 18:20:30 +02:00 | 
						
					
				
					
						
							
							
								 
								Laura Radaelli
							
						 | 
						
							
							
							
							
								
							
								09ee63eca4
								
							
								
							
						 | 
						
							
							
								
								polling station server and scanner client communicate (but missing response)
							
							
							
							
							
						 | 
						
							2017-03-20 18:03:08 +02:00 | 
						
					
				
					
						
							
							
								 
								Laura Radaelli
							
						 | 
						
							
							
							
							
								
							
								11b86dd2aa
								
							
								
							
						 | 
						
							
							
								
								new files with new names (old test passed)
							
							
							
							
							
						 | 
						
							2017-03-20 10:37:02 +02:00 | 
						
					
				
					
						
							
							
								 
								Laura Radaelli
							
						 | 
						
							
							
							
							
								
							
								db4cf6a734
								
							
								
							
						 | 
						
							
							
								
								QR code for cast (missing QR code for audit) + test interaction polling station
							
							
							
							
							
						 | 
						
							2017-03-20 09:34:21 +02:00 | 
						
					
				
					
						
							
							
								 
								Laura Radaelli
							
						 | 
						
							
							
							
							
								
							
								6350da1fc2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://vcs.factcenter.org/meerkat/meerkat-java into voting-booth-gui
							
							
							
							
							
						 | 
						
							2017-03-19 10:33:24 +02:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								181f49145f
								
							
								
							
						 | 
						
							
							
								
								Allow specifying elliptic curve name when generating keys on mixer command-line
							
							
							
							
							
						 | 
						
							2017-02-01 21:34:18 +02:00 | 
						
					
				
					
						
							
							
								 
								Laura Radaelli
							
						 | 
						
							
							
							
							
								
							
								97fbfcecaf
								
							
								
							
						 | 
						
							
							
								
								remove unused import and fixed cast/audit buttons width
							
							
							
							
							
						 | 
						
							2017-01-25 22:10:09 +02:00 | 
						
					
				
					
						
							
							
								 
								Laura Radaelli
							
						 | 
						
							
							
							
							
								
							
								17d7d5eca4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://vcs.factcenter.org/meerkat/meerkat-java into voting-booth-gui
							
							
							
							
							
						 | 
						
							2017-01-25 21:45:50 +02:00 | 
						
					
				
					
						
							
							
								 
								Laura Radaelli
							
						 | 
						
							
							
							
							
								
							
								f393825b26
								
							
								
							
						 | 
						
							
							
								
								printer added clean() method
							
							
							
							
							
						 | 
						
							2017-01-25 19:12:30 +02:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								b360ae81bb
								
							
								
							
						 | 
						
							
							
								
								Fix gradle build files to work without nexus repository credentials
							
							
							
							
							
						 | 
						
							2017-01-25 19:10:18 +02:00 | 
						
					
				
					
						
							
							
								 
								Laura Radaelli
							
						 | 
						
							
							
							
							
								
							
								480f4e52bb
								
							
								
							
						 | 
						
							
							
								
								moved code for fx to voting-booth-gui
							
							
							
							
							
						 | 
						
							2017-01-25 16:01:13 +02:00 | 
						
					
				
					
						
							
							
								 
								Laura Radaelli
							
						 | 
						
							
							
							
							
								
							
								0cf9390fa5
								
							
								
							
						 | 
						
							
							
								
								prints test qr-code to virtual printer
							
							
							
							
							
						 | 
						
							2017-01-25 12:50:01 +02:00 | 
						
					
				
					
						
							
							
								 
								Laura Radaelli
							
						 | 
						
							
							
							
							
								
							
								e60e76f104
								
							
								
							
						 | 
						
							
							
								
								changed titles of FX windows
							
							
							
							
							
						 | 
						
							2017-01-25 10:46:13 +02:00 | 
						
					
				
					
						
							
							
								 
								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 |