Commit Graph

627 Commits

Author SHA1 Message Date
Mohamed Sohail 6b18865018
fix: nonce order fix during contract deployment
- bloxberg logs: 1 -> 2 -> 8 -> 19 -> 20 -> 19
2021-12-20 09:11:53 +03:00
Blair Vanderlugt 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
Mohamed Sohail efb1967f46 fix: update default pip to new url 2021-12-10 14:55:50 +00:00
Will Ruddick 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
Blair Vanderlugt d4c7fd3d7e documentation: updated the docs with new links and getting started 2021-12-09 09:20:03 +00:00
Blair Vanderlugt 4b87a40cc2 Fixing path because it was messed up in the mr 2021-12-02 20:52:06 +00:00
Blair Vanderlugt 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
Blair Vanderlugt 9814da78b8 Update bug.md 2021-12-02 20:47:11 +00:00
Philip Wafula 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
Philip Wafula c3c43c28a5 Philip/social pin recovery 2021-11-29 21:24:37 +00:00
Philip Wafula 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
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
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
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
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
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
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
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
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
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
Philip Wafula 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
Philip Wafula 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
Philip Wafula 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