|
|
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 |
|
|
|
17333af88f
|
Merge branch 'bvander/docker-vm-builds' into 'master'
docker vm builds
See merge request grassrootseconomics/cic-internal-integration!259
|
2021-08-28 16:26:16 +00:00 |
|
|
|
6a68d2ed32
|
docker vm builds
|
2021-08-28 16:26:16 +00:00 |
|
Louis Holbrook
|
ef77f4c99a
|
Merge branch 'lash/normalize-backend-tx' into 'master'
Normalize tx data for backend
Closes cic-eth#133
See merge request grassrootseconomics/cic-internal-integration!258
|
2021-08-28 11:10:18 +00:00 |
|
Louis Holbrook
|
56dbe8a502
|
Normalize tx data for backend
|
2021-08-28 11:10:18 +00:00 |
|
Louis Holbrook
|
2dc8ac6a12
|
Merge branch 'lash/upgrade-outer-tools' into 'master'
Upgrade outer tools
See merge request grassrootseconomics/cic-internal-integration!257
|
2021-08-27 13:13:00 +00:00 |
|
Louis Holbrook
|
0ced68e224
|
Upgrade outer tools
|
2021-08-27 13:13:00 +00:00 |
|
|
|
2afb20e715
|
Merge branch 'philip/ussd-post-test-bug-fixes' into 'master'
USSD post-test bug fixes
See merge request grassrootseconomics/cic-internal-integration!244
|
2021-08-25 10:33:35 +00:00 |
|
|
|
3b0113d0e4
|
USSD post-test bug fixes
|
2021-08-25 10:33:35 +00:00 |
|
Louis Holbrook
|
ebf4743a84
|
Merge branch 'lash/traffic-script-rehab' into 'master'
Implement chainlib cli for traffic script
See merge request grassrootseconomics/cic-internal-integration!255
|
2021-08-25 09:33:23 +00:00 |
|
Louis Holbrook
|
3bf92e7a8a
|
Implement chainlib cli for traffic script
|
2021-08-25 09:33:23 +00:00 |
|
|
|
f0b4c42c68
|
cleanup contract migration dockerfiles
|
2021-08-24 15:33:18 -07:00 |
|
Louis Holbrook
|
b62d00180c
|
Merge branch 'lash/cic-eth-seeding-fix' into 'master'
cic-eth data seeding rehab
See merge request grassrootseconomics/cic-internal-integration!254
|
2021-08-24 21:07:36 +00:00 |
|
Louis Holbrook
|
a49978cc36
|
cic-eth data seeding rehab
|
2021-08-24 21:07:36 +00:00 |
|
|
|
1b0ee269d0
|
add pre tag to contract-migration
|
2021-08-24 11:43:39 -07:00 |
|
|
|
aa2f363b27
|
fix em
|
2021-08-24 10:42:30 -07:00 |
|
|
|
2a24ce6938
|
remove mount
|
2021-08-24 10:33:53 -07:00 |
|
|
|
938a10b5c3
|
contract-migration ci parity
|
2021-08-24 10:26:09 -07:00 |
|
Louis Holbrook
|
76e33e578b
|
Merge branch 'lash/verify-details' into 'master'
Add target count to verify
Closes #103
See merge request grassrootseconomics/cic-internal-integration!246
|
2021-08-24 15:56:41 +00:00 |
|
Louis Holbrook
|
2ec4262734
|
Add target count to verify
|
2021-08-24 15:56:41 +00:00 |
|
Louis Holbrook
|
7684fe3883
|
Merge branch 'lash/cic-eth-upgrade-more' into 'master'
Upgrade cic-ussd deps
See merge request grassrootseconomics/cic-internal-integration!247
|
2021-08-24 15:25:11 +00:00 |
|
Louis Holbrook
|
995a148c6a
|
Upgrade cic-ussd deps
|
2021-08-24 15:25:11 +00:00 |
|
Louis Holbrook
|
511e099689
|
Merge branch 'lash/signer-update' into 'master'
Update signer
See merge request grassrootseconomics/cic-internal-integration!253
|
2021-08-24 11:35:52 +00:00 |
|
Louis Holbrook
|
f877218c55
|
Update signer
|
2021-08-24 11:35:52 +00:00 |
|
|
|
8ac9a1e99a
|
reverting to fffb2bc3f4
|
2021-08-21 13:23:43 -04:00 |
|
|
|
c4cb095a29
|
Merge branch 'bvander/fix-cic-staff-client-docker' into 'master'
fix issues with build cicada, now it should do auto reload
See merge request grassrootseconomics/cic-internal-integration!250
|
2021-08-19 20:15:22 +00:00 |
|
|
|
05b8bbbbca
|
fix issues with build cicada, now it should do auto reload
|
2021-08-19 20:15:22 +00:00 |
|
|
|
1ce32fbbe0
|
Merge branch 'fix-meta-docker-compose' into 'master'
fix a bug in the meta tag
See merge request grassrootseconomics/cic-internal-integration!249
|
2021-08-19 16:48:43 +00:00 |
|
|
|
3fd5e77e2c
|
fix a bug in the meta tag
|
2021-08-19 12:46:32 -04:00 |
|
|
|
e27a49ef33
|
add docker swarm deployment configs and remove dependency on kaniko for ci builds
|
2021-08-19 12:29:41 -04:00 |
|
Louis Holbrook
|
fffb2bc3f4
|
Merge branch 'lash/faucet-workaround' into 'master'
Empty config dir in faucet setup
See merge request grassrootseconomics/cic-internal-integration!240
|
2021-08-18 06:34:08 +00:00 |
|
Louis Holbrook
|
8910fb0759
|
Empty config dir in faucet setup
|
2021-08-18 06:34:07 +00:00 |
|
Louis Holbrook
|
c84239c820
|
Merge branch 'lash/fix-configs' into 'master'
Fix configs after cic-base remove merges
See merge request grassrootseconomics/cic-internal-integration!245
|
2021-08-17 16:52:17 +00:00 |
|
Louis Holbrook
|
452047b900
|
Fix configs after cic-base remove merges
|
2021-08-17 16:52:17 +00:00 |
|
Louis Holbrook
|
b8be457c41
|
Merge branch 'lash/advanced-cache-queries' into 'master'
Finish cic-cache integration for transaction listings
Closes cic-eth#134 and #95
See merge request grassrootseconomics/cic-internal-integration!235
|
2021-08-17 08:03:14 +00:00 |
|
Louis Holbrook
|
0ec9813e5f
|
Finish cic-cache integration for transaction listings
|
2021-08-17 08:03:14 +00:00 |
|
Louis Holbrook
|
defa7797dc
|
Merge branch 'lash/remove-cic-base' into 'master'
Replace cic-base with chainlib cli utils
Closes #94
See merge request grassrootseconomics/cic-internal-integration!233
|
2021-08-17 06:46:51 +00:00 |
|
Louis Holbrook
|
bb3d38a1f9
|
Replace cic-base with chainlib cli utils
|
2021-08-17 06:46:51 +00:00 |
|
|
|
3be1c1b33d
|
Merge branch 'spencer/meta-404' into 'master'
Meta returns 404 if resource is not found.
Closes #72
See merge request grassrootseconomics/cic-internal-integration!232
|
2021-08-09 19:13:05 +00:00 |
|
Spencer Ofwiti
|
d6c763f2d7
|
Meta returns 404 if resource is not found.
|
2021-08-09 19:13:05 +00:00 |
|
|
|
b7942ddcfa
|
Merge branch 'philip/add-docker-compose-default' into 'master'
Adds password pepper value defaults.
See merge request grassrootseconomics/cic-internal-integration!242
|
2021-08-06 16:58:37 +00:00 |
|
|
|
8de5dc1540
|
Adds password pepper value defaults.
|
2021-08-06 19:53:36 +03:00 |
|
|
|
fad0a4b580
|
Merge branch 'philip/the-great-bump' into 'master'
The great bump
See merge request grassrootseconomics/cic-internal-integration!239
|
2021-08-06 16:29:01 +00:00 |
|
|
|
0672a17d2e
|
The great bump
|
2021-08-06 16:29:01 +00:00 |
|
|
|
f764b73f66
|
Testing a whitespace change for deployment
|
2021-07-30 17:05:25 +00:00 |
|
|
|
806b82504f
|
Merge branch 'bvander/fix-notify-migrations' into 'master'
Bvander/fix notify migrations
See merge request grassrootseconomics/cic-internal-integration!238
|
2021-07-29 18:29:17 +00:00 |
|
|
|
ac76e14129
|
Bvander/fix notify migrations
|
2021-07-29 18:29:17 +00:00 |
|
|
|
1c78f4d6d6
|
Merge branch 'bvander/fix-notify-migrations' into 'master'
migrations fix
See merge request grassrootseconomics/cic-internal-integration!237
|
2021-07-28 23:33:34 +00:00 |
|
|
|
0d6e228f8a
|
migrations fix
|
2021-07-28 23:33:34 +00:00 |
|
