Commit graph

66 commits

Author SHA1 Message Date
GME 457c245fe5 Auto stash before merge of "develop" and "origin/develop" 2019-03-14 22:30:20 +01:00
GME 1ca0ea5069 t 2019-03-14 22:27:01 +01:00
GME 05b1827450 latest test 2019-03-14 20:44:40 +01:00
GME c663dd5050 version chaincode
adresse serveur modifié temporairement
2019-03-10 21:15:42 +01:00
GME 2ede4c231c update new user 2018-12-02 12:32:44 +01:00
GME 584349e931 postman 2018-11-26 20:22:44 +01:00
GME 5b66b6723c update balance api 2018-11-26 11:04:29 +01:00
GME 6f88238309 update user save api 2018-11-26 10:17:48 +01:00
GME 23e8ef5b1f Merge branch 'features/apiFront' into develop 2018-11-25 17:26:50 +01:00
GME 8bee24167c update front api 2018-11-25 17:26:45 +01:00
GME 199d122038 update port and pom xml 2018-11-22 18:49:40 +01:00
GME 4c7a65816d Update database transaction api rest 2018-11-22 17:47:16 +01:00
GME f51df72704 modify database
modified database, api front for transaction
2018-11-22 17:08:56 +01:00
GME 4f794b5bca Merge branch 'features/apiFront' into develop 2018-11-21 21:27:02 +01:00
GME a50e07535c add a query, tested 2018-11-21 21:26:58 +01:00
GME 618fa237d0 Transaction api rest
Added basic method for api rest transactions
2018-11-21 20:19:43 +01:00
GME 75ba178cee Merge branch 'features/apiBack' into develop 2018-11-21 19:52:39 +01:00
GME cdaf81b99d TransactionDao
Added basic transaction Dao for database
2018-11-21 19:52:35 +01:00
GME 80328999bc Merge branch 'features/apiFront' into develop 2018-11-21 19:36:13 +01:00
GME 2c5ef6ce29 Update
Refactor, clean, add some user api rest method
2018-11-21 19:36:07 +01:00
GME 097d6f2d4e Merge branch 'features/apiFront' into develop 2018-11-20 19:45:11 +01:00
GME 18f679ff6e Setup basic login
Setup login, register, basic hash
2018-11-20 19:45:06 +01:00
GME 501b0e4760 Merge branch 'features/apiFront' into develop 2018-11-19 19:27:06 +01:00
GME f8308dff09 add api-database
added ormlite, database connection and base class with simple test  connection class
2018-11-19 19:27:01 +01:00
GME 217e70403b Merge branch 'features/apiFront' into develop 2018-11-18 15:31:41 +01:00
GME c604474acf updategitIgnore 2018-11-18 15:31:35 +01:00
GME 2d51032d0f Merge branch 'features/apiFront' into develop 2018-11-17 19:43:03 +01:00
GME 04ee63a569 Front Api 0.1
Added get Balance
2018-11-17 19:42:57 +01:00
GME 82e362cacd clean develop 2018-11-17 19:02:45 +01:00
GME 08d9db12aa Add Ignore
Added ignore annotation for test class (spring runtime)
2018-11-17 18:43:54 +01:00
GME 10319201bb Merge branch 'features/apiFront' into develop 2018-11-17 18:29:41 +01:00
GME d11837203c Setup api front 2018-11-17 18:29:34 +01:00
GME f59cf43a9e Merge branch 'features/apiBack' into develop 2018-11-17 13:20:06 +01:00
GME 78f0b30dda JAVA-API BACK
Setup firsts Back Methods for API
2018-11-17 13:20:00 +01:00
GME 1440cd71fe JAVA-API BACK
Setup firsts Back Methods for API
2018-11-17 13:19:35 +01:00
GME 2ee79b3552 Merge branch 'features/clean' into develop 2018-11-17 11:21:54 +01:00
GME 74821e5056 clean code
delete unused class and code
2018-11-17 11:21:49 +01:00
GME 270fa6d692 Clean code
Delete old unused code and remove unused class
2018-11-17 11:21:34 +01:00
GME 3bd3f8ebe5 test 2018-11-17 10:55:22 +01:00
GME 2411f0f915 Merge remote-tracking branch 'origin/develop' into develop 2018-11-17 10:54:18 +01:00
GME a2297122d6 Merge branch 'features/queryChannel' into develop 2018-11-17 10:51:16 +01:00
GME 91ef184868 setup update 2018-11-17 10:51:09 +01:00
GME 0c218822c9 Auto stash before merge of "develop" and "origin/develop" 2018-11-16 18:09:37 +01:00
GME 153e046928 TransactionTest 2018-11-07 09:01:07 +01:00
GME 670acb078e Merge branch 'features/queryChannel' into develop 2018-11-06 10:41:05 +01:00
GME 52ba2f3f5d SUCCESS FUCK IT 2018-11-06 10:41:00 +01:00
GME 8222a0220a Merge branch 'features/queryChannel' into develop 2018-11-06 09:16:18 +01:00
GME dc56d43bc2 Clean for next tests 2018-11-06 09:16:12 +01:00
GME 86079b6cc9 Clean for next test 2018-11-06 09:15:56 +01:00
GME 552c60ba58 Merge branch 'features/queryChaincode' into develop 2018-10-24 21:18:43 +02:00