kamikazechaser
/
cic-internal-integration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
695 Commits 212 Branches 0 Tags 13 MiB
Commit Graph

695 Commits

Author SHA1 Message Date
Philip Wafula e426f7b451 Philip/multi token v1 2021-11-29 15:04:50 +00:00
Blair Vanderlugt 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
Blair Vanderlugt bd266ac8dd improvement: adopt a new contribution guide 2021-11-24 21:03:57 +00:00
Blair Vanderlugt 69dbbcb6a9 fix: path in base image url 2021-11-23 21:43:32 +00:00
Blair Vanderlugt dd709d7d47 Update .gitlab-ci.yml 2021-11-23 21:09:16 +00:00
Blair Vanderlugt 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
Blair Vanderlugt 28936a58fe feat: Add a CODE_OF_CONDUCT 2021-11-20 01:23:54 +00:00
Blair Vanderlugt 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
William Luke 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
Philip Wafula 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
Philip Wafula 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
William Luke 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
William Luke b31433dcb5 add database debug 2021-11-09 10:26:04 +03:00
William Luke 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
William Luke 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
William Luke 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
Louis Holbrook 09dfdbb38a bug: False 404 in cic-meta logging 2021-11-02 17:45:09 +00:00
William Luke f265108485 add eth-server 2021-11-02 18:50:14 +03:00
William Luke f28ba1098f revert api_task:balance changes 2021-11-01 13:56:12 +03:00
William Luke 7c73c8b30f Merge branch 'master' of https://gitlab.com/grassrootseconomics/cic-internal-integration into cic-eth-server 2021-11-01 10:49:07 +03:00
William Luke c85692ab9e graphql server 2021-11-01 10:48:05 +03:00
Blair Vanderlugt 1abb642361 Merge branch 'feat/automation/add-semver' into 'master' 
feat: (automation) add semver

See merge request grassrootseconomics/cic-internal-integration!266
 2021-10-29 23:33:46 +00:00
Blair Vanderlugt 93bcbd7d51 feat: (automation) add semver 2021-10-29 23:33:46 +00:00
William Luke 68a3d9fe3c save 2021-10-29 15:10:56 +03:00
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
Philip Wafula 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
Philip Wafula 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