Commit graph

30 commits

Author SHA1 Message Date
GME f16ec4c8fc Clean project from blockchain 2018-10-20 15:20:05 +02:00
GME cc8918c8ed Merge branch 'features/blockchainAccess' into develop 2018-10-20 14:20:15 +02:00
GME adbfddf834 Test enroll admin 2018-10-20 14:20:04 +02:00
GME 7a4e7bf549 Merge branch 'features/hyperledgerBlockchain' into develop 2018-10-19 09:48:00 +02:00
GME 4bd2b8d0da Update features 2018-10-19 09:47:49 +02:00
GME 82a75648a1 Merge branch 'features/hyperledgerBlockchain' into develop 2018-10-19 09:43:00 +02:00
GME 57cd29ad6f Merge branch 'features/hyperledgerBlockchain' into develop 2018-10-19 09:42:43 +02:00
GME 62f8b0a8df Merge branch 'features/hyperledgerBlockchain' into develop 2018-10-14 18:51:37 +02:00
GME 07d3f94a40 Blockchain first 2018-10-14 18:50:55 +02:00
GME 73132974db Merge branch 'features/qrcode/scanner' into develop 2018-09-28 09:38:51 +02:00
GME 53f65d9609 Setup QR Code Scanner
Developped QR Code Scanner
2018-09-28 09:38:43 +02:00
GME 81d4d33d3d Merge branch 'features/qrcode/generator' into develop 2018-09-27 15:48:14 +02:00
GME 1d2bdf0808 Added QRCode Generator
Added QRCode Generator which generate a QR code with destination address and amount
2018-09-27 15:48:02 +02:00
GME 110e7794fd Merge branch 'features/database/user' into develop 2018-09-27 11:35:49 +02:00
GME b617aadbba Setup UserDao
Setup basic method to access and update data in DB
2018-09-27 11:35:31 +02:00
GME ef981aee4b Merge branch 'features/database/databasehelper' into develop 2018-09-26 11:02:07 +02:00
GME edbeb5bb0c Setup DatabaseHelper
Setup DatabaseHelper connection, Tested Connection to postgres.
2018-09-26 11:01:51 +02:00
GME 7f3e0fa6a7 Merge branch 'features/homepage/login' into develop 2018-09-25 10:40:00 +02:00
GME 0e3f52c91c Updated Login activity
updated login activity on new structure (InputController)
2018-09-25 10:38:06 +02:00
GME 8a78eda50d Merge branch 'features/register' into develop 2018-09-25 10:08:23 +02:00
GME 4d1ff7da1f Change to SignUp (Register)
Modified project structure and added features
2018-09-25 10:07:45 +02:00
GME_PRO d74218fb29 backup 2018-07-28 09:57:49 +02:00
GME_PRO 2d9ed1d1f8 Merge branch 'master' of https://gitlab.com/monnethic/app-mobile into develop 2018-06-15 09:02:14 +02:00
GME_PRO 1fcf0686d5 test 2018-06-15 09:00:03 +02:00
GME_PRO 38b6fa986a add transaction test 2018-06-13 15:39:29 +02:00
GME_PRO 1f175b73c1 update 2018-06-11 19:30:10 +02:00
GME 68d847eaee Merge branch 'develop' into 'master'
Develop to Master - add transaction demo function

See merge request monnethic/app-mobile!1
2018-06-10 14:35:09 +00:00
GME 911b6b1354 add comment 2018-06-10 16:32:54 +02:00
GME 212cf65521 Add transaction demo function 2018-06-10 16:24:42 +02:00
GME 72af832156 modif repertoire app mobile et ajout modif 2018-06-10 12:45:41 +02:00