| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7451042b4b
							
						
					 | 
					
						
						
							
							setting up parity node
						
						
						
						
						
					 | 
					
						2021-01-31 17:08:45 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5c94278338
							
						
					 | 
					
						
						
							
							Update .gitlab-ci.yml
						
						
						
						
						
					 | 
					
						2021-01-29 16:02:22 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b7324011db
							
						
					 | 
					
						
						
							
							sumodule stuff
						
						
						
						
						
					 | 
					
						2021-01-29 07:53:54 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							337a159153
							
						
					 | 
					
						
						
							
							minor change
						
						
						
						
						
					 | 
					
						2021-01-29 07:51:36 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							42d8f81206
							
						
					 | 
					
						
						
							
							cic-eth updated
						
						
						
						
						
					 | 
					
						2021-01-29 07:44:17 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							aaeb0bd6f8
							
						
					 | 
					
						
						
							
							updating cic-eth build
						
						
						
						
						
					 | 
					
						2021-01-29 07:39:42 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7d593a1196
							
						
					 | 
					
						
						
							
							updating cic-eth
						
						
						
						
						
					 | 
					
						2021-01-29 06:05:01 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a2e7cf71de
							
						
					 | 
					
						
						
							
							updates
						
						
						
						
						
					 | 
					
						2021-01-28 20:26:08 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							21605a14fe
							
						
					 | 
					
						
						
							
							bee password
						
						
						
						
						
					 | 
					
						2021-01-25 18:25:24 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							03dd3190b6
							
						
					 | 
					
						
						
							
							docker stuff
						
						
						
						
						
					 | 
					
						2021-01-25 18:22:53 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							897e0b8fbc
							
						
					 | 
					
						
						
							
							docker compose setup
						
						
						
						
						
					 | 
					
						2021-01-25 08:21:30 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fc18b94e70
							
						
					 | 
					
						
						
							
							Update .gitlab-ci.yml
						
						
						
						
						
					 | 
					
						2021-01-24 20:44:46 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f661ce2c1a
							
						
					 | 
					
						
						
							
							Update ci_templates/.cic-base.yml
						
						
						
						
						
					 | 
					
						2021-01-24 20:38:11 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							016b5d3230
							
						
					 | 
					
						
						
							
							Update apps/contract-migration/.gitlab-ci.yml
						
						
						
						
						
					 | 
					
						2021-01-24 20:37:00 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cfc569bd90
							
						
					 | 
					
						
						
							
							add in cluster modules
						
						
						
						
						
					 | 
					
						2021-01-24 12:19:22 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8a8458ac8b
							
						
					 | 
					
						
						
							
							init
						
						
						
						
						
					 | 
					
						2021-01-24 12:16:22 -08:00 | 
					
					
						
						
							
							
							
						
					 |