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
Blair Vanderlugt 8904e2abb1 Merge branch 'cic-ussd-req' into 'master' 
revert the new requirements for ussd

See merge request grassrootseconomics/cic-internal-integration!58
 2021-03-07 20:27:03 +00:00
Blair Vanderlugt 94d3e61d0c revert the new requirements for ussd 2021-03-07 12:25:36 -08:00
nolash fc08f3d17a
bump cic base for cic ussd 2021-03-07 20:35:26 +01:00
Louis Holbrook 8da5219290 Merge branch 'lash/cli-rehabilitations' into 'master' 
Rehabilitate CLI and API after nonce changes

See merge request grassrootseconomics/cic-internal-integration!57
 2021-03-07 18:01:44 +00:00
Louis Holbrook 5f01135b04 Rehabilitate CLI and API after nonce changes 2021-03-07 18:01:44 +00:00
Louis Holbrook 543c6249b9 Merge branch 'lash/retry-on-signer-error' into 'master' 
Retry on signer error

See merge request grassrootseconomics/cic-internal-integration!55
 2021-03-07 13:51:59 +00:00
Louis Holbrook db4f8f8955 Retry on signer error 2021-03-07 13:51:59 +00:00
Louis Holbrook 0c45e12ce1 Merge branch 'lash/ussd-cli' into 'master' 
Add ussd cli

See merge request grassrootseconomics/cic-internal-integration!54
 2021-03-06 22:27:40 +00:00
nolash 4f1014c5e1
Add ussd cli 2021-03-06 22:25:57 +01:00
Louis Holbrook 1bfc1434b4 Merge branch 'lash/cic-eth-upgrade' into 'master' 
Upgrade cic-eth version

See merge request grassrootseconomics/cic-internal-integration!53
 2021-03-06 20:00:10 +00:00
nolash 7b9cd2d4b8
Upgrade cic-eth version 2021-03-06 20:58:35 +01:00
Louis Holbrook 30febbd1e0 Merge branch 'lash/transfer-authorization' into 'master' 
cic-eth: Make nonce separate task

See merge request grassrootseconomics/cic-internal-integration!52
 2021-03-06 17:55:51 +00:00
Louis Holbrook f0088f20de cic-eth: Make nonce separate task 2021-03-06 17:55:51 +00:00
Louis Holbrook 618769a0d2 Merge branch 'lash/cic-cache-biiig-num' into 'master' 
cic-cache: Set value db fields in cic_cache to handle biiig numbers

See merge request grassrootseconomics/cic-internal-integration!51
 2021-03-05 20:03:52 +00:00
nolash e0a980363c
Set value db fields in cic_cache to handle biiig numbers 2021-03-05 20:45:01 +01:00
Philip Wafula 9d36a5f92f Merge branch 'philip/dry-run-fixes' into 'master' 
Get that "ussd_menu.json" out there.

See merge request grassrootseconomics/cic-internal-integration!50
 2021-03-05 19:22:44 +00:00
PhilipWafula 2fe6f4125f
Get that "ussd_menu.json" out there. 2021-03-05 22:09:22 +03:00
Philip Wafula b5c50b348d Merge branch 'philip/dry-run-prep' into 'master' 
Philip/dry run prep

See merge request grassrootseconomics/cic-internal-integration!49
 2021-03-05 16:28:08 +00:00
Philip Wafula ea336283dc Philip/dry run prep 2021-03-05 16:28:07 +00:00
Philip Wafula aa99b16ad2 Merge branch 'lash/fix-tx-list' into 'master' 
Make tx listing tasks work properly

See merge request grassrootseconomics/cic-internal-integration!45
 2021-03-04 16:47:13 +00:00
Louis Holbrook 1e7fff0133 Minor refactors: 
- Renames s_assemble to s_brief
-  Link s_local to s_brief
 2021-03-04 16:47:13 +00:00
Philip Wafula 21c9d95c4b Merge branch 'lash/transfer-authorization' into 'master' 
cic-eth: Introduce transfer authorization contract

See merge request grassrootseconomics/cic-internal-integration!47
 2021-03-04 15:06:15 +00:00
Louis Holbrook 8240e58c0a cic-eth: Introduce transfer authorization contract 2021-03-04 15:06:14 +00:00
Blair Vanderlugt 1e9bf6b4d3 Update .cic-template.yml 2021-03-04 14:39:32 +00:00
Blair Vanderlugt 7e089e1083 Merge branch 'bvander/cic-meta-entrypoint-update' into 'master' 
meta isn't using the compose command its in the the Dockerfile

See merge request grassrootseconomics/cic-internal-integration!42
 2021-03-03 16:26:20 +00:00
