grassrootseconomics
/
cic-stack
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
662 Commits 1 Branch 31 Tags 7.7 MiB
Commit Graph

662 Commits

Author SHA1 Message Date
geoffturk 561ae62d5e Fix out of range error for geolocation in import users script 2021-07-13 09:42:53 +00:00
Louis Holbrook d6782abbcc Merge branch 'lash/default-token-context' into 'master' 
Add contextual token symbol and name defaults

Closes #85

See merge request grassrootseconomics/cic-internal-integration!219
 2021-07-12 19:50:48 +00:00
Louis Holbrook 8f173fa30b Add contextual token symbol and name defaults 2021-07-12 19:50:48 +00:00
Louis Holbrook 3741cb3283 Merge branch 'lash/account-registry-filter-match' into 'master' 
Only match account registry on correct contract address

Closes cic-eth#127

See merge request grassrootseconomics/cic-internal-integration!218
 2021-07-12 19:50:32 +00:00
Louis Holbrook 54dd5acb62 Only match account registry on correct contract address 2021-07-12 19:50:32 +00:00
Blair Vanderlugt c52885a016 update data-seeding dockerignore 2021-07-12 09:44:05 -07:00
Blair Vanderlugt f0dd257e05 Merge branch 'bvander/fix-onchange-test-triggers' into 'master' 
Fix onchange test triggers

See merge request grassrootseconomics/cic-internal-integration!223
 2021-07-12 16:22:17 +00:00
Blair Vanderlugt e8c870d230 Merge branch 'bvander/fix-cic-meta-builds' into 'master' 
updated cic-meta with new context ect.

See merge request grassrootseconomics/cic-internal-integration!222
 2021-07-12 16:21:59 +00:00
Blair Vanderlugt 4bb36a448d updated cic-meta with new context ect. 2021-07-12 16:21:58 +00:00
Blair Vanderlugt 231163e2fc Update apps/cic-ussd/.gitlab-ci.yml, apps/cic-notify/.gitlab-ci.yml, apps/cic-cache/.gitlab-ci.yml files 2021-07-12 16:14:33 +00:00
Blair Vanderlugt e599933ef8 fix requirements 2021-07-11 10:08:04 -07:00
Blair Vanderlugt 266bc3362d just remove the cic-eth slim image for rn 2021-07-11 09:51:08 -07:00
Blair Vanderlugt 8350381754 fix the scripts path in cic-eth 2021-07-11 09:43:05 -07:00
Blair Vanderlugt 6ddeacf036 fix the scripts path in cic-eth 2021-07-11 09:32:00 -07:00
Blair Vanderlugt fe017d2b0f Merge branch 'bvander/cic-eth-base-image-and-testing' into 'master' 
Faster local builds with base image and buildkit and run all unit tests

See merge request grassrootseconomics/cic-internal-integration!217
 2021-07-10 15:46:15 +00:00
Blair Vanderlugt d7973436e6 Faster local builds with base image and buildkit and run all unit tests 2021-07-10 15:46:14 +00:00
Blair Vanderlugt 5025c31af6 update the create eth flags with redis host 2021-07-09 10:29:34 -07:00
Louis Holbrook 021c736707 Merge branch 'lash/demurrage-task' into 'master' 
Add demurrage token amount adjust task

See merge request grassrootseconomics/cic-internal-integration!214
 2021-07-08 15:28:05 +00:00
Louis Holbrook e3028a5060 Add demurrage token amount adjust task 2021-07-08 15:28:04 +00:00
Louis Holbrook 5f6c57647f Merge branch 'lash/explicit-token-type' into 'master' 
Add explicit token type toggle in contract migration

See merge request grassrootseconomics/cic-internal-integration!216
 2021-07-07 07:56:45 +00:00
Louis Holbrook ed029a936c Add explicit token type toggle in contract migration 2021-07-07 07:56:45 +00:00
Louis Holbrook c559bb2fee Merge branch 'lash/free-api' into 'master' 
Minimal dependencies in cic-eth api setup

Closes #75

See merge request grassrootseconomics/cic-internal-integration!210
 2021-07-07 07:45:21 +00:00
Louis Holbrook 9b79034ed3 Minimal dependencies in cic-eth api setup 2021-07-07 07:45:21 +00:00
Blair Vanderlugt b7d5c6799f Merge branch 'bvander/data-seeding-updates' into 'master' 
data-seeding image updates and tweak meta import

See merge request grassrootseconomics/cic-internal-integration!212
 2021-07-05 17:14:47 +00:00
Blair Vanderlugt eef8bb2cf7 data-seeding image updates and tweak meta import 2021-07-05 17:14:46 +00:00
Blair Vanderlugt cf96fee430 Merge branch 'bvander/contract-migration-caching' into 'master' 
refactor contract-migration and add buildkit caching

