Commit Graph

663 Commits

Author SHA1 Message Date
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
69dbbcb6a9 fix: path in base image url 2021-11-23 21:43:32 +00:00
dd709d7d47 Update .gitlab-ci.yml 2021-11-23 21:09:16 +00:00
a9c84bb2b1 Merge branch 'fix-image-paths' into 'master'
bug: image paths are decoupled from the args that drive pulls, also fixes base path

See merge request grassrootseconomics/cic-internal-integration!310
2021-11-23 20:56:19 +00:00
semvervot
85aa1f3066 bug: image paths are decoupled from the args that drive pulls, also fixes base path 2021-11-23 12:54:11 -08:00
William Luke
ea7fa28b61 remove flask and graphql servers 2021-11-23 15:17:13 +03:00
William Luke
421e1cbf32 add token,tokens,refill_gas to api spec 2021-11-23 11:11:58 +03:00
William Luke
3c3745228e convert api tests to uwsgi 2021-11-22 12:28:09 +03:00
28936a58fe feat: Add a CODE_OF_CONDUCT 2021-11-20 01:23:54 +00:00
4b8096ff49 feat: Add LICENSE 2021-11-19 18:57:39 +00:00
William Luke
6a0544b579 pop required params 2021-11-19 16:50:13 +03:00
William Luke
b42f076d85 use call 2021-11-18 18:03:01 +03:00
a379065891 switch back to uwsgi 2021-11-18 15:38:20 +03:00
William Luke
18efb9fcf3 Merge branch 'master' of https://gitlab.com/grassrootseconomics/cic-internal-integration into cic-eth-server 2021-11-17 15:22:29 +03:00
William Luke
3ba5ef9c8c get tests working 2021-11-17 15:21:23 +03:00
c9eb3e32da Merge branch 'philip/token-meta' into 'master'
Philip/token meta

See merge request grassrootseconomics/cic-internal-integration!305
2021-11-17 08:20:31 +00:00
1be5a92f44 Philip/token meta 2021-11-17 08:20:31 +00:00
William Luke
11e9881009 setup initial testing 2021-11-16 16:37:16 +03:00
56cd5155f7 remove mocel0xAddress 2021-11-16 11:07:00 +03:00
William Luke
697dbd5c42 add Transaction schema 2021-11-12 12:42:12 +03:00
William Luke
fae434465d fix transactions call 2021-11-12 12:41:57 +03:00
William Luke
59c8895db5 add swagger server 2021-11-12 11:14:40 +03:00
William Luke
c48177c78c Merge branch 'cic-eth-server' of https://github.com/williamluke4/cic-internal-integration into cic-eth-server 2021-11-09 11:48:52 +03:00
b31433dcb5 add database debug 2021-11-09 10:26:04 +03:00
15ea02f540 Merge branch 'lash/token-checksum-address-fix' of https://gitlab.com/grassrootseconomics/cic-internal-integration into cic-eth-server 2021-11-08 12:57:24 +03:00
nolash
8600e282b3
Remove incoming balance in network check 2021-11-08 10:56:11 +01:00
d62cced0a8 Merge branch 'lash/token-checksum-address-fix' of https://gitlab.com/grassrootseconomics/cic-internal-integration into cic-eth-server 2021-11-08 12:44:11 +03:00
nolash
a42efb2529
Non-checksum address in erc20 tx_caches 2021-11-08 10:43:02 +01:00
66b2cb039b Merge branch 'master' of https://gitlab.com/grassrootseconomics/cic-internal-integration into cic-eth-server 2021-11-08 11:57:17 +03:00
Louis Holbrook
8855ccd3d2 Merge branch 'lash/better-meta-logging' into 'master'
bug: False 404 in cic-meta logging

See merge request grassrootseconomics/cic-internal-integration!302
2021-11-02 17:45:09 +00:00