|
|
de36fe3fab
|
multipass err...multiline
|
2021-07-07 14:33:32 -07:00 |
|
|
|
deeba250e4
|
fix eth and meta tests
|
2021-07-07 14:24:26 -07:00 |
|
|
|
5668ed1cf5
|
Merge branch 'bvander/cic-eth-base-image-and-testing' of gitlab.com:grassrootseconomics/cic-internal-integration into bvander/cic-eth-base-image-and-testing
|
2021-07-07 14:08:26 -07:00 |
|
|
|
8b7a26abb9
|
Merge branch 'master' into bvander/cic-eth-base-image-and-testing
|
2021-07-07 14:05:39 -07: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 |
|
|
|
e40f15d106
|
Update apps/contract-migration/.gitlab-ci.yml, apps/data-seeding/.gitlab-ci.yml files
|
2021-07-06 20:41:57 +00:00 |
|
|
|
b94116a683
|
Update apps/cic-meta/.gitlab-ci.yml
|
2021-07-06 20:31:12 +00:00 |
|
|
|
635ef775df
|
Update apps/cic-meta/.gitlab-ci.yml
|
2021-07-06 20:30:12 +00:00 |
|
|
|
c35e230e9f
|
Update apps/cic-notify/.gitlab-ci.yml
|
2021-07-06 20:29:06 +00:00 |
|
|
|
0c842cf5d7
|
Update apps/cic-ussd/.gitlab-ci.yml
|
2021-07-06 20:28:29 +00:00 |
|
|
|
e8f65dcd29
|
Update apps/contract-migration/.gitlab-ci.yml, apps/data-seeding/.gitlab-ci.yml, .gitlab-ci.yml, apps/cic-cache/.gitlab-ci.yml, apps/cic-eth/.gitlab-ci.yml, apps/cic-meta/.gitlab-ci.yml, apps/cic-notify/.gitlab-ci.yml, apps/cic-ussd/.gitlab-ci.yml files
|
2021-07-06 20:27:32 +00:00 |
|
|
|
d679a8441e
|
Update .gitlab-ci.yml, apps/data-seeding/.gitlab-ci.yml, apps/cic-ussd/.gitlab-ci.yml, apps/cic-notify/.gitlab-ci.yml, apps/cic-meta/.gitlab-ci.yml, apps/cic-cache/.gitlab-ci.yml files
|
2021-07-06 20:05:18 +00:00 |
|
|
|
58f3a90206
|
Update apps/contract-migration/.gitlab-ci.yml, apps/cic-eth/.gitlab-ci.yml files
|
2021-07-06 19:54:36 +00:00 |
|
|
|
3256f23121
|
Update apps/cic-eth/docker/Dockerfile
|
2021-07-06 19:52:55 +00:00 |
|
|
|
8cdd405122
|
Update apps/contract-migration/docker/Dockerfile, apps/cic-eth/.gitlab-ci.yml, ci_templates/.cic-template.yml, apps/contract-migration/.gitlab-ci.yml files
|
2021-07-06 19:51:53 +00:00 |
|
|
|
db4eb31de0
|
Update apps/contract-migration/docker/Dockerfile
|
2021-07-06 19:43:44 +00:00 |
|
|
|
0fa7b99a15
|
Update apps/contract-migration/.gitlab-ci.yml
|
2021-07-06 19:42:42 +00:00 |
|
|
|
b3b051d3d5
|
Update apps/contract-migration/.gitlab-ci.yml, apps/contract-migration/docker/Dockerfile files
|
2021-07-06 19:41:24 +00:00 |
|
|
|
b86b57bcb7
|
Update apps/contract-migration/docker/Dockerfile
|
2021-07-06 19:40:36 +00:00 |
|
|
|
4ecf4f1214
|
Update ci_templates/.cic-template.yml, apps/cic-eth/.gitlab-ci.yml, .gitlab-ci.yml, apps/contract-migration/.gitlab-ci.yml files
|
2021-07-06 19:36:17 +00:00 |
|
|
|
e3da256e66
|
Update apps/cic-eth/.gitlab-ci.yml
|
2021-07-06 19:11:51 +00:00 |
|
|
|
c8e24c96c5
|
Update apps/cic-eth/.gitlab-ci.yml
|
2021-07-06 19:10:49 +00:00 |
|
|
|
ecc5d26666
|
Update apps/cic-eth/.gitlab-ci.yml
|
2021-07-06 19:00:09 +00:00 |
|
|
|
304550c2ae
|
Update apps/cic-eth/.gitlab-ci.yml
|
2021-07-06 18:53:04 +00:00 |
|
|
|
93f0353808
|
added pythonpath
|
2021-07-06 11:43:59 -07:00 |
|
|
|
2e6e80e134
|
Update ci_templates/.cic-template.yml, apps/cic-eth/.gitlab-ci.yml files
|
2021-07-06 18:12:32 +00:00 |
|
|
|
bc868fd2c8
|
add syntax line
|
2021-07-06 11:06:21 -07:00 |
|
|
|
0b3b1ef459
|
change cic-eth context
|
2021-07-06 10:57:20 -07:00 |
|
|
|
f72d577b8c
|
Update docker-compose.yml, apps/cic-eth/.gitlab-ci.yml, ci_templates/.cic-template.yml files
|
2021-07-06 17:30:12 +00:00 |
|
|
|
068d1112d2
|
Update ci_templates/.cic-template.yml, apps/cic-eth/.gitlab-ci.yml files
|
2021-07-06 17:15:24 +00:00 |
|
|
|
460a7c223b
|
Update apps/cic-eth/docker/Dockerfile, apps/cic-eth/docker/Dockerfile_ci files
|
2021-07-06 17:11:26 +00:00 |
|
|
|
dd3ddfd41d
|
Update apps/cic-eth/docker/Dockerfile_ci, apps/cic-eth/.gitlab-ci.yml files
|
2021-07-06 17:09:32 +00:00 |
|
|
|
8a6a2fd008
|
Update ci_templates/.cic-template.yml
|
2021-07-06 17:06:11 +00:00 |
|
|
|
3fca9a6744
|
Update .gitlab-ci.yml, ci_templates/.cic-template.yml, apps/cic-eth/docker/Dockerfile, apps/cic-eth/.gitlab-ci.yml files
|
2021-07-06 17:02:56 +00: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 |
|
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 |
|
|
|
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 |
|
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 |
|
