08d9bd6217
Integrated bb-server angular frontend in gradle build
2017-07-03 03:24:00 +03:00
68e1737f22
Dependency cleaning; more spongification; use composite build to include qilin (need qilin 1.3+ now)
2017-06-26 01:59:32 +03:00
3c52eb2e8d
Done refactoring scannerAPI; fixed android scanner to use modern settings api and allow URL+nonce
2017-06-26 00:22:20 +03:00
291f7d93c0
Scanner serverdata now tries to get a non-localhost IPV4 address if possible
2017-06-25 18:54:34 +03:00
324a079a90
Refactored and fixed NetworkVirtualPrinter
2017-06-25 17:51:25 +03:00
6f35f105c5
Mostly finished with scanAPI refactoring
2017-06-25 16:20:28 +03:00
cb1d2343c4
More refactoring for scannerAPI
2017-06-25 10:15:09 +03:00
ceba09e65c
working on scanner API refactoring (doesn't compile yet)
2017-06-22 17:56:59 +03:00
c7dd5bd663
Added settings activity to android scanner; started refactoring scanner api
2017-06-22 11:50:59 +03:00
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
646824de44
parse ScannedData serial number
2017-04-27 16:32:12 +03:00
4e1b66f890
ip address set to work on tethering
2017-04-27 14:43:23 +03:00
cc3e151a26
main that starts threads added
2017-04-16 17:09:35 +03:00
29f6b244d7
polling station server and client communicate (reading scannedData works)
2017-04-16 14:59:44 +03:00
ed7b50de23
fixed ScanErrorCallback error in ReceiverWebAPI
2017-03-20 18:20:30 +02:00
09ee63eca4
polling station server and scanner client communicate (but missing response)
2017-03-20 18:03:08 +02:00
11b86dd2aa
new files with new names (old test passed)
2017-03-20 10:37:02 +02:00
b360ae81bb
Fix gradle build files to work without nexus repository credentials
2017-01-25 19:10:18 +02:00
06526a16db
Clean up build files and remove dependency on local nexus repository
2017-01-24 17:17:09 +02:00
53cc13b51b
Cleaning up unchecked casts
2017-01-24 16:28:57 +02:00
267164e996
Update to Gradle 3.1
2016-09-21 16:19:45 +03:00
49551dc36b
Merge branch 'master' into vbdev2
...
Conflicts:
meerkat-common/src/main/proto/meerkat/voting.proto
2016-07-06 21:55:34 +03:00
e298ab1e76
removed two unnecessary imports
2016-06-28 11:35:36 +03:00
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
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
ffac7c1e34
Fixed all of Tal's remarks.
...
Switched to using the predefined BoolValue Protobuf.
2016-06-02 14:48:48 +03:00
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
b934894bc5
Created Polling Station Scanner interface
...
Implemented Web App for the scanner
Not tested
2016-05-05 16:55:10 +03:00
4f608e813d
Code review comments and channges
2016-04-05 15:36:00 +03:00
b8cc3feedb
EC encryption code; compiles but not tested
2015-11-22 03:16:35 +02:00
aaf26dc2b1
Removed application plugin from empty projects so that root-level build will work
2015-11-10 13:56:45 +02:00
c34e3b77c6
HelloWorld for protobuf-based servlet with integration test example
2015-11-10 01:49:17 +02:00
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
Tal Moran
Laura Radaelli
Hai Brenner
Arbel Deutsch Peled