Louis Holbrook
|
6b59c87f68
|
Merge branch 'lash/okota' into 'master'
feat: Integrate okota
See merge request grassrootseconomics/cic-internal-integration!286
|
2021-10-07 21:05:58 +00:00 |
|
Louis Holbrook
|
9ee42b908d
|
feat: Integrate okota
|
2021-10-07 21:05:58 +00:00 |
 Philip Wafula
|
3343c4163e
|
Merge branch 'lash/more-case-case' into 'master'
bug: cic-eth transaction listings
See merge request grassrootseconomics/cic-internal-integration!285
|
2021-10-07 15:12:35 +00:00 |
|
Louis Holbrook
|
f5bfc8ace2
|
bug: cic-eth transaction listings
|
2021-10-07 15:12:35 +00:00 |
 Blair Vanderlugt
|
8a9d2ee0be
|
Merge branch 'bvander/default-docker-compose' into 'master'
chore: gift defaults
See merge request grassrootseconomics/cic-internal-integration!282
|
2021-09-27 13:15:21 +00:00 |
|
Blair Vanderlugt
|
3608fd1fc7
|
chore: gift defaults
|
2021-09-27 16:14:31 +03:00 |
|
Blair Vanderlugt
|
0d275f358b
|
Merge branch 'philip/removes-docker-compose-profiles' into 'master'
removes profile attrs from docker-compose file.
See merge request grassrootseconomics/cic-internal-integration!281
|
2021-09-27 12:33:19 +00:00 |
|
PhilipWafula
|
3aef2aa65f
|
removes profile attrs from docker-compose file.
|
2021-09-27 15:26:22 +03:00 |
|
Philip Wafula
|
5644baefb2
|
Merge branch 'philip/bump-cic-ussd-version' into 'master'
Bumps cic-ussd version following token fix.
See merge request grassrootseconomics/cic-internal-integration!280
|
2021-09-27 11:37:42 +00:00 |
|
PhilipWafula
|
1a7c4deab6
|
Bumps cic-ussd version following token fix.
|
2021-09-27 14:27:10 +03:00 |
|
Philip Wafula
|
0389d8623d
|
Merge branch 'philip/token-value-fix' into 'master'
Refactors to avoid conversion of zero values to wei.
See merge request grassrootseconomics/cic-internal-integration!279
|
2021-09-22 08:17:39 +00:00 |
|
PhilipWafula
|
cf64387d81
|
Refactors to avoid conversion of zero values to wei.
|
2021-09-22 11:10:33 +03:00 |
|
Philip Wafula
|
79bcc8a9f1
|
Merge branch 'dev-k8s-deploy-new-data-seeding' into 'master'
Dataseeding container
See merge request grassrootseconomics/cic-internal-integration!267
|
2021-09-21 06:04:44 +00:00 |
|
Philip Wafula
|
7b57f1b4c2
|
Dataseeding container
|
2021-09-21 06:04:44 +00:00 |
|
Philip Wafula
|
76b8519637
|
Merge branch 'philip/cache-migration' into 'master'
Fixes migrations in cic-cache (ideally)
See merge request grassrootseconomics/cic-internal-integration!276
|
2021-09-21 05:33:46 +00:00 |
|
Philip Wafula
|
e89aec76fa
|
Fixes migrations in cic-cache (ideally)
|
2021-09-21 05:33:46 +00:00 |
|
Blair Vanderlugt
|
a138a0ec75
|
Merge branch 'bvander/update-buildkit-cache' into 'master'
chore: clean old dockerfile and add docs for clearing cache
See merge request grassrootseconomics/cic-internal-integration!277
|
2021-09-20 07:01:53 +00:00 |
|
Blair Vanderlugt
|
5128c7828c
|
chore: clean old dockerfile and add docs for clearing cache
|
2021-09-20 09:59:12 +03:00 |
|
Philip Wafula
|
2f005195e5
|
Merge branch 'philip/ussd-cli-fix' into 'master'
Philip/ussd cli fix
See merge request grassrootseconomics/cic-internal-integration!275
|
2021-09-18 09:07:05 +00:00 |
|
Philip Wafula
|
fb8db3ffd2
|
Philip/ussd cli fix
|
2021-09-18 09:07:05 +00:00 |
|
Philip Wafula
|
b5f647c4aa
|
Merge branch 'philip/ussd-demurrage' into 'master'
Philip/ussd demurrage
See merge request grassrootseconomics/cic-internal-integration!263
|
2021-09-17 11:15:43 +00:00 |
|
Philip Wafula
|
6019143ba1
|
Philip/ussd demurrage
|
2021-09-17 11:15:43 +00:00 |
|
Philip Wafula
|
610440b722
|
Merge branch 'lash/signer-missing-symbol' into 'master'
Update signer to fill in missing sign to wire symbol
See merge request grassrootseconomics/cic-internal-integration!273
|
2021-09-17 06:54:58 +00:00 |
|
Louis Holbrook
|
d65455fc29
|
Update signer to fill in missing sign to wire symbol
|
2021-09-17 06:54:58 +00:00 |
|
Blair Vanderlugt
|
43f8d1c30c
|
Merge branch 'bvander/docker-compose-restarts' into 'master'
chore: fix docker compose restarts
See merge request grassrootseconomics/cic-internal-integration!274
|
2021-09-16 11:17:42 +00:00 |
|
Blair Vanderlugt
|
b855211eed
|
chore: fix docker compose restarts
|
2021-09-16 13:06:53 +03:00 |
|
Blair Vanderlugt
|
1e0c475f39
|
Merge branch 'lash/contract-migration-dump' into 'master'
fix(contract-migration): Replace missing environment
See merge request grassrootseconomics/cic-internal-integration!271
|
2021-09-15 13:36:10 +00:00 |
|
Louis Holbrook
|
3e6cf594e3
|
fix(contract-migration): Replace missing environment
|
2021-09-15 13:36:09 +00:00 |
|
Blair Vanderlugt
|
b8f79a2dd1
|
Merge branch 'bvander/extend-timoeout-contract-migration' into 'master'
chore: extend timeout for contract migration
See merge request grassrootseconomics/cic-internal-integration!272
|
2021-09-15 11:08:14 +00:00 |
|
Blair Vanderlugt
|
540c2fd950
|
chore: extend timeout for contract migration
|
2021-09-15 14:04:18 +03:00 |
|
Blair Vanderlugt
|
b9b06eced8
|
Merge branch 'staging' into 'master'
feat: add multi-project build to trigger deploy-k8s-dev in the devops repo
See merge request grassrootseconomics/cic-internal-integration!268
|
2021-09-09 21:28:49 +00:00 |
|
Blair Vanderlugt
|
949bb29379
|
feat: add multi-project build to trigger deploy-k8s-dev in the devops repo
|
2021-09-09 21:28:49 +00:00 |
|
Louis Holbrook
|
0468906601
|
Merge branch 'lash/contract-migration-dump' into 'master'
fix(contract-migration): Make http signer work with local deployment
See merge request grassrootseconomics/cic-internal-integration!270
|
2021-09-09 13:38:10 +00:00 |
nolash
|
471243488e
|
Add latest crypto-dev-signer install explicitly in dockerfile for cic-eth
|
2021-09-09 14:27:47 +02:00 |
|
Blair Vanderlugt
|
3c4acd82ff
|
test eth and meta only mrs
|
2021-09-07 11:56:17 -07:00 |
|
Blair Vanderlugt
|
e07f992c5a
|
Add new file
|
2021-09-07 18:38:20 +00:00 |
|
Blair Vanderlugt
|
17e95cb19c
|
Merge branch 'bvander/signer-as-service' into 'master'
run signer as a service over http
See merge request grassrootseconomics/cic-internal-integration!265
|
2021-09-06 19:10:08 +00:00 |
|
Blair Vanderlugt
|
3c3a97ce15
|
run signer as a service over http
|
2021-09-06 12:07:57 -07:00 |
|
Philip Wafula
|
a492be4927
|
Merge branch 'lash/contract-migration-config' into 'master'
Sanitize contract migration configs
See merge request grassrootseconomics/cic-internal-integration!262
|
2021-09-06 10:06:58 +00:00 |
|
Louis Holbrook
|
1f555748b0
|
Sanitize contract migration configs
|
2021-09-06 10:06:58 +00:00 |
|
Blair Vanderlugt
|
8aa4d20eea
|
Update .gitlab-ci.yml
|
2021-09-01 20:00:44 +00:00 |
|
Louis Holbrook
|
90cf24dcee
|
Merge branch 'lash/lockfix' into 'master'
Rehabilitate imports
See merge request grassrootseconomics/cic-internal-integration!261
|
2021-09-01 16:54:10 +00:00 |
|
Louis Holbrook
|
75b711dbd5
|
Rehabilitate imports
|
2021-09-01 16:54:10 +00:00 |
|
Blair Vanderlugt
|
c21c1eb2ef
|
fix data seeding node installs
|
2021-08-31 11:43:01 -07:00 |
|
Blair Vanderlugt
|
eb5e612105
|
minor update to import_ussd script
|
2021-08-30 11:09:47 -07:00 |
|
Blair Vanderlugt
|
e017d11770
|
update readme
|
2021-08-30 10:14:22 -07:00 |
|
Philip Wafula
|
e327af68e1
|
Merge branch 'philip/refactor-import-scripts' into 'master'
Consolidated ussd dataseeding script
See merge request grassrootseconomics/cic-internal-integration!252
|
2021-08-29 09:55:47 +00:00 |
|
Philip Wafula
|
92cc6a3f27
|
Consolidated ussd dataseeding script
|
2021-08-29 09:55:47 +00:00 |
|
Philip Wafula
|
f42bf7754a
|
Merge branch 'lash/lockfix' into 'master'
Normalize initial INIT lock address
See merge request grassrootseconomics/cic-internal-integration!260
|
2021-08-29 09:07:46 +00:00 |
|
nolash
|
7342927e91
|
Normalize initial INIT lock address
|
2021-08-29 10:43:12 +02:00 |
