| 
							
							
								 Louis Holbrook | 9b79034ed3 | Minimal dependencies in cic-eth api setup | 2021-07-07 07:45:21 +00:00 |  | 
			
				
					|  | b7d5c6799f | Merge branch 'bvander/data-seeding-updates' into 'master' data-seeding image updates and tweak meta import
See merge request grassrootseconomics/cic-internal-integration!212 | 2021-07-05 17:14:47 +00:00 |  | 
			
				
					|  | eef8bb2cf7 | data-seeding image updates and tweak meta import | 2021-07-05 17:14:46 +00:00 |  | 
			
				
					|  | cf96fee430 | Merge branch 'bvander/contract-migration-caching' into 'master' refactor contract-migration and add buildkit caching
See merge request grassrootseconomics/cic-internal-integration!211 | 2021-07-05 17:13:27 +00:00 |  | 
			
				
					|  | 9740963431 | refactor contract-migration and add buildkit caching | 2021-07-05 17:13:26 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | a3c4932488 | Merge branch 'lash/new-sarafu-token' into 'master' Add flavors of demurrage token to dev deployment
See merge request grassrootseconomics/cic-internal-integration!181 | 2021-07-05 10:58:08 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | aa667951be | Add flavors of demurrage token to dev deployment | 2021-07-05 10:58:08 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | c2459cfd65 | Merge branch 'lash/traffic' into 'master' data-seeding: Rehabilitate traffic scripts
See merge request grassrootseconomics/cic-internal-integration!213 | 2021-07-04 17:19:21 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | e7102ff02d | data-seeding: Rehabilitate traffic scripts | 2021-07-04 17:19:21 +00:00 |  | 
			
				
					|  | a942c785f6 | Merge branch 'philip/improving-import-scripts-logging' into 'master' Improves import scripts logging
Closes #74
See merge request grassrootseconomics/cic-internal-integration!207 | 2021-07-03 16:55:51 +00:00 |  | 
			
				
					|  | 70704b09ec | Improves import scripts logging | 2021-07-03 16:55:51 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | a075c55957 | Merge branch 'lash/allowance' into 'master' Add allowance check and transferFrom task
See merge request grassrootseconomics/cic-internal-integration!203 | 2021-06-30 18:15:40 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | 6464f651ec | Add allowance check and transferFrom task | 2021-06-30 18:15:40 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | 5145282946 | Merge branch 'lash/faucet-verif' into 'master' Consider faucet amount in verify balance
See merge request grassrootseconomics/cic-internal-integration!206 | 2021-06-30 18:14:53 +00:00 |  | 
			
				
					| 
							
							
								 nolash | 1e87f2ed31 | Consider faucet amount in verify balance | 2021-06-30 17:22:26 +02:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | c852f41d76 | Merge branch 'lash/move-to-chainlib-eth' into 'master' Move to chainlib-eth dependency
See merge request grassrootseconomics/cic-internal-integration!199 | 2021-06-30 14:44:18 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | f8e68cff96 | Move to chainlib-eth dependency | 2021-06-30 14:44:17 +00:00 |  | 
			
				
					|  | 7027d77836 | Merge branch 'philip/refactor-integration-tests' into 'master' Philip/refactor integration tests
See merge request grassrootseconomics/cic-internal-integration!182 | 2021-06-30 14:27:56 +00:00 |  | 
			
				
					|  | d356f8167d | Philip/refactor integration tests | 2021-06-30 14:27:56 +00:00 |  | 
			
				
					|  | 753d21fe95 | Merge branch 'bvander/data-seeding-build-improvements' into 'master' uses the new base image
See merge request grassrootseconomics/cic-internal-integration!204 | 2021-06-29 17:17:18 +00:00 |  | 
			
				
					|  | 3b6e031746 | Merge branch 'philip/db-session-management' into 'master' Philip/db session management
Closes cic-ussd#53
See merge request grassrootseconomics/cic-internal-integration!193 | 2021-06-29 10:49:25 +00:00 |  | 
			
				
					|  | b1d5d45eef | Philip/db session management | 2021-06-29 10:49:25 +00:00 |  | 
			
				
					|  | 53317cb912 | Merge branch 'philip/notify-queue-setting' into 'master' Enable api level setting of queue value.
See merge request grassrootseconomics/cic-internal-integration!184 | 2021-06-29 10:21:43 +00:00 |  | 
			
				
					|  | 18382a1f35 | Merge branch 'bvander/integration-notes' into 'master' integration updates: meta imports
See merge request grassrootseconomics/cic-internal-integration!201 | 2021-06-28 22:40:54 +00:00 |  | 
			
				
					|  | 29e91fafab | integration updates: meta imports | 2021-06-28 22:40:54 +00:00 |  | 
			
				
					|  | 5b20a9a24a | Merge branch 'bvander/better-data-seeding-container' into 'master' add key store and vars
