|
|
b8ad1ba49f
|
move files
|
2021-05-03 09:01:01 -07:00 |
|
|
|
5ec0b67496
|
Merge branch 'bvander/fix-user-pip-install' into 'master'
should have dropped the user flag
See merge request grassrootseconomics/cic-internal-integration!136
|
2021-05-02 19:38:57 +00:00 |
|
|
|
7d935bcbc3
|
should have dropped the user flag
|
2021-05-02 12:32:05 -07:00 |
|
|
|
fd69a3c6bb
|
Update .cic-template.yml
|
2021-05-02 17:31:34 +00:00 |
|
Louis Holbrook
|
298bcf89e5
|
Merge branch 'lash/chainlib-erc20-split' into 'master'
Update componens for chainlib erc20 split
See merge request grassrootseconomics/cic-internal-integration!135
|
2021-05-02 17:11:03 +00:00 |
|
Louis Holbrook
|
5d3d773f41
|
Update componens for chainlib erc20 split
|
2021-05-02 17:11:03 +00:00 |
|
Louis Holbrook
|
e71b2411d0
|
Merge branch 'lash/contract-interfaces' into 'master'
cic-eth: Update deps for contract standardization refactor
See merge request grassrootseconomics/cic-internal-integration!129
|
2021-05-02 17:02:45 +00:00 |
|
Louis Holbrook
|
b4bfb76634
|
cic-eth: Update deps for contract standardization refactor
|
2021-05-02 17:02:45 +00:00 |
|
|
|
aab5c8bf85
|
Merge branch 'contract-migration-include-data-scripts' into 'master'
puts the scripts in the container and take out the user
See merge request grassrootseconomics/cic-internal-integration!133
|
2021-05-02 16:56:08 +00:00 |
|
|
|
e1564574f7
|
puts the scripts in the container and take out the user
|
2021-05-02 16:56:08 +00:00 |
|
|
|
13253a2dcc
|
Update .cic-template.yml
|
2021-05-02 02:54:03 +00:00 |
|
|
|
9020fe1000
|
Update .cic-template.yml
|
2021-05-02 02:47:01 +00:00 |
|
|
|
a2e7d2973c
|
Merge branch 'fix-cic-meta-migration-onerror' into 'master'
meta exit error fixed
See merge request grassrootseconomics/cic-internal-integration!132
|
2021-05-01 19:52:30 +00:00 |
|
|
|
82f650e81d
|
meta exit error fixed
|
2021-05-01 12:52:03 -07:00 |
|
|
|
e77940d0de
|
Merge branch 'philip/metadata-salt' into 'master'
Update metadata pointer salt values
See merge request grassrootseconomics/cic-internal-integration!131
|
2021-05-01 14:52:54 +00:00 |
|
|
|
1df62717ef
|
Update metadata pointer salt values
|
2021-05-01 14:52:54 +00:00 |
|
|
|
c4919d56b1
|
Merge branch 'philip/default-token-integration' into 'master'
Philip/default token integration
See merge request grassrootseconomics/cic-internal-integration!128
|
2021-05-01 14:14:20 +00:00 |
|
|
|
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 |
|
