Commit graph

  • 656cc77c0a fix approved develop-1.4 GME 2019-06-15 19:50:57 +0200
  • cae0aec951 Fix minor bug - History search for all with date GME 2019-06-14 18:21:50 +0200
  • 48da18bfdd update api GME 2019-06-13 21:34:38 +0200
  • ff5a7f4740 up GME 2019-06-13 13:48:08 +0200
  • 0eed15427a update api GME 2019-06-10 19:50:42 +0200
  • d130dd9b2e update test & demo GME 2019-06-10 15:42:04 +0200
  • 7b9604a51a setup demo file GME 2019-06-07 14:43:43 +0200
  • 7d3783b5a0 correction GME 2019-06-07 13:42:38 +0200
  • e5284e0957 Merge branch 'features1.4/chiff' into develop-1.4 GME 2019-06-07 12:34:04 +0200
  • 998ac4526c update api GME 2019-06-07 12:33:57 +0200
  • a8164c9c0c u GME 2019-06-07 08:53:04 +0200
  • b53452ba1d update GME 2019-05-25 14:35:22 +0200
  • 264e1be827 up GME 2019-05-25 10:51:08 +0200
  • e5d1b705e1 Update config GME 2019-05-25 10:46:03 +0200
  • 3881c0ae0e Merge branch 'features1.4/config' into develop-1.4 GME 2019-05-25 10:31:30 +0200
  • 177dbe1f0d Update config for demo GME 2019-05-25 10:31:21 +0200
  • c6e53fd9d2 clean repo GME 2019-04-21 17:42:37 +0200
  • c737f3a354 BI GME 2019-04-21 16:35:27 +0200
  • 951965bddd bi_test GME 2019-04-20 19:34:12 +0200
  • 8802423e2c add first shot BI GME 2019-04-20 16:02:17 +0200
  • c4b38bf041 update database helper and transaction GME 2019-04-18 22:20:10 +0200
  • f526853722 update dao GME 2019-04-17 23:22:05 +0200
  • 58f866fef0 up GME 2019-04-16 18:47:49 +0200
  • 3812808697 up GME 2019-04-16 18:25:26 +0200
  • b867d68e74 up GME 2019-04-16 18:24:33 +0200
  • b74705ccfa u GME 2019-04-15 22:25:15 +0200
  • 0589eb6bc6 up GME 2019-04-15 21:13:07 +0200
  • eb23e8f019 Merge branch 'features1.4/clean' into develop-1.4 GME 2019-04-15 20:59:06 +0200
  • 70a3b3328d Clean API GME 2019-04-15 20:58:58 +0200
  • 3893e90630 up GME 2019-04-15 19:56:36 +0200
  • 01c38f963f update GME 2019-04-13 22:07:38 +0200
  • 3e3492254e update GME 2019-04-13 21:14:26 +0200
  • e65687aa9b update transaction api GME 2019-04-12 19:30:30 +0200
  • 253ce1996a Merge branch 'features1.4/user' into develop-1.4 GME 2019-04-11 21:44:57 +0200
  • a08ff2d5e3 update api GME 2019-04-11 21:44:53 +0200
  • 79159487a6 missed GME 2019-04-11 18:06:18 +0200
  • 9504fff762 Merge branch 'features1.4/wallet' into develop-1.4 GME 2019-04-11 18:03:48 +0200
  • 7cc40b2122 update api GME 2019-04-11 18:03:43 +0200
  • 7961e25793 update api GME 2019-04-10 22:22:06 +0200
  • ca3fbda8da Merge branch 'features1.4/clean' into develop-1.4 GME 2019-04-09 18:48:56 +0200
  • 0591dda379 Clean code GME 2019-04-09 18:48:52 +0200
  • debdbb52ce Merge branch 'features1.4/session' into develop-1.4 GME 2019-04-08 21:17:40 +0200
  • 2038c66f06 Update session GME 2019-04-08 21:17:35 +0200
  • 16dd8584db Merge branch 'features1.4/user' into develop-1.4 GME 2019-04-08 21:07:14 +0200
  • 9167b135f5 Update user api GME 2019-04-08 21:07:02 +0200
  • 1302a5a3dc Merge branch 'features1.4/transaction' into develop-1.4 GME 2019-04-08 20:56:38 +0200
  • 959db7b991 Update transactions GME 2019-04-08 20:56:32 +0200
  • 996c880055 Merge branch 'features1.4/testing' into develop-1.4 GME 2019-04-08 19:06:17 +0200
  • b328940037 testing front api GME 2019-04-08 19:06:13 +0200
  • ef506d8be4 Merge branch 'features1.4/testing' into develop-1.4 GME 2019-04-07 19:10:14 +0200
  • 14d111508e Testing OK GME 2019-04-07 19:10:09 +0200
  • 2c6ea23968 Merge branch 'features1.4/testing' into develop-1.4 GME 2019-04-05 19:45:03 +0200
  • fe7ebfdea3 testing, update and security GME 2019-04-05 19:44:43 +0200
  • 4972d615e2 Merge branch 'features1.4/testing' into develop-1.4 GME 2019-04-03 21:42:14 +0200
  • 1e479ff973 End test and fix GME 2019-04-03 21:42:09 +0200
  • decdb64136 Merge branch 'features1.4/testing' into develop-1.4 GME 2019-04-03 19:53:15 +0200
  • 86f6abfce5 Test & clean GME 2019-04-03 19:53:12 +0200
  • 48c0b2a340 Merge branch 'features1.4/testing' into develop-1.4 GME 2019-04-03 17:32:54 +0200
  • ef9863a8be test, fix and improve code GME 2019-04-03 17:32:49 +0200
  • 5df9626bc7 Merge branch 'features1.4/session' into develop-1.4 GME 2019-04-03 15:14:46 +0200
  • 3262d72ec0 setup session GME 2019-04-03 15:14:41 +0200
  • 99a29d8a49 Merge branch 'features1.4/transaction' into develop-1.4 GME 2019-04-03 14:39:43 +0200
  • e9ce67a6a6 Update transaction API GME 2019-04-03 14:39:39 +0200
  • 1378158e35 Merge branch 'features1.4/transaction' into develop-1.4 GME 2019-04-02 20:25:09 +0200
  • 5be8d03dd3 Setup transaction api base GME 2019-04-02 20:25:03 +0200
  • 16c97a6608 Merge branch 'features1.4/wallet' into develop-1.4 GME 2019-04-02 19:20:05 +0200
  • 9f20f92c02 Update wallet implementation & resource API GME 2019-04-02 19:20:01 +0200
  • 722ebe704e Merge branch 'features1.4/wallet' into develop-1.4 GME 2019-03-31 20:51:04 +0200
  • 892afd8efb Create Wallet Rest-Api GME 2019-03-31 20:50:59 +0200
  • 4ea0fdd202 Merge branch 'features1.4/user' into develop-1.4 GME 2019-03-31 18:35:35 +0200
  • cb38f1a6d2 Rest-Api User GME 2019-03-31 18:35:30 +0200
  • be076b7fab Merge branch 'features1.4/user' into develop-1.4 GME 2019-03-31 14:08:21 +0200
  • a268a44b6a Temp update GME 2019-03-31 14:08:17 +0200
  • a03db07d32 Merge branch 'features1.4/database' into develop-1.4 GME 2019-03-31 13:13:35 +0200
  • 43153d954d clean transaction GME 2019-03-31 13:13:28 +0200
  • 35619f176f Merge branch 'features1.4/rest' into develop-1.4 GME 2019-03-31 13:07:41 +0200
  • e55e7e0015 update replica database (back) GME 2019-03-31 13:07:35 +0200
  • 3893526f3d Merge branch 'features1.4/database' into develop-1.4 GME 2019-03-31 12:22:03 +0200
  • 9a09bc2b4c Add Wallet Database GME 2019-03-31 12:21:58 +0200
  • 51d44c85ca Merge branch 'features1.4/rest' into develop-1.4 GME 2019-03-31 11:40:27 +0200
  • 30c806ec0c Update User Rest Api GME 2019-03-31 11:40:21 +0200
  • 603c6b1ffc Merge branch 'features1.4/wallet' into develop-1.4 GME 2019-03-30 19:58:47 +0100
  • ecd98a7171 TODO GME 2019-03-30 19:58:41 +0100
  • 81bceffcfd Merge branch 'features1.4/wallet' into develop-1.4 GME 2019-03-30 14:57:42 +0100
  • 26ed8856f2 Update GME 2019-03-30 14:57:36 +0100
  • 7ccee4168f Merge branch 'features1.4/wallet' into develop-1.4 GME 2019-03-30 12:05:51 +0100
  • a8bf518845 Update Wrappers and Test class GME 2019-03-30 12:05:43 +0100
  • 78686fb060 Merge branch 'features1.4/wallet' into develop-1.4 GME 2019-03-27 23:14:02 +0100
  • ee686187e7 End Test Function GME 2019-03-27 23:13:57 +0100
  • 41039ddffc Merge branch 'features1.4/wallet' into develop-1.4 GME 2019-03-27 22:01:38 +0100
  • 843c6a034e update test GME 2019-03-27 22:01:15 +0100
  • d877c3b39f Merge branch 'features1.4/user' into develop-1.4 GME 2019-03-27 20:13:44 +0100
  • 6896e5ee2b test GME 2019-03-27 20:13:22 +0100
  • 982386ef7e remove workspace xml idea GME 2019-03-27 20:00:20 +0100
  • dcca3eaf1e success test GME 2019-03-27 19:57:18 +0100
  • b07b6a530f New Transaction Method Test GME 2019-03-26 22:45:12 +0100
  • f7dfc4eea2 update pom GME 2019-03-26 21:12:10 +0100
  • a2fc218e1d develop test develop GME 2019-03-26 21:07:52 +0100
  • 2fbfb9e218 up GME 2019-03-15 16:55:04 +0100
  • 457c245fe5 Auto stash before merge of "develop" and "origin/develop" GME 2019-03-14 22:30:20 +0100