GME
|
0589eb6bc6
|
up
|
2019-04-15 21:13:07 +02:00 |
|
|
GME
|
eb23e8f019
|
Merge branch 'features1.4/clean' into develop-1.4
|
2019-04-15 20:59:06 +02:00 |
|
|
GME
|
70a3b3328d
|
Clean API
|
2019-04-15 20:58:58 +02:00 |
|
|
GME
|
3893e90630
|
up
|
2019-04-15 19:56:36 +02:00 |
|
|
GME
|
01c38f963f
|
update
|
2019-04-13 22:07:38 +02:00 |
|
|
GME
|
3e3492254e
|
update
|
2019-04-13 21:14:26 +02:00 |
|
|
GME
|
e65687aa9b
|
update transaction api
|
2019-04-12 19:30:30 +02:00 |
|
|
GME
|
253ce1996a
|
Merge branch 'features1.4/user' into develop-1.4
|
2019-04-11 21:44:57 +02:00 |
|
|
GME
|
a08ff2d5e3
|
update api
|
2019-04-11 21:44:53 +02:00 |
|
|
GME
|
79159487a6
|
missed
|
2019-04-11 18:06:18 +02:00 |
|
|
GME
|
9504fff762
|
Merge branch 'features1.4/wallet' into develop-1.4
|
2019-04-11 18:03:48 +02:00 |
|
|
GME
|
7cc40b2122
|
update api
|
2019-04-11 18:03:43 +02:00 |
|
|
GME
|
7961e25793
|
update api
|
2019-04-10 22:22:06 +02:00 |
|
|
GME
|
ca3fbda8da
|
Merge branch 'features1.4/clean' into develop-1.4
|
2019-04-09 18:48:56 +02:00 |
|
|
GME
|
0591dda379
|
Clean code
|
2019-04-09 18:48:52 +02:00 |
|
|
GME
|
debdbb52ce
|
Merge branch 'features1.4/session' into develop-1.4
|
2019-04-08 21:17:40 +02:00 |
|
|
GME
|
2038c66f06
|
Update session
|
2019-04-08 21:17:35 +02:00 |
|
|
GME
|
16dd8584db
|
Merge branch 'features1.4/user' into develop-1.4
|
2019-04-08 21:07:14 +02:00 |
|
|
GME
|
9167b135f5
|
Update user api
|
2019-04-08 21:07:02 +02:00 |
|
|
GME
|
1302a5a3dc
|
Merge branch 'features1.4/transaction' into develop-1.4
|
2019-04-08 20:56:38 +02:00 |
|
|
GME
|
959db7b991
|
Update transactions
|
2019-04-08 20:56:32 +02:00 |
|
|
GME
|
996c880055
|
Merge branch 'features1.4/testing' into develop-1.4
|
2019-04-08 19:06:17 +02:00 |
|
|
GME
|
b328940037
|
testing front api
|
2019-04-08 19:06:13 +02:00 |
|
|
GME
|
ef506d8be4
|
Merge branch 'features1.4/testing' into develop-1.4
|
2019-04-07 19:10:14 +02:00 |
|
|
GME
|
14d111508e
|
Testing OK
|
2019-04-07 19:10:09 +02:00 |
|
|
GME
|
2c6ea23968
|
Merge branch 'features1.4/testing' into develop-1.4
|
2019-04-05 19:45:03 +02:00 |
|
|
GME
|
fe7ebfdea3
|
testing, update and security
adding layer of security for transaction & setBalance
testing and updating test
|
2019-04-05 19:44:43 +02:00 |
|
|
GME
|
4972d615e2
|
Merge branch 'features1.4/testing' into develop-1.4
|
2019-04-03 21:42:14 +02:00 |
|
|
GME
|
1e479ff973
|
End test and fix
|
2019-04-03 21:42:09 +02:00 |
|
|
GME
|
decdb64136
|
Merge branch 'features1.4/testing' into develop-1.4
|
2019-04-03 19:53:15 +02:00 |
|
|
GME
|
86f6abfce5
|
Test & clean
TODO : end WalletImplementationTest
|
2019-04-03 19:53:12 +02:00 |
|
|
GME
|
48c0b2a340
|
Merge branch 'features1.4/testing' into develop-1.4
|
2019-04-03 17:32:54 +02:00 |
|
|
GME
|
ef9863a8be
|
test, fix and improve code
Test UserImplementation (OK)
Test SessionImplementation (OK)
Test WalletImplmeentation - must correct queryWalletByOwner, setSoldOnWallet in chaincode
|
2019-04-03 17:32:49 +02:00 |
|
|
GME
|
5df9626bc7
|
Merge branch 'features1.4/session' into develop-1.4
|
2019-04-03 15:14:46 +02:00 |
|
|
GME
|
3262d72ec0
|
setup session
|
2019-04-03 15:14:41 +02:00 |
|
|
GME
|
99a29d8a49
|
Merge branch 'features1.4/transaction' into develop-1.4
|
2019-04-03 14:39:43 +02:00 |
|
|
GME
|
e9ce67a6a6
|
Update transaction API
|
2019-04-03 14:39:39 +02:00 |
|
|
GME
|
1378158e35
|
Merge branch 'features1.4/transaction' into develop-1.4
|
2019-04-02 20:25:09 +02:00 |
|
|
GME
|
5be8d03dd3
|
Setup transaction api base
|
2019-04-02 20:25:03 +02:00 |
|
|
GME
|
16c97a6608
|
Merge branch 'features1.4/wallet' into develop-1.4
|
2019-04-02 19:20:05 +02:00 |
|
|
GME
|
9f20f92c02
|
Update wallet implementation & resource API
|
2019-04-02 19:20:01 +02:00 |
|
|
GME
|
722ebe704e
|
Merge branch 'features1.4/wallet' into develop-1.4
|
2019-03-31 20:51:04 +02:00 |
|
|
GME
|
892afd8efb
|
Create Wallet Rest-Api
On Work
|
2019-03-31 20:50:59 +02:00 |
|
|
GME
|
4ea0fdd202
|
Merge branch 'features1.4/user' into develop-1.4
|
2019-03-31 18:35:35 +02:00 |
|
|
GME
|
cb38f1a6d2
|
Rest-Api User
|
2019-03-31 18:35:30 +02:00 |
|
|
GME
|
be076b7fab
|
Merge branch 'features1.4/user' into develop-1.4
|
2019-03-31 14:08:21 +02:00 |
|
|
GME
|
a268a44b6a
|
Temp update
|
2019-03-31 14:08:17 +02:00 |
|
|
GME
|
a03db07d32
|
Merge branch 'features1.4/database' into develop-1.4
|
2019-03-31 13:13:35 +02:00 |
|
|
GME
|
43153d954d
|
clean transaction
|
2019-03-31 13:13:28 +02:00 |
|
|
GME
|
35619f176f
|
Merge branch 'features1.4/rest' into develop-1.4
|
2019-03-31 13:07:41 +02:00 |
|