Louis Holbrook
|
6c1382aac6
|
Merge branch 'lash/complex-balance' into 'master'
cic-eth: Complex balance
See merge request grassrootseconomics/cic-internal-integration!29
|
2021-02-17 10:04:21 +00:00 |
|
Louis Holbrook
|
ab7b5fbeb9
|
cic-eth: Complex balance
|
2021-02-17 10:04:21 +00:00 |
|
Louis Holbrook
|
c6bcda8832
|
Merge branch 'lash/cic-eth-cic-cache-txs' into 'master'
cic-eth: Integrate transaction list queries
See merge request grassrootseconomics/cic-internal-integration!30
|
2021-02-17 09:33:18 +00:00 |
|
Louis Holbrook
|
be3c59a780
|
cic-eth: Integrate transaction list queries
|
2021-02-17 09:33:18 +00:00 |
|
Louis Holbrook
|
fcde3d0bb2
|
Merge branch 'lash/cic-eth-revert-hex-values-db' into 'master'
cic-eth: Revert number as hex in tx-cache
See merge request grassrootseconomics/cic-internal-integration!31
|
2021-02-17 08:30:10 +00:00 |
|
Louis Holbrook
|
500f0c3a41
|
cic-eth: Revert number as hex in tx-cache
|
2021-02-17 08:30:10 +00:00 |
|
Louis Holbrook
|
fa83c50ab5
|
Merge branch 'lash/cic-eth-address-translator' into 'master'
cic-eth: Address translator task
See merge request grassrootseconomics/cic-internal-integration!34
|
2021-02-17 08:19:42 +00:00 |
|
Louis Holbrook
|
f154136dd3
|
cic-eth: Address translator task
|
2021-02-17 08:19:42 +00:00 |
|
Louis Holbrook
|
d493cebc7c
|
Merge branch 'lash/admin-api-account-check' into 'master'
Add admin api account check method
See merge request grassrootseconomics/cic-internal-integration!27
|
2021-02-15 11:06:28 +00:00 |
|
Louis Holbrook
|
d798f78d7f
|
Add admin api account check method
|
2021-02-15 11:06:28 +00:00 |
|
Louis Holbrook
|
d872e78e39
|
Merge branch 'lash/cic-eth-status-enum-bitfield' into 'master'
Translate StatusEnum to flags instead of number ranges
See merge request grassrootseconomics/cic-internal-integration!14
|
2021-02-13 17:01:48 +00:00 |
|
Louis Holbrook
|
14f29c4c32
|
Translate StatusEnum to flags instead of number ranges
|
2021-02-13 17:01:48 +00:00 |
|
|
|
d042ce0dcd
|
Merge branch 'lash/correct-db-names' into 'master'
Correct db names and ports
See merge request grassrootseconomics/cic-internal-integration!25
|
2021-02-12 02:27:29 +00:00 |
|
Louis Holbrook
|
22586a04bf
|
Correct db names and ports
|
2021-02-12 02:27:29 +00:00 |
|
|
|
449cd5830e
|
keys in the wrong place
|
2021-02-11 07:33:13 -08:00 |
|
|
|
df3954fda5
|
Merge branch 'bvandernotify-build' into 'master'
cic-notify build
See merge request grassrootseconomics/cic-internal-integration!23
|
2021-02-11 15:24:34 +00:00 |
|
Louis Holbrook
|
6038d63501
|
Merge branch 'bvander/fix-mono-repo' into 'master'
Bvander/fix mono repo
See merge request grassrootseconomics/cic-internal-integration!21
|
2021-02-11 10:14:30 +00:00 |
|
|
|
d409306e5e
|
Bvander/fix mono repo
|
2021-02-11 10:14:30 +00:00 |
|
Louis Holbrook
|
b1c3629549
|
Merge branch 'lash/rename-chainlib' into 'master'
Rename cic-tools to chainlib
See merge request grassrootseconomics/cic-internal-integration!24
|
2021-02-11 08:30:21 +00:00 |
|
nolash
|
7b13725c26
|
Rename cic-tools to chainlib
|
2021-02-11 09:20:01 +01:00 |
|
|
|
ed063f0522
|
builds up
|
2021-02-10 20:44:15 -08:00 |
|
|
|
98cdab4353
|
Merge branch 'philip/ussd-notify' into 'master'
Philip/ussd notify
See merge request grassrootseconomics/cic-internal-integration!11
|
2021-02-10 17:48:24 +00:00 |
|
|
|
6051b55b9a
|
Philip/ussd notify
|
2021-02-10 17:48:24 +00:00 |
|
Louis Holbrook
|
9c9f41ed4c
|
Merge branch 'lash/cic-eth-tasker-check-registry' into 'master'
Add cic-eth and auxiliary contract seeding script
See merge request grassrootseconomics/cic-internal-integration!16
|
2021-02-10 07:03:11 +00:00 |
|
Louis Holbrook
|
74e57b89ec
|
Add cic-eth and auxiliary contract seeding script
|
2021-02-10 07:03:11 +00:00 |
|
|
|
1360f4d5f4
|
Merge branch 'lash/activate-websocket-services' into 'master'
bloxbergValidatorSetup: Expose all apis on websockets
See merge request grassrootseconomics/cic-internal-integration!20
|
2021-02-10 03:04:09 +00:00 |
|
|
|
6c2975b93f
|
Merge branch 'bvanderlugt-master-patch-79072' into 'master'
Update apps/cic-meta/.gitlab-ci.yml, apps/cic-eth/.gitlab-ci.yml,...
See merge request grassrootseconomics/cic-internal-integration!19
|
2021-02-10 03:03:35 +00:00 |
|
|
|
81e9128446
|
Update apps/cic-meta/.gitlab-ci.yml, apps/cic-eth/.gitlab-ci.yml, apps/cic-notify/.gitlab-ci.yml, apps/cic-ussd/.gitlab-ci.yml, apps/contract-migration/.gitlab-ci.yml files
|
2021-02-10 03:03:35 +00:00 |
|
nolash
|
38781f1a4c
|
Expose all apis on websockets
|
2021-02-09 22:37:20 +01:00 |
|
|
|
d636181479
|
Merge branch 'bvander/cic-meta-docker-compose' into 'master'
meta docker compose
See merge request grassrootseconomics/cic-internal-integration!18
|
2021-02-09 17:32:36 +00:00 |
|
|
|
8edb8c6dba
|
meta docker compose
|
2021-02-09 17:32:36 +00:00 |
|
Louis Holbrook
|
040fdf6e56
|
Merge branch 'lash/cic-eth-create-cli-fixes' into 'master'
Improve create account cli command
See merge request grassrootseconomics/cic-internal-integration!17
|
2021-02-08 22:38:18 +00:00 |
|
Louis Holbrook
|
9eb436d2f8
|
Improve create account cli command
|
2021-02-08 22:38:18 +00:00 |
|
Louis Holbrook
|
c830f1722b
|
Merge branch 'lash/cic-eth-tool-cleanup' into 'master'
Consolidate cic-eth tooling
See merge request grassrootseconomics/cic-internal-integration!15
|
2021-02-08 21:39:50 +00:00 |
|
Louis Holbrook
|
c35247b8e6
|
Consolidate cic-eth tooling
|
2021-02-08 21:39:50 +00:00 |
|
|
|
5874f05093
|
Merge branch 'lash/docker-compose' into 'master'
Environment revisions
See merge request grassrootseconomics/cic-internal-integration!1
|
2021-02-08 18:55:20 +00:00 |
|
Louis Holbrook
|
9b45e8e31e
|
Environment revisions
|
2021-02-08 18:55:20 +00:00 |
|
|
|
42674e00ff
|
Merge branch 'cic-meta-builds' into 'master'
Cic meta builds
See merge request grassrootseconomics/cic-internal-integration!13
|
2021-02-08 17:31:29 +00:00 |
|
|
|
77077fe044
|
Cic meta builds
|
2021-02-08 17:31:29 +00:00 |
|
|
|
1eeff6dc83
|
Merge branch 'lash/signer-rlp-bug' into 'master'
Bump requirement for signer, fixing RLP bug
See merge request grassrootseconomics/cic-internal-integration!12
|
2021-02-07 17:40:39 +00:00 |
|
Louis Holbrook
|
3623f3f05b
|
Bump requirement for signer, fixing RLP bug
|
2021-02-07 17:40:39 +00:00 |
|
|
|
5bfc3e5796
|
Merge branch 'cic-notify-build' into 'master'
Cic notify build
See merge request grassrootseconomics/cic-internal-integration!10
|
2021-02-07 02:29:24 +00:00 |
|
|
|
cebdb24ed6
|
Cic notify build
|
2021-02-07 02:29:24 +00:00 |
|
|
|
85f06aa445
|
Merge branch 'bvanderlugt-master-patch-66560' into 'master'
cic-ussd build
See merge request grassrootseconomics/cic-internal-integration!9
|
2021-02-06 18:28:08 +00:00 |
|
|
|
be15ac6899
|
cic-ussd build
|
2021-02-06 18:28:08 +00:00 |
|
|
|
047091367c
|
Merge branch 'lash/some-vars' into 'master'
Copy keys, add missing vars in docker-compose
See merge request grassrootseconomics/cic-internal-integration!8
|
2021-02-06 16:29:27 +00:00 |
|
nolash
|
8b7802a67a
|
Copy keys, add missing vars in docker-compose
|
2021-02-06 17:26:20 +01:00 |
|
|
|
4d2b3cb639
|
Merge branch 'remove-submodule-cic-ussd' into 'master'
Remove submodule cic ussd
See merge request grassrootseconomics/cic-internal-integration!7
|
2021-02-06 15:13:47 +00:00 |
|
|
|
f386625844
|
Remove submodule cic ussd
|
2021-02-06 15:13:47 +00:00 |
|
|
|
8680d57a67
|
Merge branch 'bvander/ussd-integration' into 'master'
ussd configs
See merge request grassrootseconomics/cic-internal-integration!6
|
2021-02-06 03:27:59 +00:00 |
|
