Commit Graph

481 Commits

Author SHA1 Message Date
nolash eb50f2b485
Add local session garbage collect to cic-ussd 2021-07-14 23:48:41 +02:00
nolash bb92b417e2
Fix missing session passing for nonce reserve teste 2021-07-14 23:45:23 +02:00
nolash 6f3069b90c
Typo in session 2021-07-14 23:17:32 +02:00
nolash e9886dbb3e
Execute address translate test as celery task 2021-07-14 22:56:03 +02:00
nolash 855fc271a5 Merge branch 'master' into lash/dispatcher-leak 2021-07-14 22:37:01 +02:00
nolash 8290e10315
Upgrade cic-cache deps 2021-07-14 22:29:28 +02:00
nolash dbaf3370db
plug sessionbase leak 2021-07-14 22:04:05 +02:00
nolash b63595ed5c Merge remote-tracking branch 'origin/master' into lash/dispatcher-leak 2021-07-14 17:08:42 +02:00
Louis Holbrook 884b18f2f1 Merge branch 'lash/expand-tokens-in-list' into 'master'
Expand token symbol and decimals in tx listings

See merge request grassrootseconomics/cic-internal-integration!226
2021-07-14 15:06:20 +00:00
Louis Holbrook 494a8f3e88 Expand token symbol and decimals in tx listings 2021-07-14 15:06:20 +00:00
Geoff Turk 1214f605a7 Merge branch 'geoffturk/fix-geo-range' into 'master'
Fix out of range error for geolocation in import users script

See merge request grassrootseconomics/cic-internal-integration!225
2021-07-14 14:52:40 +00:00
Louis Holbrook 0783a6001c Merge branch 'lash/eth-abi-exorcism' into 'master'
Remove eth-abi dep in data seeding

See merge request grassrootseconomics/cic-internal-integration!224
2021-07-14 14:43:33 +00:00
Louis Holbrook f9594b766a Remove eth-abi dep in data seeding 2021-07-14 14:43:32 +00:00
nolash 0131a29417
Remove session leak better 2021-07-14 14:43:51 +02:00
nolash 8b2652e551
Remove session leak 2021-07-14 14:40:47 +02:00
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
nolash af6951f1f7 Merge remote-tracking branch 'origin/master' into lash/dispatcher-leak 2021-07-12 18:59:37 +02: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
nolash b8e98fade7
trigger ci 2021-07-12 12:34:44 +02:00
nolash f8dc188107 Merge remote-tracking branch 'origin/master' into lash/dispatcher-leak 2021-07-12 12:29:46 +02: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
nolash 255bf72c12
Move conn constructor to loop method 2021-07-11 15:10:57 +02: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