nolash
|
644b9ec4ec
|
Merge remote-tracking branch 'origin/master' into lash/demurrage-task
|
2021-07-07 09:58:57 +02: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 |
|
nolash
|
bc52e46620
|
Merge remote-tracking branch 'origin/master' into lash/demurrage-task
|
2021-07-07 09:47:09 +02: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 |
|
nolash
|
ba729a0a54
|
Properly fix mock path in cic-eth test
|
2021-07-07 09:32:52 +02:00 |
|
nolash
|
cb4927edc9
|
Correct mocks path in cic tests, faulty contract-migration build
|
2021-07-07 09:24:40 +02:00 |
|
|
|
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 |
|
|
|
eef8bb2cf7
|
data-seeding image updates and tweak meta import
|
2021-07-05 17:14:46 +00:00 |
|
|
|
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 |
|
|
|
9740963431
|
refactor contract-migration and add buildkit caching
|
2021-07-05 17:13:26 +00:00 |
|
nolash
|
185458e320
|
Merge remote-tracking branch 'origin/master' into lash/demurrage-task
|
2021-07-05 13:05:02 +02: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 |
|
nolash
|
d9214ddd62
|
Bump cic-eth dep to future build
|
2021-07-05 11:59:52 +02:00 |
|
nolash
|
b5d6d80d8e
|
Add demurrage token task api
|
2021-07-05 11:58:07 +02:00 |
|
nolash
|
2f09ac9110
|
Change aux module to unpopulated base module name
|
2021-07-05 11:28:27 +02:00 |
|
nolash
|
bc8851ad06
|
Merge branch 'lash/new-sarafu-token' into lash/demurrage-task
|
2021-07-05 10:41:35 +02:00 |
|
nolash
|
46840040a0
|
Remove dev dockerfile
|
2021-07-05 10:41:19 +02:00 |
|
nolash
|
4e18060589
|
Remove dev dockerfile
|
2021-07-05 10:40:32 +02:00 |
|
nolash
|
08a77f9818
|
Move cic-eth token fixture to package, add demurrage token calc task
|
2021-07-05 10:29:33 +02: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 |
|
nolash
|
5fab939270
|
Upgrade erc20 demurrage token deploy, explicit multi mode flag
|
2021-07-04 13:53:03 +02:00 |
|
nolash
|
51109db487
|
Merge branch 'lash/new-sarafu-token' into lash/demurrage-task
|
2021-07-04 13:26:22 +02:00 |
|
nolash
|
f44e2c8b45
|
Move registry initialization before aux
|
2021-07-04 13:21:07 +02:00 |
|
|
|
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 |
|
|
|
70704b09ec
|
Improves import scripts logging
|
2021-07-03 16:55:51 +00:00 |
|
nolash
|
40a7eec6ad
|
Add aux requirement for demurrage task
|
2021-07-02 21:32:48 +02:00 |
|
nolash
|
6a75ce37c4
|
Add demurrage token amount adjust task
|
2021-07-02 21:25:47 +02:00 |
|
nolash
|
9b2f2ab0b1
|
Reduce profanity
|
2021-07-01 11:05:31 +02:00 |
|
nolash
|
98a38b7117
|
Upgrade cic-base for contract-migration
|
2021-06-30 22:51:23 +02:00 |
|
nolash
|
a2ca61355d
|
Merge remote-tracking branch 'origin/master' into lash/new-sarafu-token
|
2021-06-30 22:01:07 +02:00 |
|
nolash
|
b0638f2262
|
Rename env var for token symbol in contract migration
|
2021-06-30 21:16:06 +02: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 |
|
nolash
|
ea4c68f311
|
Merge remote-tracking branch 'origin/master' into lash/new-sarafu-token
|
2021-06-30 16:47:36 +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 |
|
|
|
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 |
|
|
|
d356f8167d
|
Philip/refactor integration tests
|
2021-06-30 14:27:56 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
b1d5d45eef
|
Philip/db session management
|
2021-06-29 10:49:25 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
29e91fafab
|
integration updates: meta imports
|
2021-06-28 22:40:54 +00:00 |
|
