|
|
6d44863a49
|
Philip/default token integration
|
2021-05-01 14:14:20 +00:00 |
|
Louis Holbrook
|
b02cdee1bd
|
Merge branch 'lash/cic-cache-tags' into 'master'
cic-cache: Add tx tags in persistent storage
Closes cic-cache#14
See merge request grassrootseconomics/cic-internal-integration!130
|
2021-05-01 13:20:14 +00:00 |
|
Louis Holbrook
|
75bf8f15be
|
cic-cache: Add tx tags in persistent storage
|
2021-05-01 13:20:14 +00:00 |
|
|
|
8db76dc0a8
|
Merge branch 'fix-cic-meta-migrations' into 'master'
fixed cic meta migration and removed pg schema stuff during init
See merge request grassrootseconomics/cic-internal-integration!127
|
2021-04-30 08:33:34 +00:00 |
|
|
|
a3261f2f0e
|
fixed cic meta migration and removed pg schema stuff during init
|
2021-04-30 08:33:33 +00:00 |
|
|
|
850dd15451
|
Merge branch 'philip/separate-telco-cicada-http-apis' into 'master'
Philip/separate telco cicada http apis
See merge request grassrootseconomics/cic-internal-integration!124
|
2021-04-30 08:15:03 +00:00 |
|
|
|
0c56e84704
|
Philip/separate telco cicada http apis
|
2021-04-30 08:15:03 +00:00 |
|
|
|
63cd8a4aab
|
Merge branch 'lash/contracts-kill' into 'master'
Remove cic-contracts references
See merge request grassrootseconomics/cic-internal-integration!126
|
2021-04-30 06:25:49 +00:00 |
|
Louis Holbrook
|
2c326f62ae
|
Remove cic-contracts references
|
2021-04-30 06:25:49 +00:00 |
|
|
|
9ed62c58ae
|
Merge branch 'lash/right-token' into 'master'
Correct default token env vars in deployment step 2
See merge request grassrootseconomics/cic-internal-integration!125
|
2021-04-28 17:31:49 +00:00 |
|
nolash
|
04e9f45feb
|
Correct default token env vars in deployment step 2
|
2021-04-28 19:24:33 +02:00 |
|
Spencer Ofwiti
|
9126a75c4a
|
Merge branch 'spencer/refactor-meta-library' into 'master'
Remove library files into crdt-meta.
See merge request grassrootseconomics/cic-internal-integration!98
|
2021-04-28 09:11:39 +00:00 |
|
Spencer Ofwiti
|
1bc29588a1
|
Remove library files into crdt-meta.
|
2021-04-28 09:11:39 +00:00 |
|
|
|
e6d57d3bbb
|
Merge branch 'fix-contract-migration-build' into 'master'
switch to deb solc package
See merge request grassrootseconomics/cic-internal-integration!123
|
2021-04-28 04:07:29 +00:00 |
|
|
|
f64ff1290c
|
switch to deb solc package
|
2021-04-27 21:01:58 -07:00 |
|
Louis Holbrook
|
d5cbe9d113
|
Merge branch 'lash/rehabilitate-tests' into 'master'
cic-eth: Make failing tests pass again
See merge request grassrootseconomics/cic-internal-integration!117
|
2021-04-25 14:54:54 +00:00 |
|
Louis Holbrook
|
5663741ed4
|
cic-eth: Make failing tests pass again
|
2021-04-25 14:54:54 +00:00 |
|
Louis Holbrook
|
0f6615a925
|
Merge branch 'lash/get-registry-api' into 'master'
Use task pool rpc for registry and eth queries with cic-eth view cli util
See merge request grassrootseconomics/cic-internal-integration!116
|
2021-04-25 12:24:17 +00:00 |
|
Louis Holbrook
|
aa15353d68
|
Use task pool rpc for registry and eth queries with cic-eth view cli util
|
2021-04-25 12:24:17 +00:00 |
|
Louis Holbrook
|
f7a69830ba
|
Merge branch 'lash/version-conflict' into 'master'
Fix cic-ussd cic-eth conflict
See merge request grassrootseconomics/cic-internal-integration!118
|
2021-04-25 12:14:55 +00:00 |
|
Louis Holbrook
|
7428420cda
|
Fix cic-ussd cic-eth conflict
|
2021-04-25 12:14:55 +00:00 |
|
Louis Holbrook
|
7504a899a1
|
Merge branch 'lash/fix-chainlib-upgrade' into 'master'
Upgrade chainlib
See merge request grassrootseconomics/cic-internal-integration!119
|
2021-04-25 12:08:40 +00:00 |
|
Louis Holbrook
|
c20c5af27c
|
Upgrade chainlib
|
2021-04-25 12:08:40 +00:00 |
|
Louis Holbrook
|
32b72274f5
|
Merge branch 'lash/emergency-shutdown-II' into 'master'
Add remaining health checks and shutdown on critical errors
See merge request grassrootseconomics/cic-internal-integration!115
|
2021-04-24 17:53:45 +00:00 |
|
Louis Holbrook
|
f50da54274
|
Add remaining health checks and shutdown on critical errors
|
2021-04-24 17:53:45 +00:00 |
|
Louis Holbrook
|
dd94b8a190
|
Merge branch 'lash/default-token' into 'master'
cic-eth: Add default token setting to cic-eth with api
See merge request grassrootseconomics/cic-internal-integration!113
|
2021-04-24 17:49:21 +00:00 |
|
Louis Holbrook
|
16dd210965
|
cic-eth: Add default token setting to cic-eth with api
|
2021-04-24 17:49:21 +00:00 |
|
Louis Holbrook
|
cd0e702e3a
|
Merge branch 'lash/custom-meta' into 'master'
Add custom meta tags
See merge request grassrootseconomics/cic-internal-integration!114
|
2021-04-24 06:14:25 +00:00 |
|
Louis Holbrook
|
cfab16f4a9
|
Add custom meta tags
|
2021-04-24 06:14:24 +00:00 |
|
Louis Holbrook
|
60fdb06034
|
Merge branch 'lash/emergency-shutdown' into 'master'
cic-eth: Add sanity checks for emergency shutdown / liveness tests
See merge request grassrootseconomics/cic-internal-integration!110
|
2021-04-23 21:02:52 +00:00 |
|
Louis Holbrook
|
3129a78e06
|
cic-eth: Add sanity checks for emergency shutdown / liveness tests
|
2021-04-23 21:02:51 +00:00 |
|
Louis Holbrook
|
6b6ec8659b
|
Merge branch 'lash/simpler-token-selector' into 'master'
Simplify token selector
See merge request grassrootseconomics/cic-internal-integration!112
|
2021-04-23 08:17:59 +00:00 |
|
nolash
|
96e755b54d
|
Simplify token selector
|
2021-04-22 11:58:39 +02:00 |
|
nolash
|
f38458ff4c
|
Merge branch 'master' of gitlab.com:grassrootseconomics/cic-internal-integration
|
2021-04-22 11:57:15 +02:00 |
|
Louis Holbrook
|
660d524401
|
Merge branch 'lash/health-util' into 'master'
K8s health utilities for cic containers
See merge request grassrootseconomics/cic-internal-integration!108
|
2021-04-21 17:34:13 +00:00 |
|
Louis Holbrook
|
1bc7cde1f0
|
K8s health utilities for cic containers
|
2021-04-21 17:34:13 +00:00 |
|
Louis Holbrook
|
9c22ffca38
|
Merge branch 'lash/ussd-final-steps' into 'master'
USSD final steps
See merge request grassrootseconomics/cic-internal-integration!111
|
2021-04-21 17:25:57 +00:00 |
|
Louis Holbrook
|
39fe4a14ec
|
USSD final steps
|
2021-04-21 17:25:57 +00:00 |
|
nolash
|
65250196cc
|
cic-eth versionbump
|
2021-04-21 19:03:14 +02:00 |
|
Louis Holbrook
|
0123ce13ea
|
Merge branch 'lash/settable-gas-price' into 'master'
Adapt deployment to Bloxberg
See merge request grassrootseconomics/cic-internal-integration!99
|
2021-04-21 05:46:42 +00:00 |
|
Louis Holbrook
|
03b3e8cd3f
|
Adapt deployment to Bloxberg
|
2021-04-21 05:46:42 +00:00 |
|
Louis Holbrook
|
3ee84f780e
|
Merge branch 'lash/cic-cache-syncer-backend-mixup' into 'master'
CIC-cache backend syncer mixup
See merge request grassrootseconomics/cic-internal-integration!106
|
2021-04-20 13:25:03 +00:00 |
|
Louis Holbrook
|
95269f69ed
|
CIC-cache backend syncer mixup
|
2021-04-20 13:25:02 +00:00 |
|
|
|
621780e9b6
|
Update .cic-template.yml
|
2021-04-19 17:56:19 +00:00 |
|
|
|
eecdca1a55
|
Merge branch 'philip/ussd-db-fixes' into 'master'
Philip/ussd db fixes
See merge request grassrootseconomics/cic-internal-integration!107
|
2021-04-19 08:44:41 +00:00 |
|
|
|
6fef0ecec9
|
Philip/ussd db fixes
|
2021-04-19 08:44:40 +00:00 |
|
Louis Holbrook
|
6b89a2da89
|
Merge branch 'lash/chainlib-regression' into 'master'
Correct chainlib import paths
See merge request grassrootseconomics/cic-internal-integration!101
|
2021-04-16 21:44:14 +00:00 |
|
Louis Holbrook
|
254f2a266b
|
Correct chainlib import paths
|
2021-04-16 21:44:14 +00:00 |
|
|
|
ba18914498
|
Merge branch 'philip/fix-filter-callbacks' into 'master'
Philip/fix filter callbacks
See merge request grassrootseconomics/cic-internal-integration!95
|
2021-04-16 20:24:07 +00:00 |
|
|
|
f410e8b7e3
|
Philip/fix filter callbacks
|
2021-04-16 20:24:07 +00:00 |
|
