|  Laura Radaelli | 24d00a89fb | added proto for audit | 2017-07-17 16:01:15 +03:00 | 
				
					
						|  Laura Radaelli | ce2fe0e8f2 | ignoring election params. dat files. Audit ballot QRcode. | 2017-07-17 13:37:39 +03:00 | 
				
					
						|  Laura Radaelli | dadf301fcf | Merge branch 'master' of https://vcs.factcenter.org/meerkat/meerkat-java into voting-booth-gui | 2017-07-09 11:48:03 +03:00 | 
				
					
						|  Tal Moran | 73619b0c9e | Better win compatibility for bb-server frontent | 2017-07-09 11:09:07 +03:00 | 
				
					
						|  Laura Radaelli | 8ace24677b | Merge branch 'master' of https://vcs.factcenter.org/meerkat/meerkat-java into voting-booth-gui | 2017-07-08 14:09:18 +03:00 | 
				
					
						|  Tal Moran | 252a761005 | Better cross-platform support for building bb-server frontend | 2017-07-06 12:00:04 +03:00 | 
				
					
						|  Tal Moran | 931bb56378 | Fixed npm_install dependency that broke clean builds | 2017-07-03 02:51:02 -04:00 | 
				
					
						|  Laura Radaelli | 95700f360e | fixed printing auditing. Added separator. | 2017-07-03 08:14:59 +03:00 | 
				
					
						|  Tal Moran | fa4656f0a9 | added dependency on npmInstall to ensure protobufjs is installed in bb server frontend | 2017-07-03 03:37:32 +03:00 | 
				
					
						|  Tal Moran | 08d9bd6217 | Integrated bb-server angular frontend in gradle build | 2017-07-03 03:24:00 +03:00 | 
				
					
						|  Tal Moran | 173b952e09 | Added proxy to bb frontend (no need for cross-origin headers); support periodic status calls | 2017-07-02 17:54:36 +03:00 | 
				
					
						|  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 | 
				
					
						|  Laura Radaelli | 9db8d8708a | fixed alignment of welcome screen | 2017-06-27 16:02:17 +03:00 | 
				
					
						|  Laura Radaelli | b9613ed693 | added summary screen after voting | 2017-06-27 14:19:30 +03:00 | 
				
					
						|  Laura Radaelli | 19a7d5731c | added page number to question screen | 2017-06-26 13:25:07 +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 |