|
|
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 |
|
|
|
502caa1518
|
ussd configs
|
2021-02-06 03:27:59 +00:00 |
|
|
|
e4c2b4e4f5
|
Update ci_templates/.cic-template.yml
|
2021-02-06 02:15:34 +00:00 |
|
|
|
598e8cc442
|
Update ci_templates/.cic-template.yml
|
2021-02-05 22:21:35 +00:00 |
|
|
|
5d44995de5
|
Update apps/contract-migration/.gitlab-ci.yml, apps/cic-eth/.gitlab-ci.yml files
|
2021-02-05 20:49:15 +00:00 |
|
|
|
8198e51f73
|
sync cic-ussd to monorepo
|
2021-02-05 08:26:18 -08:00 |
|
|
|
482aec165a
|
Update apps/contract-migration/.gitlab-ci.yml, apps/cic-eth/.gitlab-ci.yml files
|
2021-02-05 16:06:31 +00:00 |
|
|
|
370f11c01b
|
Merge branch 'bvanderlugt-cic-eth-build-patch-76069' into 'master'
flesh out the build steps
See merge request grassrootseconomics/cic-internal-integration!5
|
2021-02-05 15:53:15 +00:00 |
|
|
|
9a9d8e9033
|
Update apps/cic-eth/.gitlab-ci.yml, ci_templates/.cic-template.yml, apps/contract-migration/.gitlab-ci.yml files
|
2021-02-05 15:53:15 +00:00 |
|
|
|
49f4acaa01
|
Merge branch 'cic-eth-build' into 'master'
Update .gitlab-ci.yml
See merge request grassrootseconomics/cic-internal-integration!4
|
2021-02-04 04:36:32 +00:00 |
|
|
|
7083045a74
|
Update apps/cic-eth/.gitlab-ci.yml, ci_templates/.cic-template.yml, apps/contract-migration/.gitlab-ci.yml files
|
2021-02-04 04:36:32 +00:00 |
|
|
|
59d70d76cb
|
Merge branch 'bvander/bloxberg-refactor' into 'master'
Bvander/bloxberg refactor
See merge request grassrootseconomics/cic-internal-integration!3
|
2021-02-04 01:34:56 +00:00 |
|
|
|
f7690f35db
|
add
|
2021-02-02 08:31:43 -08:00 |
|
|
|
a061d36c3f
|
delete
|
2021-02-02 08:31:13 -08:00 |
|
|
|
5294af8fdb
|
Merge branch 'master' of gitlab.com:grassrootseconomics/cic-internal-integration into bvander/bloxberg-refactor
|
2021-02-02 08:29:16 -08:00 |
|
|
|
5e44ad59c5
|
remove bloxberg submodule
|
2021-02-02 08:27:55 -08:00 |
|
|
|
e8374fd6da
|
Merge branch 'bvander/local-container-envs' into 'master'
config volumes
See merge request grassrootseconomics/cic-internal-integration!2
|
2021-02-02 16:23:57 +00:00 |
|
|
|
ec2e341e60
|
config volumes
|
2021-02-02 08:23:12 -08:00 |
|
|
|
a4587deac5
|
adding cic-eth as sub dir
|
2021-02-01 09:12:51 -08:00 |
|
|
|
ed3991e997
|
forcing cic-eth to resync
|
2021-02-01 09:06:14 -08:00 |
|
|
|
ac41db0191
|
bloxberg update
|
2021-02-01 09:03:24 -08:00 |
|
|
|
a91b5c3ca5
|
docker compose eth keys
|
2021-02-01 09:02:59 -08:00 |
|
|
|
052dbe25f4
|
updated bloxberg keys
|
2021-02-01 08:56:36 -08:00 |
|
|
|
1212747b9f
|
remove cic-eth
|
2021-02-01 08:53:34 -08:00 |
|
|
|
98fea29f90
|
updating bloxberg validator
|
2021-02-01 08:38:47 -08:00 |
|
|
|
6ff5f5485b
|
welcome bloxberg
|
2021-02-01 08:35:35 -08:00 |
|
|
|
99665014ed
|
build merge
|
2021-01-31 17:10:17 -08:00 |
|
