meerkat
/
meerkat-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
179 Commits
19 Branches
0 Tags
3.3 MiB
Commit Graph

12 Commits (vbdev2)

Author SHA1 Message Date
Hai Brenner 49551dc36b Merge branch 'master' into vbdev2 
Conflicts:
	meerkat-common/src/main/proto/meerkat/voting.proto
 2016-07-06 21:55:34 +03:00
Hai Brenner e298ab1e76 removed two unnecessary imports 2016-06-28 11:35:36 +03:00
Hai Brenner 14fac728b3 1. ScannedData now has a Channel and a SignedEncryptedBallot attributes, 
rather than just 'data' attribute
2. Implemented a NetworkVirtualPrinter output device, and now both
   this class and the previous SystemConsoleOutputDevice extend the same
   new abstract class AsyncRunnableOutputDevice which supplies default
   implementations for the interface methods.
 2016-06-28 11:32:00 +03:00
Arbel Deutsch Peled b501992643 Complete overhaul of batch system on server-side 
Added batch methods to BulletinBoardUtils
Related changes in BulletinBoardDigest and BulletinBoardSignature

Merge remote-tracking branch 'origin/master' into Cached-Client

Conflicts:
	bulletin-board-client/src/main/java/meerkat/bulletinboard/SimpleBulletinBoardClient.java
	bulletin-board-client/src/main/java/meerkat/bulletinboard/ThreadedBulletinBoardClient.java
	bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/BulletinBoardSQLServer.java
	bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/H2QueryProvider.java
	bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/MySQLQueryProvider.java
	bulletin-board-server/src/main/java/meerkat/bulletinboard/webapp/BulletinBoardWebApp.java
	bulletin-board-server/src/main/proto/meerkat/bulletin_board_server.proto
	meerkat-common/src/main/java/meerkat/bulletinboard/BulletinBoardClient.java
	meerkat-common/src/main/java/meerkat/bulletinboard/BulletinBoardServer.java
 2016-06-16 11:21:58 +03:00
arbel.peled ffac7c1e34 Fixed all of Tal's remarks. 
Switched to using the predefined BoolValue Protobuf.
 2016-06-02 14:48:48 +03:00
arbel.peled 347e826f73 Working integrated version of Scanner WebApp 
Fully testsed
Moved BoolMsg and IntMsg to Comm package (from BulletinBoardAPI)
 2016-05-31 15:26:56 +03:00
arbel.peled b934894bc5 Created Polling Station Scanner interface 
Implemented Web App for the scanner
Not tested
 2016-05-05 16:55:10 +03:00
Tal Moran 4f608e813d Code review comments and channges 2016-04-05 15:36:00 +03:00
Tal Moran b8cc3feedb EC encryption code; compiles but not tested 2015-11-22 03:16:35 +02:00
Tal Moran aaf26dc2b1 Removed application plugin from empty projects so that root-level build will work 2015-11-10 13:56:45 +02:00
Tal Moran c34e3b77c6 HelloWorld for protobuf-based servlet with integration test example 2015-11-10 01:49:17 +02:00
Tal Moran eb1230d719 Moved to multi-project gradle build; added (non-working) hello world for bulletin-board server using Jetty and Jersey 2015-11-09 16:01:59 +02:00