-
a4885f56aa
Merge remote-tracking branch 'origin/master' into lash/admin-api-account-check
lash/admin-api-account-check
nolash
2021-02-12 17:35:02 +01:00
-
-
-
-
ec46fae39a
Add admin api method to check existence of signature ins tore
nolash
2021-02-12 17:34:43 +01:00
-
bc0450f39d
point build at dockerfile
Blair Vanderlugt
2021-02-12 08:21:58 -08:00
-
0345e2782f
cic-cache
Blair Vanderlugt
2021-02-12 08:19:14 -08:00
-
492faa87e5
add cache back in
Blair Vanderlugt
2021-02-12 07:49:00 -08:00
-
39433d67da
remove cic-cache submodule
Blair Vanderlugt
2021-02-12 07:48:25 -08:00
-
-
d042ce0dcd
Merge branch 'lash/correct-db-names' into 'master'
Blair Vanderlugt
2021-02-12 02:27:29 +00:00
-
-
22586a04bf
Correct db names and ports
Louis Holbrook
2021-02-12 02:27:29 +00:00
-
-
d3bdc850e5
Add abis back
lash/correct-db-names
nolash
2021-02-11 18:10:58 +01:00
-
33c00ed93b
Set cic-eth seed script to run sequentially after contract migration
nolash
2021-02-11 17:20:31 +01:00
-
449cd5830e
keys in the wrong place
Blair Vanderlugt
2021-02-11 07:33:13 -08:00
-
df3954fda5
Merge branch 'bvandernotify-build' into 'master'
Blair Vanderlugt
2021-02-11 15:24:34 +00:00
-
-
6d6285a897
Once AGAIN fix ports in docker compose
nolash
2021-02-11 15:49:56 +01:00
-
5216a18fbb
Merge remote-tracking branch 'origin/master' into lash/correct-db-names
nolash
2021-02-11 14:23:23 +01:00
-
-
-
-
2ec785488e
Correct db names in compose, cic-eth query var scope
nolash
2021-02-11 14:23:17 +01:00
-
6038d63501
Merge branch 'bvander/fix-mono-repo' into 'master'
Louis Holbrook
2021-02-11 10:14:30 +00:00
-
-
d409306e5e
Bvander/fix mono repo
Blair Vanderlugt
2021-02-11 10:14:30 +00:00
-
b1c3629549
Merge branch 'lash/rename-chainlib' into 'master'
Louis Holbrook
2021-02-11 08:30:21 +00:00
-
-
-
-
-
-
7b13725c26
Rename cic-tools to chainlib
lash/rename-chainlib
nolash
2021-02-11 09:20:01 +01:00
-
-
412ab5a186
Rename cic-tools to new location
lash/schmigration
nolash
2021-02-11 09:17:25 +01:00
-
ed063f0522
builds up
Blair Vanderlugt
2021-02-10 20:44:15 -08:00
-
-
0bdcb3b619
Correct host facing ports on docker compose
lash/port-fixes
nolash
2021-02-10 19:50:34 +01:00
-
-
-
98cdab4353
Merge branch 'philip/ussd-notify' into 'master'
Blair Vanderlugt
2021-02-10 17:48:24 +00:00
-
-
6051b55b9a
Philip/ussd notify
Philip Wafula
2021-02-10 17:48:24 +00:00
-
-
bf80443c8d
Add user generation script, import script
nolash
2021-02-10 17:56:31 +01:00
-
-
9c9f41ed4c
Merge branch 'lash/cic-eth-tasker-check-registry' into 'master'
Louis Holbrook
2021-02-10 07:03:11 +00:00
-
-
74e57b89ec
Add cic-eth and auxiliary contract seeding script
Louis Holbrook
2021-02-10 07:03:11 +00:00
-
1360f4d5f4
Merge branch 'lash/activate-websocket-services' into 'master'
Blair Vanderlugt
2021-02-10 03:04:09 +00:00
-
-
6c2975b93f
Merge branch 'bvanderlugt-master-patch-79072' into 'master'
Blair Vanderlugt
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
Blair Vanderlugt
2021-02-10 03:03:35 +00:00
-
-
38781f1a4c
Expose all apis on websockets
nolash
2021-02-09 22:37:20 +01:00
-
-
d636181479
Merge branch 'bvander/cic-meta-docker-compose' into 'master'
Blair Vanderlugt
2021-02-09 17:32:36 +00:00
-
-
8edb8c6dba
meta docker compose
Blair Vanderlugt
2021-02-09 17:32:36 +00:00
-
-
5c56e24490
Correct server host port defaults for cic-meta in dockerfile
bvander/cic-meta-docker-compose
nolash
2021-02-09 18:10:10 +01:00
-
7ff9b9d648
datatbase schema provisioning
Blair Vanderlugt
2021-02-09 08:24:47 -08:00
-
d991dfdb0c
docker compose and init scripts
Blair Vanderlugt
2021-02-09 07:26:02 -08:00
-
-
040fdf6e56
Merge branch 'lash/cic-eth-create-cli-fixes' into 'master'
Louis Holbrook
2021-02-08 22:38:18 +00:00
-
-
9eb436d2f8
Improve create account cli command
Louis Holbrook
2021-02-08 22:38:18 +00:00
-
-
a8bc258c36
Bump version
lash/cic-eth-create-cli-fixes
nolash
2021-02-08 23:26:38 +01:00
-
9a5ec4b892
Remove defaults in args for redis
nolash
2021-02-08 23:25:59 +01:00
-
-
c830f1722b
Merge branch 'lash/cic-eth-tool-cleanup' into 'master'
Louis Holbrook
2021-02-08 21:39:50 +00:00
-
-
c35247b8e6
Consolidate cic-eth tooling
Louis Holbrook
2021-02-08 21:39:50 +00:00
-
-
5874f05093
Merge branch 'lash/docker-compose' into 'master'
Blair Vanderlugt
2021-02-08 18:55:20 +00:00
-
-
9b45e8e31e
Environment revisions
Louis Holbrook
2021-02-08 18:55:20 +00:00
-
-
42674e00ff
Merge branch 'cic-meta-builds' into 'master'
Blair Vanderlugt
2021-02-08 17:31:29 +00:00
-
-
77077fe044
Cic meta builds
Blair Vanderlugt
2021-02-08 17:31:29 +00:00
-
-
1eeff6dc83
Merge branch 'lash/signer-rlp-bug' into 'master'
Blair Vanderlugt
2021-02-07 17:40:39 +00:00
-
-
3623f3f05b
Bump requirement for signer, fixing RLP bug
Louis Holbrook
2021-02-07 17:40:39 +00:00
-
-
e42e3b0bab
just cleanup
cleanup-cic-eth
Blair Vanderlugt
2021-02-06 18:48:12 -08:00
-
-
5bfc3e5796
Merge branch 'cic-notify-build' into 'master'
Blair Vanderlugt
2021-02-07 02:29:24 +00:00
-
-
cebdb24ed6
Cic notify build
Blair Vanderlugt
2021-02-07 02:29:24 +00:00
-
-
cdca4c6d9f
Dirty refactors to get integration working.
remove-submodule-cic-ussd
PhilipWafula
2021-02-06 23:16:22 +03:00
-
85f06aa445
Merge branch 'bvanderlugt-master-patch-66560' into 'master'
Blair Vanderlugt
2021-02-06 18:28:08 +00:00
-
-
be15ac6899
cic-ussd build
Blair Vanderlugt
2021-02-06 18:28:08 +00:00
-
-
047091367c
Merge branch 'lash/some-vars' into 'master'
Blair Vanderlugt
2021-02-06 16:29:27 +00:00
-
-
8b7802a67a
Copy keys, add missing vars in docker-compose
lash/some-vars
nolash
2021-02-06 17:26:20 +01:00
-
-
4d2b3cb639
Merge branch 'remove-submodule-cic-ussd' into 'master'
Blair Vanderlugt
2021-02-06 15:13:47 +00:00
-
-
f386625844
Remove submodule cic ussd
Blair Vanderlugt
2021-02-06 15:13:47 +00:00
-
-
cd4508e343
cic-ussd files
Blair Vanderlugt
2021-02-05 20:53:21 -08:00
-
a50e469eb6
add files
Blair Vanderlugt
2021-02-05 20:32:25 -08:00
-
f53d0857e8
remove submodule
Blair Vanderlugt
2021-02-05 20:32:11 -08:00
-
-
8680d57a67
Merge branch 'bvander/ussd-integration' into 'master'
Blair Vanderlugt
2021-02-06 03:27:59 +00:00
-
-
502caa1518
ussd configs
Blair Vanderlugt
2021-02-06 03:27:59 +00:00
-
-
e4c2b4e4f5
Update ci_templates/.cic-template.yml
Blair Vanderlugt
2021-02-06 02:15:34 +00:00
-
598e8cc442
Update ci_templates/.cic-template.yml
Blair Vanderlugt
2021-02-05 22:21:35 +00:00
-
5d44995de5
Update apps/contract-migration/.gitlab-ci.yml, apps/cic-eth/.gitlab-ci.yml files
Blair Vanderlugt
2021-02-05 20:49:15 +00:00
-
8198e51f73
sync cic-ussd to monorepo
Blair Vanderlugt
2021-02-05 08:26:18 -08:00
-
482aec165a
Update apps/contract-migration/.gitlab-ci.yml, apps/cic-eth/.gitlab-ci.yml files
Blair Vanderlugt
2021-02-05 16:06:31 +00:00
-
370f11c01b
Merge branch 'bvanderlugt-cic-eth-build-patch-76069' into 'master'
Blair Vanderlugt
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
Blair Vanderlugt
2021-02-05 15:53:15 +00:00
-
-
49f4acaa01
Merge branch 'cic-eth-build' into 'master'
Blair Vanderlugt
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
Blair Vanderlugt
2021-02-04 04:36:32 +00:00
-
-
59d70d76cb
Merge branch 'bvander/bloxberg-refactor' into 'master'
Blair Vanderlugt
2021-02-04 01:34:56 +00:00
-
-
f7690f35db
add
Blair Vanderlugt
2021-02-02 08:31:43 -08:00
-
a061d36c3f
delete
Blair Vanderlugt
2021-02-02 08:31:13 -08:00
-
5294af8fdb
Merge branch 'master' of gitlab.com:grassrootseconomics/cic-internal-integration into bvander/bloxberg-refactor
Blair Vanderlugt
2021-02-02 08:29:16 -08:00
-
-
-
-
5e44ad59c5
remove bloxberg submodule
Blair Vanderlugt
2021-02-02 08:27:55 -08:00
-
e8374fd6da
Merge branch 'bvander/local-container-envs' into 'master'
Blair Vanderlugt
2021-02-02 16:23:57 +00:00
-
-
ec2e341e60
config volumes
Blair Vanderlugt
2021-02-02 08:23:12 -08:00
-
-
210a4ef7c1
Replace defaults
lash/docker-compose
nolash
2021-02-01 21:36:14 +01:00
-
d7f10d54d1
Environment revisions
nolash
2021-02-01 21:22:37 +01:00
-
-
a4587deac5
adding cic-eth as sub dir
Blair Vanderlugt
2021-02-01 09:12:51 -08:00
-
ed3991e997
forcing cic-eth to resync
Blair Vanderlugt
2021-02-01 09:06:14 -08:00
-
ac41db0191
bloxberg update
Blair Vanderlugt
2021-02-01 09:03:24 -08:00
-
a91b5c3ca5
docker compose eth keys
Blair Vanderlugt
2021-02-01 09:02:59 -08:00
-
052dbe25f4
updated bloxberg keys
Blair Vanderlugt
2021-02-01 08:56:36 -08:00
-
1212747b9f
remove cic-eth
Blair Vanderlugt
2021-02-01 08:53:34 -08:00
-
98fea29f90
updating bloxberg validator
Blair Vanderlugt
2021-02-01 08:38:47 -08:00
-
6ff5f5485b
welcome bloxberg
Blair Vanderlugt
2021-02-01 08:35:35 -08:00
-
99665014ed
build merge
Blair Vanderlugt
2021-01-31 17:10:17 -08:00
-
-
7451042b4b
setting up parity node
Blair Vanderlugt
2021-01-31 17:08:45 -08:00
-
5c94278338
Update .gitlab-ci.yml
Blair Vanderlugt
2021-01-29 16:02:22 +00:00
-
-
b7324011db
sumodule stuff
Blair Vanderlugt
2021-01-29 07:53:54 -08:00
-
337a159153
minor change
Blair Vanderlugt
2021-01-29 07:51:36 -08:00
-
42d8f81206
cic-eth updated
Blair Vanderlugt
2021-01-29 07:44:17 -08:00
-
aaeb0bd6f8
updating cic-eth build
Blair Vanderlugt
2021-01-29 07:39:42 -08:00
-
7d593a1196
updating cic-eth
Blair Vanderlugt
2021-01-29 06:05:01 -08:00
-
a2e7cf71de
updates
Blair Vanderlugt
2021-01-28 20:26:08 -08:00
-
21605a14fe
bee password
Blair Vanderlugt
2021-01-25 18:25:24 -08:00
-
03dd3190b6
docker stuff
Blair Vanderlugt
2021-01-25 18:22:53 -08:00