Louis Holbrook 32627aad27 Merge branch 'lash/session-nonce-queue' into 'master' 
Atomic nonce queue db sessions

See merge request grassrootseconomics/cic-internal-integration!48
 2021-03-03 07:37:27 +00:00
Louis Holbrook d9a8c672de Atomic nonce queue db sessions 2021-03-03 07:37:26 +00:00
Louis Holbrook f92efa28f9 Merge branch 'bvander/bug/cic-trust-var-default' into 'master' 
cic trust address bug

See merge request grassrootseconomics/cic-internal-integration!46
 2021-03-02 18:02:00 +00:00
Blair Vanderlugt 73729d19b0 Update apps/cic-cache/cic_cache/runnable/tracker.py 2021-03-02 17:33:13 +00:00
Louis Holbrook ae1502a651 Merge branch 'lash/refactor-syncer' into 'master' 
Syncer refactor

See merge request grassrootseconomics/cic-internal-integration!40
 2021-03-01 20:15:17 +00:00
Louis Holbrook 5001113267 Syncer refactor 2021-03-01 20:15:17 +00:00
Blair Vanderlugt 451079d004 Update ci_templates/.cic-template.yml 2021-03-01 14:35:53 +00:00
Blair Vanderlugt ba8a0b1953 Update ci_templates/.cic-template.yml 2021-03-01 14:29:08 +00:00
Blair Vanderlugt bbc948757f Update ci_templates/.cic-template.yml 2021-03-01 14:24:38 +00:00
Blair Vanderlugt ca8c1b1f27 Update ci_templates/.cic-template.yml 2021-03-01 14:22:46 +00:00
Blair Vanderlugt 854753f120 Merge branch 'revert-f37fa1db' into 'master' 
Revert "Update ci_templates/.cic-template.yml"

See merge request grassrootseconomics/cic-internal-integration!44
 2021-02-28 18:32:41 +00:00
Blair Vanderlugt daadbc27e9 Revert "Update ci_templates/.cic-template.yml" 
This reverts commit f37fa1dbcf
 2021-02-28 18:23:01 +00:00
Blair Vanderlugt f37fa1dbcf Update ci_templates/.cic-template.yml 2021-02-28 17:54:13 +00:00
Spencer Ofwiti ac264314c0 Merge branch 'spencer/cic-meta-exports' into 'master' 
Add exports to interface with CICADA.

See merge request grassrootseconomics/cic-internal-integration!43
 2021-02-25 09:58:43 +00:00
Spencer Ofwiti 84c1d11b48 Add exports to interface with CICADA. 2021-02-25 09:58:43 +00:00
Blair Vanderlugt f940d4a961 meta isn't using this. The entrypoin is in the Dockerfile 2021-02-24 06:47:34 -08:00
Spencer Ofwiti 6fe87652ce Merge branch 'spencer/update-cic-meta' into 'master' 
Add changes from stand-alone cic-meta repo.

See merge request grassrootseconomics/cic-internal-integration!41
 2021-02-24 12:29:41 +00:00
Spencer Ofwiti 8f65be16b1 Add changes from stand-alone cic-meta repo. 2021-02-24 15:14:17 +03:00
Louis Holbrook 34a48a6c6c Merge branch 'lash/fix-imports-again' into 'master' 
Rehabilitate import scripts after leak fixes

See merge request grassrootseconomics/cic-internal-integration!37
 2021-02-22 20:00:18 +00:00
Louis Holbrook c68d9d8404 Rehabilitate import scripts after leak fixes 2021-02-22 20:00:18 +00:00
Blair Vanderlugt dd8d4b01e2 Merge branch 'bvander/cic-ussd-workdir' into 'master' 
change workdir so ussd can run tasker

See merge request grassrootseconomics/cic-internal-integration!39
 2021-02-22 18:07:33 +00:00
Blair Vanderlugt 4d3cc85573 change workdir so it can run tasker 2021-02-22 09:51:57 -08:00
Blair Vanderlugt 10717df7d1 Merge branch 'bvander/fixes-to-contract-migration-deps' into 'master' 
run reset.sh outside docker and fix deps

See merge request grassrootseconomics/cic-internal-integration!38
 2021-02-22 15:14:36 +00:00
Blair Vanderlugt 3f2e0f5b2e run reset.sh outside docker and fix deps 2021-02-22 06:27:59 -08:00
Louis Holbrook 42ae8e5ed3 Merge branch 'lash/import-scripts-refactor' into 'master' 
Refactor import scripts

See merge request grassrootseconomics/cic-internal-integration!28
 2021-02-21 15:41:37 +00:00