William Luke
|
9dd442e716
|
Merge branch 'master' of https://gitlab.com/grassrootseconomics/cic-internal-integration into cic-eth-server
|
2021-10-29 15:10:05 +03:00 |
|
Louis Holbrook
|
818899670a
|
Merge branch 'lash/local-dev-improve' into 'master'
feat: Enable parallell contract transactions in bootstrap
See merge request grassrootseconomics/cic-internal-integration!295
|
2021-10-29 09:36:14 +00:00 |
|
Louis Holbrook
|
1882910a8e
|
feat: Enable parallell contract transactions in bootstrap
|
2021-10-29 09:36:14 +00:00 |
|
William Luke
|
0c84e970ad
|
misc
|
2021-10-29 11:34:37 +03:00 |
|
|
|
3cc909c936
|
Merge branch 'philip/bump-ussd-version' into 'master'
Philip/bump ussd version
See merge request grassrootseconomics/cic-internal-integration!300
|
2021-10-27 14:42:49 +00:00 |
|
|
|
60b6e1abdb
|
Philip/bump ussd version
|
2021-10-27 14:42:49 +00:00 |
|
Louis Holbrook
|
9c7e72f71c
|
Merge branch 'lash/fix-docs' into 'master'
refactor: Make texinfo docs buildable with makeinfo <6.0
See merge request grassrootseconomics/cic-internal-integration!299
|
2021-10-26 20:01:19 +00:00 |
|
Louis Holbrook
|
e3acc1757a
|
refactor: Make texinfo docs buildable with makeinfo <6.0
|
2021-10-26 20:01:19 +00:00 |
|
Louis Holbrook
|
8250b15d32
|
Merge branch 'lash/fix-docs' into 'master'
Lash/fix docs
See merge request grassrootseconomics/cic-internal-integration!298
|
2021-10-26 14:59:50 +00:00 |
|
Louis Holbrook
|
31d7cf5789
|
Lash/fix docs
|
2021-10-26 14:59:50 +00:00 |
|
Louis Holbrook
|
2544c159c2
|
Merge branch 'lash/fix-docs' into 'master'
refactor: Confirm to external cross-repo texinfo doc maker structure
See merge request grassrootseconomics/cic-internal-integration!297
|
2021-10-26 14:17:27 +00:00 |
|
Louis Holbrook
|
7691d9a127
|
refactor: Confirm to external cross-repo texinfo doc maker structure
|
2021-10-26 14:17:27 +00:00 |
|
William Luke
|
f856ca3f68
|
init graphene
|
2021-10-26 15:48:25 +03:00 |
|
Louis Holbrook
|
a2a3634683
|
Merge branch 'lash/meta-immutable' into 'master'
feat: Add immutable pointers to meta
Closes cic-meta#11
See merge request grassrootseconomics/cic-internal-integration!296
|
2021-10-25 18:51:08 +00:00 |
|
Louis Holbrook
|
fe0835a4e7
|
feat: Add immutable pointers to meta
|
2021-10-25 18:51:08 +00:00 |
|
William Luke
|
4a1008e75e
|
feat(cic-eth): initial server setup
|
2021-10-25 17:51:45 +03:00 |
|
|
|
d8f51c5bdd
|
Merge branch 'lash/split-migration' into 'master'
feat: Split and improve contract migration steps
See merge request grassrootseconomics/cic-internal-integration!292
|
2021-10-20 15:02:37 +00:00 |
|
Louis Holbrook
|
13fb67d2d8
|
feat: Split and improve contract migration steps
|
2021-10-20 15:02:36 +00:00 |
|
Louis Holbrook
|
8f1afa094d
|
Merge branch 'lash/update-aux-deps' into 'master'
Update aux deps
See merge request grassrootseconomics/cic-internal-integration!264
|
2021-10-15 20:16:49 +00:00 |
|
Louis Holbrook
|
1d9f134125
|
Update aux deps
|
2021-10-15 20:16:49 +00:00 |
|
Louis Holbrook
|
b6a4bab1c8
|
Merge branch 'philip/ussd-cic-types-meta-tool' into 'master'
Philip/ussd cic types meta tool
See merge request grassrootseconomics/cic-internal-integration!294
|
2021-10-15 11:21:42 +00:00 |
|
|
|
805fc56c7b
|
Philip/ussd cic types meta tool
|
2021-10-15 11:21:41 +00:00 |
|
Louis Holbrook
|
e3d39a2144
|
Merge branch 'lash/no-none-callbacks' into 'master'
bug: Do not call none callbacks on token proof check
See merge request grassrootseconomics/cic-internal-integration!293
|
2021-10-14 13:42:09 +00:00 |
|
Louis Holbrook
|
90176f2806
|
bug: Do not call none callbacks on token proof check
|
2021-10-14 13:42:09 +00:00 |
|
|
|
f42f223ce9
|
Merge branch 'lash/api-choose-token' into 'master'
feat: Add token metadata API
Closes #118
See merge request grassrootseconomics/cic-internal-integration!289
|
2021-10-14 13:24:51 +00:00 |
|
Louis Holbrook
|
045a279ac2
|
feat: Add token metadata API
|
2021-10-14 13:24:51 +00:00 |
|
Louis Holbrook
|
6b59c87f68
|
Merge branch 'lash/okota' into 'master'
feat: Integrate okota
See merge request grassrootseconomics/cic-internal-integration!286
|
2021-10-07 21:05:58 +00:00 |
|
Louis Holbrook
|
9ee42b908d
|
feat: Integrate okota
|
2021-10-07 21:05:58 +00:00 |
|
|
|
3343c4163e
|
Merge branch 'lash/more-case-case' into 'master'
bug: cic-eth transaction listings
See merge request grassrootseconomics/cic-internal-integration!285
|
2021-10-07 15:12:35 +00:00 |
|
Louis Holbrook
|
f5bfc8ace2
|
bug: cic-eth transaction listings
|
2021-10-07 15:12:35 +00:00 |
|
|
|
8a9d2ee0be
|
Merge branch 'bvander/default-docker-compose' into 'master'
chore: gift defaults
See merge request grassrootseconomics/cic-internal-integration!282
|
2021-09-27 13:15:21 +00:00 |
|
|
|
3608fd1fc7
|
chore: gift defaults
|
2021-09-27 16:14:31 +03:00 |
|
|
|
0d275f358b
|
Merge branch 'philip/removes-docker-compose-profiles' into 'master'
removes profile attrs from docker-compose file.
See merge request grassrootseconomics/cic-internal-integration!281
|
2021-09-27 12:33:19 +00:00 |
|
|
|
3aef2aa65f
|
removes profile attrs from docker-compose file.
|
2021-09-27 15:26:22 +03:00 |
|
|
|
5644baefb2
|
Merge branch 'philip/bump-cic-ussd-version' into 'master'
Bumps cic-ussd version following token fix.
See merge request grassrootseconomics/cic-internal-integration!280
|
2021-09-27 11:37:42 +00:00 |
|
|
|
1a7c4deab6
|
Bumps cic-ussd version following token fix.
|
2021-09-27 14:27:10 +03:00 |
|
|
|
0389d8623d
|
Merge branch 'philip/token-value-fix' into 'master'
Refactors to avoid conversion of zero values to wei.
See merge request grassrootseconomics/cic-internal-integration!279
|
2021-09-22 08:17:39 +00:00 |
|
|
|
cf64387d81
|
Refactors to avoid conversion of zero values to wei.
|
2021-09-22 11:10:33 +03:00 |
|
|
|
79bcc8a9f1
|
Merge branch 'dev-k8s-deploy-new-data-seeding' into 'master'
Dataseeding container
See merge request grassrootseconomics/cic-internal-integration!267
|
2021-09-21 06:04:44 +00:00 |
|
|
|
7b57f1b4c2
|
Dataseeding container
|
2021-09-21 06:04:44 +00:00 |
|
|
|
76b8519637
|
Merge branch 'philip/cache-migration' into 'master'
Fixes migrations in cic-cache (ideally)
See merge request grassrootseconomics/cic-internal-integration!276
|
2021-09-21 05:33:46 +00:00 |
|
|
|
e89aec76fa
|
Fixes migrations in cic-cache (ideally)
|
2021-09-21 05:33:46 +00:00 |
|
|
|
a138a0ec75
|
Merge branch 'bvander/update-buildkit-cache' into 'master'
chore: clean old dockerfile and add docs for clearing cache
See merge request grassrootseconomics/cic-internal-integration!277
|
2021-09-20 07:01:53 +00:00 |
|
|
|
5128c7828c
|
chore: clean old dockerfile and add docs for clearing cache
|
2021-09-20 09:59:12 +03:00 |
|
|
|
2f005195e5
|
Merge branch 'philip/ussd-cli-fix' into 'master'
Philip/ussd cli fix
See merge request grassrootseconomics/cic-internal-integration!275
|
2021-09-18 09:07:05 +00:00 |
|
|
|
fb8db3ffd2
|
Philip/ussd cli fix
|
2021-09-18 09:07:05 +00:00 |
|
|
|
b5f647c4aa
|
Merge branch 'philip/ussd-demurrage' into 'master'
Philip/ussd demurrage
See merge request grassrootseconomics/cic-internal-integration!263
|
2021-09-17 11:15:43 +00:00 |
|
|
|
6019143ba1
|
Philip/ussd demurrage
|
2021-09-17 11:15:43 +00:00 |
|
|
|
610440b722
|
Merge branch 'lash/signer-missing-symbol' into 'master'
Update signer to fill in missing sign to wire symbol
See merge request grassrootseconomics/cic-internal-integration!273
|
2021-09-17 06:54:58 +00:00 |
|
Louis Holbrook
|
d65455fc29
|
Update signer to fill in missing sign to wire symbol
|
2021-09-17 06:54:58 +00:00 |
|
