nolash
|
91b964eefc
|
Merge remote-tracking branch 'origin/master' into cic-eth-unittest
|
2021-05-21 18:58:11 +02:00 |
|
|
|
aae0077d66
|
Update ci_templates/.cic-template.yml
|
2021-05-21 16:55:55 +00:00 |
|
nolash
|
c10783aebf
|
Merge branch 'cic-eth-unittest' of gitlab.com:grassrootseconomics/cic-internal-integration into cic-eth-unittest
|
2021-05-21 18:55:04 +02:00 |
|
nolash
|
7d1837eafa
|
Fill in missing provisions
|
2021-05-21 18:54:25 +02:00 |
|
|
|
cd7c2baa90
|
Update ci_templates/.cic-template.yml
|
2021-05-21 16:48:05 +00:00 |
|
|
|
78d632e2c7
|
Update ci_templates/.cic-template.yml
|
2021-05-21 16:43:53 +00:00 |
|
Geoff Turk
|
d971a6eded
|
Merge branch 'fix-meta-data-seeding' into 'master'
Fix path to PGP exports directory
See merge request grassrootseconomics/cic-internal-integration!165
|
2021-05-21 16:42:21 +00:00 |
|
|
|
8355347323
|
Update ci_templates/.cic-template.yml, apps/cic-eth/.gitlab-ci.yml files
|
2021-05-21 16:39:28 +00:00 |
|
|
|
dad40c993c
|
Update ci_templates/.cic-template.yml
|
2021-05-21 16:31:47 +00:00 |
|
|
|
e4437ffcf3
|
Update ci_templates/.cic-template.yml
|
2021-05-21 16:21:03 +00:00 |
|
|
|
9a44107c24
|
Update ci_templates/.cic-template.yml
|
2021-05-21 16:16:57 +00:00 |
|
|
|
e708b7e407
|
Update ci_templates/.cic-template.yml, apps/cic-eth/.gitlab-ci.yml files
|
2021-05-21 16:08:09 +00:00 |
|
|
|
0e0276b550
|
Update apps/cic-eth/.gitlab-ci.yml
|
2021-05-21 15:06:38 +00:00 |
|
Spencer Ofwiti
|
b0a6df0177
|
Merge branch 'spencer/metadata-identifiers' into 'master'
Add meta update cli tool.
See merge request grassrootseconomics/cic-internal-integration!138
|
2021-05-21 09:42:08 +00:00 |
|
Spencer Ofwiti
|
92c9df4e19
|
Add meta update cli tool.
|
2021-05-21 09:42:08 +00:00 |
|
Geoff Turk
|
9c49d568e0
|
Fix path to PGP exports directory
|
2021-05-21 10:51:32 +02:00 |
|
|
|
053d012f7b
|
update docker file and setup
|
2021-05-20 21:32:33 -07:00 |
|
Louis Holbrook
|
d7113f3923
|
Merge branch 'lash/rehabilitate-traffic-2' into 'master'
Rehabilitate traffic generator script
See merge request grassrootseconomics/cic-internal-integration!145
|
2021-05-20 21:25:15 +00:00 |
|
Louis Holbrook
|
c569fe4b17
|
Rehabilitate traffic generator script
|
2021-05-20 21:25:14 +00:00 |
|
|
|
221be7f803
|
update test dep and docker installs
|
2021-05-20 08:51:57 -07:00 |
|
|
|
c2dd30628d
|
Update apps/cic-eth/.gitlab-ci.yml
|
2021-05-20 15:50:19 +00:00 |
|
|
|
158036f38f
|
Update apps/cic-eth/.gitlab-ci.yml
|
2021-05-20 15:05:47 +00:00 |
|
|
|
9ff26e6eb0
|
Update apps/cic-eth/.gitlab-ci.yml
|
2021-05-20 14:59:19 +00:00 |
|
|
|
1c650df27d
|
Merge branch 'bvander/move-scripts-to-e2e-folder' into 'master'
move files out of scripts folder to their own dir
See merge request grassrootseconomics/cic-internal-integration!137
|
2021-05-20 14:31:08 +00:00 |
|
|
|
a31b7bc9cd
|
move files out of scripts folder to their own dir
|
2021-05-20 14:31:08 +00:00 |
|
Geoff Turk
|
78ff58c1a2
|
Merge branch 'geoff/data-success' into 'master'
Add success field to transactions_all_data
See merge request grassrootseconomics/cic-internal-integration!163
|
2021-05-20 10:28:07 +00:00 |
|
|
|
1676addbeb
|
Merge branch 'philip/meta-cluster-bug' into 'master'
Refactors to handle error in metadata handling
Closes cic-ussd#45
See merge request grassrootseconomics/cic-internal-integration!160
|
2021-05-19 16:25:10 +00:00 |
|
|
|
1efc25ac15
|
Refactors to handle error in metadata handling
|
2021-05-19 16:25:10 +00:00 |
|
Louis Holbrook
|
db2ec0dcfa
|
Merge branch 'philip/notify-errors' into 'master'
Philip/notify errors
Closes cic-notify#4
See merge request grassrootseconomics/cic-internal-integration!161
|
2021-05-19 16:13:06 +00:00 |
|
|
|
5148e6428b
|
Philip/notify errors
|
2021-05-19 16:13:06 +00:00 |
|
Louis Holbrook
|
0c186ed968
|
Merge branch 'lash/rehabilitate-tests-eth' into 'master'
Fix outdated module names in cic-eth tests
See merge request grassrootseconomics/cic-internal-integration!162
|
2021-05-19 15:11:08 +00:00 |
|
Louis Holbrook
|
c44439bd90
|
Fix outdated module names in cic-eth tests
|
2021-05-19 15:11:08 +00:00 |
|
Geoff Turk
|
0411603078
|
Add success field to transactions_all_data
|
2021-05-19 16:47:22 +02:00 |
|
|
|
eee895ea71
|
Merge branch 'willruddick-master-patch-91858' into 'master'
small updates. note other gender
See merge request grassrootseconomics/cic-internal-integration!154
|
2021-05-19 10:26:52 +00:00 |
|
Louis Holbrook
|
a5ca898532
|
Merge branch 'lash/update-contracts-in-migration-2' into 'master'
imports: Fix stale dep in sovereign import users script
See merge request grassrootseconomics/cic-internal-integration!149
|
2021-05-19 09:57:03 +00:00 |
|
Louis Holbrook
|
6d8508aebf
|
imports: Fix stale dep in sovereign import users script
|
2021-05-19 09:57:02 +00:00 |
|
Louis Holbrook
|
f8f66984d2
|
Merge branch 'lash/no-ussd-contamination' into 'master'
Isolate ussd-related data files in imports
See merge request grassrootseconomics/cic-internal-integration!150
|
2021-05-19 09:55:24 +00:00 |
|
Louis Holbrook
|
0f02dd1b7c
|
Isolate ussd-related data files in imports
|
2021-05-19 09:55:24 +00:00 |
|
|
|
63a4a82ab0
|
Merge branch 'philip/replicate-wills-changes' into 'master'
Replicates changes in broken MR by will.
See merge request grassrootseconomics/cic-internal-integration!158
|
2021-05-19 08:25:19 +00:00 |
|
|
|
949c1070a9
|
Replicates changes in broken MR by will.
|
2021-05-19 11:19:29 +03:00 |
|
|
|
5d9fbe9b64
|
Merge branch 'willruddick-master-patch-28332' into 'master'
shortened and changed service code
See merge request grassrootseconomics/cic-internal-integration!152
|
2021-05-19 07:47:09 +00:00 |
|
|
|
873a3f082a
|
shortened and changed service code
|
2021-05-19 07:47:09 +00:00 |
|
|
|
7b408cf564
|
Merge branch 'willruddick-master-patch-28450' into 'master'
small changes, note the 'other' gender
See merge request grassrootseconomics/cic-internal-integration!151
|
2021-05-19 07:33:37 +00:00 |
|
Louis Holbrook
|
9dfbd7034c
|
Merge branch 'lash/decimals-in-api' into 'master'
cic-eth-tasker: Add decimals and token name to default token api call return struct
Closes cic-eth#123
See merge request grassrootseconomics/cic-internal-integration!148
|
2021-05-19 06:59:43 +00:00 |
|
Louis Holbrook
|
235f5cede8
|
cic-eth-tasker: Add decimals and token name to default token api call return struct
|
2021-05-19 06:59:42 +00:00 |
|
Geoff Turk
|
0a59539f9a
|
Merge branch 'lash/cache-data-api' into 'master'
cic-cache: Add data API
Closes cic-cache#11
See merge request grassrootseconomics/cic-internal-integration!157
|
2021-05-18 17:13:57 +00:00 |
|
Louis Holbrook
|
60b36945df
|
cic-cache: Add data API
|
2021-05-18 17:13:57 +00:00 |
|
|
|
dae6526677
|
Merge branch 'philip/remove-notify-config-defaults' into 'master'
Refactors at configs.
See merge request grassrootseconomics/cic-internal-integration!156
|
2021-05-17 16:47:30 +00:00 |
|
|
|
1e94a516c2
|
Refactors at configs.
|
2021-05-17 19:41:07 +03:00 |
|
|
|
e8512ebbae
|
small updates. note other gender
|
2021-05-17 11:27:45 +00:00 |
|