See merge request grassrootseconomics/cic-internal-integration!211
 2021-07-05 17:13:27 +00:00
Blair Vanderlugt 9740963431 refactor contract-migration and add buildkit caching 2021-07-05 17:13:26 +00:00
Louis Holbrook a3c4932488 Merge branch 'lash/new-sarafu-token' into 'master' 
Add flavors of demurrage token to dev deployment

See merge request grassrootseconomics/cic-internal-integration!181
 2021-07-05 10:58:08 +00:00
Louis Holbrook aa667951be Add flavors of demurrage token to dev deployment 2021-07-05 10:58:08 +00:00
Louis Holbrook c2459cfd65 Merge branch 'lash/traffic' into 'master' 
data-seeding: Rehabilitate traffic scripts

See merge request grassrootseconomics/cic-internal-integration!213
 2021-07-04 17:19:21 +00:00
Louis Holbrook e7102ff02d data-seeding: Rehabilitate traffic scripts 2021-07-04 17:19:21 +00:00
Blair Vanderlugt a942c785f6 Merge branch 'philip/improving-import-scripts-logging' into 'master' 
Improves import scripts logging

Closes #74

See merge request grassrootseconomics/cic-internal-integration!207
 2021-07-03 16:55:51 +00:00
Philip Wafula 70704b09ec Improves import scripts logging 2021-07-03 16:55:51 +00:00
Louis Holbrook a075c55957 Merge branch 'lash/allowance' into 'master' 
Add allowance check and transferFrom task

See merge request grassrootseconomics/cic-internal-integration!203
 2021-06-30 18:15:40 +00:00
Louis Holbrook 6464f651ec Add allowance check and transferFrom task 2021-06-30 18:15:40 +00:00
Louis Holbrook 5145282946 Merge branch 'lash/faucet-verif' into 'master' 
Consider faucet amount in verify balance

See merge request grassrootseconomics/cic-internal-integration!206
 2021-06-30 18:14:53 +00:00
nolash 1e87f2ed31
Consider faucet amount in verify balance 2021-06-30 17:22:26 +02:00
Louis Holbrook c852f41d76 Merge branch 'lash/move-to-chainlib-eth' into 'master' 
Move to chainlib-eth dependency

See merge request grassrootseconomics/cic-internal-integration!199
 2021-06-30 14:44:18 +00:00
Louis Holbrook f8e68cff96 Move to chainlib-eth dependency 2021-06-30 14:44:17 +00:00
Philip Wafula 7027d77836 Merge branch 'philip/refactor-integration-tests' into 'master' 
Philip/refactor integration tests

See merge request grassrootseconomics/cic-internal-integration!182
 2021-06-30 14:27:56 +00:00
Philip Wafula d356f8167d Philip/refactor integration tests 2021-06-30 14:27:56 +00:00
Blair Vanderlugt 753d21fe95 Merge branch 'bvander/data-seeding-build-improvements' into 'master' 
uses the new base image

See merge request grassrootseconomics/cic-internal-integration!204
 2021-06-29 17:17:18 +00:00
Philip Wafula 3b6e031746 Merge branch 'philip/db-session-management' into 'master' 
Philip/db session management

Closes cic-ussd#53

See merge request grassrootseconomics/cic-internal-integration!193
 2021-06-29 10:49:25 +00:00
Philip Wafula b1d5d45eef Philip/db session management 2021-06-29 10:49:25 +00:00
Philip Wafula 53317cb912 Merge branch 'philip/notify-queue-setting' into 'master' 
Enable api level setting of queue value.

See merge request grassrootseconomics/cic-internal-integration!184
 2021-06-29 10:21:43 +00:00
Blair Vanderlugt 18382a1f35 Merge branch 'bvander/integration-notes' into 'master' 
integration updates: meta imports

See merge request grassrootseconomics/cic-internal-integration!201
 2021-06-28 22:40:54 +00:00
Blair Vanderlugt 29e91fafab integration updates: meta imports 2021-06-28 22:40:54 +00:00
Blair Vanderlugt 5b20a9a24a Merge branch 'bvander/better-data-seeding-container' into 'master' 
add key store and vars

See merge request grassrootseconomics/cic-internal-integration!202
 2021-06-28 22:40:04 +00:00
Blair Vanderlugt a252195bdc uses the new base image 2021-06-28 10:56:15 -07:00
Spencer Ofwiti f1be3b633c Merge branch 'lash/downgrade-chainsyncer' into 'master' 
Downgrade chainsyncer

See merge request grassrootseconomics/cic-internal-integration!200
 2021-06-28 15:36:56 +00:00