Tal Moran
							
						 | 
						
							
							
							
							
								
							
								c0b21f82ee
								
							
								
							
						 | 
						
							
							
								
								Added toy angular application (for bulletin-board frontend)
							
							
							
							
							
						 | 
						
							2017-07-02 16:42:45 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								05c7a25bb7
								
							
								
							
						 | 
						
							
							
								
								Renamed proto files to use standard (lowercase-underscore) naming convention); added a separate proto for bb webapp
							
							
							
							
							
						 | 
						
							2017-06-30 02:28:03 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								68e1737f22
								
							
								
							
						 | 
						
							
							
								
								Dependency cleaning; more spongification; use composite build to include qilin (need qilin 1.3+ now)
							
							
							
							
							
						 | 
						
							2017-06-26 01:59:32 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								3c52eb2e8d
								
							
								
							
						 | 
						
							
							
								
								Done refactoring scannerAPI; fixed android scanner to use modern settings api and allow URL+nonce
							
							
							
							
							
						 | 
						
							2017-06-26 00:22:20 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								0dfd2480d2
								
							
								
							
						 | 
						
							
							
								
								Added connection to android scanner; problems with missing crypto providers
							
							
							
							
							
						 | 
						
							2017-06-25 19:27:38 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								291f7d93c0
								
							
								
							
						 | 
						
							
							
								
								Scanner serverdata now tries to get a non-localhost IPV4 address if possible
							
							
							
							
							
						 | 
						
							2017-06-25 18:54:34 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								6b47387920
								
							
								
							
						 | 
						
							
							
								
								Code now builds
							
							
							
							
							
						 | 
						
							2017-06-25 18:05:52 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								324a079a90
								
							
								
							
						 | 
						
							
							
								
								Refactored and fixed NetworkVirtualPrinter
							
							
							
							
							
						 | 
						
							2017-06-25 17:51:25 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								6f35f105c5
								
							
								
							
						 | 
						
							
							
								
								Mostly finished with scanAPI refactoring
							
							
							
							
							
						 | 
						
							2017-06-25 16:20:28 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								cb1d2343c4
								
							
								
							
						 | 
						
							
							
								
								More refactoring for scannerAPI
							
							
							
							
							
						 | 
						
							2017-06-25 10:15:09 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								7e4260b8d5
								
							
								
							
						 | 
						
							
							
								
								Added signature key generation to crypto API
							
							
							
							
							
						 | 
						
							2017-06-24 03:15:59 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								ceba09e65c
								
							
								
							
						 | 
						
							
							
								
								working on scanner API refactoring (doesn't compile yet)
							
							
							
							
							
						 | 
						
							2017-06-22 17:56:59 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								c7dd5bd663
								
							
								
							
						 | 
						
							
							
								
								Added settings activity to android scanner; started refactoring scanner api
							
							
							
							
							
						 | 
						
							2017-06-22 11:50:59 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								24e3556320
								
							
								
							
						 | 
						
							
							
								
								fixed build so android-scanner compiles; changed android-scanner to use meerkat scanner API rather than custom REST library
							
							
							
							
							
						 | 
						
							2017-06-22 02:58:01 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								62349f9fe7
								
							
								
							
						 | 
						
							
							
								
								removed apparently unecessary file
							
							
							
							
							
						 | 
						
							2017-06-22 01:45:48 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								3b3a6a09b2
								
							
								
							
						 | 
						
							
							
								
								Removed debug printout
							
							
							
							
							
						 | 
						
							2017-06-22 01:42:24 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								1387de97e2
								
							
								
							
						 | 
						
							
							
								
								Updated gradlew
							
							
							
							
							
						 | 
						
							2017-06-22 01:42:08 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								ef2e09ba6b
								
							
								
							
						 | 
						
							
							
								
								Added appcompat dependency to scanner to allow build
							
							
							
							
							
						 | 
						
							2017-06-22 01:41:50 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								c921fef055
								
							
								
							
						 | 
						
							
							
								
								Added fixed version of osdetector that is compatible with android plugin
							
							
							
							
							
						 | 
						
							2017-06-22 01:41:08 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								ea8813bade
								
							
								
							
						 | 
						
							
							
								
								Updated voting-booth-gui build script to work without local nexus repository
							
							
							
							
							
						 | 
						
							2017-06-21 17:28:07 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								355ea1758b
								
							
								
							
						 | 
						
							
							
								
								Imported scanner project; doesn't compile yet
							
							
							
							
							
						 | 
						
							2017-06-21 13:19:00 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								9ad0828eb2
								
							
								
							
						 | 
						
							
							
								
								Removed .orig files
							
							
							
							
							
						 | 
						
							2017-06-20 23:41:53 +03:00 | 
						
					
				
					
						
							
							
								 
								Tal Moran
							
						 | 
						
							
							
							
							
								
							
								33a5c493f0
								
							
								
							
						 | 
						
							
							
								
								Upgraded to gradle 4.0
							
							
							
							
							
						 | 
						
							2017-06-20 23:17:21 +03:00 | 
						
					
				
					
						
							
							
								 
								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 |