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
|
88c4e0e644
|
Merge branch 'master' of https://cs.idc.ac.il/rhodecode/meerkat/meerkat-java
|
2016-07-06 21:45:35 +03:00 |
|
Hai Brenner
|
d804f0dbac
|
voting-booth gradle.build now has dependencies on jetty and RESTful API for testing purposes
|
2016-07-06 21:33:30 +03:00 |
|
Hai Brenner
|
4379921445
|
For some reason restful API did not appear in my gradle.build. It is fixed now.
|
2016-06-28 11:26:00 +03:00 |
|
Hai Brenner
|
06d69554d9
|
fixed some merge conflicts which appeared for some unknown reason
|
2016-06-26 17:07:03 +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 |