Commit Graph

15 Commits (master)

Author SHA1 Message Date
Tal Moran 08d9bd6217 Integrated bb-server angular frontend in gradle build 2017-07-03 03:24:00 +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 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 355ea1758b Imported scanner project; doesn't compile yet 2017-06-21 13:19:00 +03:00
Tal Moran a9fbf555d6 Refactored voting-booth-gui to use gradle and match maven directory style 2016-09-21 17:21:34 +03:00
Hai Brenner 6b512e078b Merge branch 'master' into dist_dec
# Conflicts:
#	meerkat-common/src/main/java/meerkat/crypto/concrete/ECElGamalEncryption.java
#	meerkat-common/src/main/proto/meerkat/BulletinBoardAPI.proto
#	settings.gradle
2016-08-09 14:30:40 +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
Tal Moran 1ec02173e7 package renaming and protobuf moves 2016-04-11 19:48:36 +03:00
Tal Moran 4f608e813d Code review comments and channges 2016-04-05 15:36:00 +03:00
Tal Moran 6d6e4748b7 merge 2016-04-05 11:32:07 +03:00
tzlil.gon 6100497e8e Feldman's VSS 2016-01-27 13:41:24 +02:00
Arbel Deutsch Peled a31d88bd12 First implementation of simple BB Client 2015-12-05 14:25:02 +02:00
tzlil.gon 12ed7a679d mixer code 2015-11-24 15:39:39 +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