Commit Graph

692 Commits

Author SHA1 Message Date
William Luke
6fe1f0108b Merge branch 'master' of https://gitlab.com/grassrootseconomics/cic-internal-integration into cic-eth-server 2022-01-05 12:30:40 +03:00
26616b7245 refactor 2022-01-05 12:16:48 +03:00
c3e924ae8f Merge branch 'sohail/alt-build' into 'master'
feat (devops): add local image build for releases

See merge request grassrootseconomics/cic-internal-integration!322
2022-01-05 08:11:38 +00:00
ff4c42dc24 feat (devops): add local image build for releases 2022-01-05 08:11:38 +00:00
b8cd7eec56 Merge branch 'philip/bump-test-coverage' into 'master'
Rehabilitate test coverage in ussd and cic-notify

See merge request grassrootseconomics/cic-internal-integration!323
2022-01-04 16:51:02 +00:00
837e8da650 Rehabilitate test coverage in ussd and cic-notify 2022-01-04 16:51:02 +00:00
fe3f2c2549 Merge branch 'philip/cleanup-hardening' into 'master'
USSD Hardening and Cleanups

See merge request grassrootseconomics/cic-internal-integration!320
2022-01-04 16:16:01 +00:00
46f25e5678 USSD Hardening and Cleanups 2022-01-04 16:16:00 +00:00
03c7c1ddbc Merge branch 'lash/improve-cache' into 'master'
refactor: Improve cic-cache

See merge request grassrootseconomics/cic-internal-integration!303
2022-01-04 16:01:03 +00:00
Louis Holbrook
104ff8a76a refactor: Improve cic-cache 2022-01-04 16:01:01 +00:00
b5653a704c Merge branch 'lash/rules-of-engagement' into 'master'
Add updated version of old rules of engagement for core team

See merge request grassrootseconomics/cic-internal-integration!321
2022-01-03 06:36:52 +00:00
Louis Holbrook
3b6ea6db77 Add updated version of old rules of engagement for core team 2022-01-03 06:36:52 +00:00
ea1198a898 add catch to celery wrapper 2021-12-23 10:36:29 +03:00
7d3ff89fe5 Merge branch 'lash/token-checksum-address-fix' into 'master'
bug: Normalize token addresses in db for erc20 operations

See merge request grassrootseconomics/cic-internal-integration!304
2021-12-22 18:25:29 +00:00
Louis Holbrook
dceae4e5d8 bug: Normalize token addresses in db for erc20 operations 2021-12-22 18:25:29 +00:00
46a4ccfd9c Merge branch 'lash/bloxberg-seeding' into 'master'
migrations: Enable deployment and data seeding to Bloxberg

See merge request grassrootseconomics/cic-internal-integration!301
2021-12-22 18:24:05 +00:00
Louis Holbrook
d7c4cb71eb migrations: Enable deployment and data seeding to Bloxberg 2021-12-22 18:24:05 +00:00
cbc1b449ba switch to fastapi :-/ 2021-12-21 21:15:45 +03:00
97aabdb460 Merge branch 'master' of https://gitlab.com/grassrootseconomics/cic-internal-integration into cic-eth-server 2021-12-21 17:37:55 +03:00
3e2947b301 fix: /default_token 2021-12-15 16:03:01 +03:00
b15cfee1c9 Merge branch 'sohail/pip-url-fix' into 'master'
fix: update default pip to new url

Closes #171

See merge request grassrootseconomics/cic-internal-integration!316
2021-12-10 14:55:50 +00:00
efb1967f46 fix: update default pip to new url 2021-12-10 14:55:50 +00:00
019824d1f4 Merge branch 'bvander/docs-updates' into 'master'
documentation: updated the docs with new links and getting started

See merge request grassrootseconomics/cic-internal-integration!314
2021-12-09 09:20:03 +00:00
d4c7fd3d7e documentation: updated the docs with new links and getting started 2021-12-09 09:20:03 +00:00
William Luke
47af8993d3 fix url 2021-12-08 16:14:41 +03:00
William Luke
6df51f12e1 remove port from EXTRA_PIP_INDEX_URL 2021-12-08 15:53:54 +03:00
William Luke
2ead1b0e51 replace sys.exit with return None 2021-12-08 15:05:17 +03:00
William Luke
1cd3d44502 change GTF to GFT 2021-12-08 15:04:59 +03:00
William Luke
ca8a8d8bfb remove hardcoded DOCKER_REGISTRY 2021-12-08 14:57:09 +03:00
William Luke
447f4bbd41 Merge branch 'master' of https://gitlab.com/grassrootseconomics/cic-internal-integration into cic-eth-server 2021-12-08 14:54:23 +03:00
William Luke
f193fe1989 re-add default docker registery 2021-12-08 14:51:38 +03:00
William Luke
efa923b678 update tos link 2021-12-08 14:33:37 +03:00
William Luke
8d778cff2c remove refill_gas and ping 2021-12-08 14:32:56 +03:00
William Luke
535deb9974 improve docstring 2021-12-08 14:31:49 +03:00
William Luke
a67f3a0dc0 remove unused imports 2021-12-08 14:30:57 +03:00
William Luke
33ad2dbc2d ignore .envrc 2021-12-08 14:30:17 +03:00
William Luke
da890afa81 remove .envrc 2021-12-08 14:30:05 +03:00
4b87a40cc2 Fixing path because it was messed up in the mr 2021-12-02 20:52:06 +00:00
9f9d557c73 Merge branch 'blairv/bug-template' into 'master'
Update bug.md

See merge request grassrootseconomics/cic-internal-integration!313
2021-12-02 20:49:00 +00:00
9814da78b8 Update bug.md 2021-12-02 20:47:11 +00:00
William Luke
6fb903d37b revert back to celery.chain 2021-12-02 16:36:19 +03:00
William Luke
d3805022ff remove unintended changes 2021-12-02 16:33:08 +03:00
William Luke
b3df49f89d feat: add wei conversions and caching 2021-12-02 15:07:49 +03:00
William Luke
253725c24f Merge branch 'master' of https://gitlab.com/grassrootseconomics/cic-internal-integration into cic-eth-server 2021-12-01 10:07:36 +03:00
cd102807a6 Merge branch 'philip/social-pin-recovery' into 'master'
Philip/social pin recovery

See merge request grassrootseconomics/cic-internal-integration!311
2021-11-29 21:24:38 +00:00
c3c43c28a5 Philip/social pin recovery 2021-11-29 21:24:37 +00:00
e132e534d3 Merge branch 'philip/multi-token-v1' into 'master'
Philip/multi token v1

See merge request grassrootseconomics/cic-internal-integration!309
2021-11-29 15:04:50 +00:00
e426f7b451 Philip/multi token v1 2021-11-29 15:04:50 +00:00
b368b022c1 Merge branch 'bvander/contributing' into 'master'
improvement: adopt a new contribution guide

See merge request grassrootseconomics/cic-internal-integration!306
2021-11-24 21:03:57 +00:00
bd266ac8dd improvement: adopt a new contribution guide 2021-11-24 21:03:57 +00:00