See merge request grassrootseconomics/cic-internal-integration!202 | 2021-06-28 22:40:04 +00:00 |  | 
			
				
					|  | a252195bdc | uses the new base image | 2021-06-28 10:56:15 -07:00 |  | 
			
				
					| 
							
							
								 Spencer Ofwiti | f1be3b633c | Merge branch 'lash/downgrade-chainsyncer' into 'master' Downgrade chainsyncer
See merge request grassrootseconomics/cic-internal-integration!200 | 2021-06-28 15:36:56 +00:00 |  | 
			
				
					| 
							
							
								 nolash | e59a71188c | Downgrade chainsyncer | 2021-06-28 17:18:52 +02:00 |  | 
			
				
					|  | 1d0eb06f2f | Merge branch 'bvander/data-seeding-keystore' into 'master' add keystore
See merge request grassrootseconomics/cic-internal-integration!197 | 2021-06-26 17:12:46 +00:00 |  | 
			
				
					|  | 57127132b5 | add keystore | 2021-06-26 09:50:58 -07:00 |  | 
			
				
					|  | 0bf2c35fcd | add key store and vars | 2021-06-26 09:50:03 -07:00 |  | 
			
				
					|  | d046595764 | Merge branch 'philip/remove-hardcoded-import-script-configs' into 'master' Refactors hardcoded config vars.
See merge request grassrootseconomics/cic-internal-integration!196 | 2021-06-26 15:58:07 +00:00 |  | 
			
				
					|  | 9dd7ec88fd | Refactors hardcoded config vars. | 2021-06-26 18:51:25 +03:00 |  | 
			
				
					|  | 282fd2ff52 | Merge branch 'bvander/better-data-seeding-container' into 'master' fix paths for data seeding container
See merge request grassrootseconomics/cic-internal-integration!195 | 2021-06-25 23:06:25 +00:00 |  | 
			
				
					|  | 8f85598861 | fix paths and stuff | 2021-06-25 15:59:10 -07:00 |  | 
			
				
					|  | 8529c349ca | Merge branch 'philip/fix-import-script-pointers' into 'master' Philip/fix import script pointers
See merge request grassrootseconomics/cic-internal-integration!194 | 2021-06-25 15:36:06 +00:00 |  | 
			
				
					|  | 4368d2bf59 | Philip/fix import script pointers | 2021-06-25 15:36:05 +00:00 |  | 
			
				
					|  | da3c812bf5 | Merge branch 'philip/add-age-metadata' into 'master' Philip/add age metadata
See merge request grassrootseconomics/cic-internal-integration!186 | 2021-06-23 13:25:09 +00:00 |  | 
			
				
					|  | 82b1e87462 | Philip/add age metadata | 2021-06-23 13:25:09 +00:00 |  | 
			
				
					|  | e13c423daf | Merge branch 'philip/custom-metadata' into 'master' Philip/custom metadata
See merge request grassrootseconomics/cic-internal-integration!192 | 2021-06-23 08:54:34 +00:00 |  | 
			
				
					|  | 56b3bd751d | Philip/custom metadata | 2021-06-23 08:54:34 +00:00 |  | 
			
				
					|  | 4f41c5bacf | Merge branch 'philip/notify-sender-id-resolution' into 'master' Handle empty string defaults in kubernetes secrets.
See merge request grassrootseconomics/cic-internal-integration!183 | 2021-06-23 07:02:22 +00:00 |  | 
			
				
					|  | 07583f0c3b | Handle empty string defaults in kubernetes secrets. | 2021-06-23 07:02:22 +00:00 |  | 
			
				
					|  | 0ae912082c | Merge branch 'philip/refactor-phone-number-input-handling' into 'master' Refactors handling of phone number inputs during transactions
See merge request grassrootseconomics/cic-internal-integration!185 | 2021-06-23 06:44:01 +00:00 |  | 
			
				
					|  | 094f4d4298 | Refactors handling of phone number inputs during transactions | 2021-06-23 06:44:01 +00:00 |  | 
			
				
					| 
							
							
								 Spencer Ofwiti | 9471b1d8ab | Merge branch 'spencer/fix-import-scripts-build' into 'master' Fix build process for import scripts.
See merge request grassrootseconomics/cic-internal-integration!188 | 2021-06-23 05:49:06 +00:00 |  | 
			
				
					| 
							
							
								 Spencer Ofwiti | 57100366d8 | Fix build process for import scripts. | 2021-06-23 05:49:06 +00:00 |  | 
			
				
					|  | 71e0973020 | Merge branch 'lash/check-import-ussd' into 'master' Rehabilitate ussd import scripts
Closes #57
See merge request grassrootseconomics/cic-internal-integration!166 | 2021-06-23 04:29:39 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | 12ab5c2f66 | Rehabilitate ussd import scripts | 2021-06-23 04:29:38 +00:00 |  |