|
c0e0836a08
|
Merge remote-tracking branch 'origin/master' into bvander/deploy-to-k8s-dev
|
2021-08-24 09:48:56 -07:00 |
|
|
434805c914
|
progress
|
2021-08-24 09:48:38 -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 |
|
|
6f7000f234
|
run contract migration to completion
|
2021-08-23 14:23:34 -07:00 |
|
|
183bb1e50b
|
fix images and remove last script
|
2021-08-23 14:05:51 -07:00 |
|
|
8240a79b0e
|
fix paths
|
2021-08-23 13:52:41 -07:00 |
|
|
ea6ce88dab
|
try and launch some k8s
|
2021-08-23 13:46:17 -07:00 |
|
|
70ce759564
|
more debugging
|
2021-08-23 12:16:59 -07:00 |
|
|
bca5d4d09f
|
maybe just a typo
|
2021-08-23 11:58:16 -07:00 |
|
|
a3c0539114
|
added secrets can we read
|
2021-08-23 10:40:32 -07:00 |
|
|
a2fbdd8338
|
ci debug
|
2021-08-23 09:55:52 -07:00 |
|
|
3f850913ed
|
move the kaniko image to no be default
|
2021-08-23 09:54:05 -07:00 |
|
|
6e97c41b78
|
try adding a k8s job
|
2021-08-23 09:50:05 -07: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 |
|
|
7a3cb7ab75
|
Merge branch 'philip/notify-fixes' into 'master'
Philip/notify fixes
See merge request grassrootseconomics/cic-internal-integration!234
|
2021-07-23 15:15:30 +00:00 |
|
|
992c7b4022
|
Philip/notify fixes
|
2021-07-23 15:15:30 +00:00 |
|
|
f19173001e
|
Merge branch 'lash/chainlib-nextgen' into 'master'
Implement nextgen chainlib and chainqueue upgrade
See merge request grassrootseconomics/cic-internal-integration!231
|
2021-07-21 17:34:51 +00:00 |
|
Louis Holbrook
|
f82bb4515d
|
Implement nextgen chainlib and chainqueue upgrade
|
2021-07-21 17:34:51 +00:00 |
|
|
24e6db7d87
|
Merge branch 'philip/sms-cluster-issues' into 'master'
Censors sensitive config values.
See merge request grassrootseconomics/cic-internal-integration!209
|
2021-07-20 16:18:27 +00:00 |
|
|
ecdfb9bc5a
|
Censors sensitive config values.
|
2021-07-20 16:18:27 +00:00 |
|
|
30415ac997
|
Merge branch 'bvander/data-seeding-profiles' into 'master'
e2e ussd import user scripts
See merge request grassrootseconomics/cic-internal-integration!230
|
2021-07-19 21:30:05 +00:00 |
|