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

650 Commits

Author SHA1 Message Date
Philip Wafula 3dcfbe59fe Merge branch 'philip/translations-v1' into 'master' 
Adds updated translations.

See merge request grassrootseconomics/cic-internal-integration!328
 2022-01-10 07:31:04 +00:00
Philip Wafula 0dd21f3970 Adds updated translations. 2022-01-10 07:31:03 +00:00
Philip Wafula 6ca8632cde Merge branch 'sohail/help-menu-fix' into 'master' 
fix: ussd help menu

See merge request grassrootseconomics/cic-internal-integration!327
 2022-01-10 06:56:52 +00:00
Mohamed Sohail b7dc290992 fix: ussd help menu 2022-01-10 06:56:52 +00:00
Philip Wafula e69801ea08 Merge branch 'philip/ussd-poler' into 'master' 
Philip/ussd poler

See merge request grassrootseconomics/cic-internal-integration!326
 2022-01-10 04:44:51 +00:00
Philip Wafula 50a596e707 Philip/ussd poler 2022-01-10 04:44:50 +00:00
Philip Wafula cb61e45e4c Merge branch 'philip/ussd-data-files' into 'master' 
Move cic-ussd datafiles to apps/cic-ussd/cic_ussd/data/

See merge request grassrootseconomics/cic-internal-integration!325
 2022-01-07 10:50:49 +00:00
Philip Wafula e5b06b18d7 Move cic-ussd datafiles to apps/cic-ussd/cic_ussd/data/ 2022-01-07 10:50:49 +00:00
William Luke 5d1a30021a Merge branch 'fix/docs-link' into 'master' 
fix: link to docs

See merge request grassrootseconomics/cic-internal-integration!324
 2022-01-05 12:22:15 +00:00
William Luke ade3f4e917 fix: link to docs 2022-01-05 15:19:11 +03:00
Mohamed Sohail 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
Mohamed Sohail ff4c42dc24 feat (devops): add local image build for releases 2022-01-05 08:11:38 +00:00
Philip Wafula 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
Philip Wafula 837e8da650 Rehabilitate test coverage in ussd and cic-notify 2022-01-04 16:51:02 +00:00
Philip Wafula 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
Philip Wafula 46f25e5678 USSD Hardening and Cleanups 2022-01-04 16:16:00 +00:00
Philip Wafula 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
Mohamed Sohail 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
Philip Wafula 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
Philip Wafula 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
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