| 
							
							
								 Louis Holbrook | 5fb0f4a2e9 | Merge branch 'lash/horse-cart' into 'master' Fix false offset limit error
Closes #60
See merge request grassrootseconomics/cic-internal-integration!174 | 2021-06-02 15:27:30 +00:00 |  | 
			
				
					| 
							
							
								 nolash | 41a96b5584 | Int comparisons on block numbers in cic cache lookup | 2021-06-02 17:11:15 +02:00 |  | 
			
				
					| 
							
							
								 Geoff Turk | d0f2bc0120 | Merge branch 'geoffturk/mock-data' into 'master' Add better mocked data
See merge request grassrootseconomics/cic-internal-integration!172 | 2021-06-02 14:59:00 +00:00 |  | 
			
				
					| 
							
							
								 Geoff Turk | e2946052e0 | Add more better mocked data | 2021-06-02 14:53:53 +02:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | 546d69f1e9 | Merge branch 'lash/coveralls-that-coverall' into 'master' cic-eth: Reach 90% test coverage
Closes cic-eth#125
See merge request grassrootseconomics/cic-internal-integration!168 | 2021-05-31 15:34:17 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | fbf7351238 | cic-eth: Reach 90% test coverage | 2021-05-31 15:34:16 +00:00 |  | 
			
				
					| 
							
							
								 Geoff Turk | b886384fa8 | Merge branch 'geoffturk/fix-traffic' into 'master' Fix traffic script
See merge request grassrootseconomics/cic-internal-integration!170 | 2021-05-27 10:38:08 +00:00 |  | 
			
				
					| 
							
							
								 Geoff Turk | 277033f3b5 | Fix traffic script | 2021-05-27 10:38:07 +00:00 |  | 
			
				
					|  | 4ae094fd30 | Merge branch 'cic-eth-unittest' into 'master' Unit tests for cic-eth
See merge request grassrootseconomics/cic-internal-integration!164 | 2021-05-25 16:22:26 +00:00 |  | 
			
				
					|  | cb239f112a | Unit tests for cic-eth | 2021-05-25 16:22:26 +00:00 |  | 
			
				
					| 
							
							
								 Geoff Turk | d971a6eded | Merge branch 'fix-meta-data-seeding' into 'master' Fix path to PGP exports directory
See merge request grassrootseconomics/cic-internal-integration!165 | 2021-05-21 16:42:21 +00:00 |  | 
			
				
					| 
							
							
								 Spencer Ofwiti | b0a6df0177 | Merge branch 'spencer/metadata-identifiers' into 'master' Add meta update cli tool.
See merge request grassrootseconomics/cic-internal-integration!138 | 2021-05-21 09:42:08 +00:00 |  | 
			
				
					| 
							
							
								 Spencer Ofwiti | 92c9df4e19 | Add meta update cli tool. | 2021-05-21 09:42:08 +00:00 |  | 
			
				
					| 
							
							
								 Geoff Turk | 9c49d568e0 | Fix path to PGP exports directory | 2021-05-21 10:51:32 +02:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | d7113f3923 | Merge branch 'lash/rehabilitate-traffic-2' into 'master' Rehabilitate traffic generator script
See merge request grassrootseconomics/cic-internal-integration!145 | 2021-05-20 21:25:15 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | c569fe4b17 | Rehabilitate traffic generator script | 2021-05-20 21:25:14 +00:00 |  | 
			
				
					|  | 1c650df27d | Merge branch 'bvander/move-scripts-to-e2e-folder' into 'master' move files out of scripts folder to their own dir
See merge request grassrootseconomics/cic-internal-integration!137 | 2021-05-20 14:31:08 +00:00 |  | 
			
				
					|  | a31b7bc9cd | move files out of scripts folder to their own dir | 2021-05-20 14:31:08 +00:00 |  | 
			
				
					| 
							
							
								 Geoff Turk | 78ff58c1a2 | Merge branch 'geoff/data-success' into 'master' Add success field to transactions_all_data
See merge request grassrootseconomics/cic-internal-integration!163 | 2021-05-20 10:28:07 +00:00 |  | 
			
				
					|  | 1676addbeb | Merge branch 'philip/meta-cluster-bug' into 'master' Refactors to handle error in metadata handling
Closes cic-ussd#45
See merge request grassrootseconomics/cic-internal-integration!160 | 2021-05-19 16:25:10 +00:00 |  | 
			
				
					|  | 1efc25ac15 | Refactors to handle error in metadata handling | 2021-05-19 16:25:10 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | db2ec0dcfa | Merge branch 'philip/notify-errors' into 'master' Philip/notify errors
Closes cic-notify#4
See merge request grassrootseconomics/cic-internal-integration!161 | 2021-05-19 16:13:06 +00:00 |  | 
			
				
					|  | 5148e6428b | Philip/notify errors | 2021-05-19 16:13:06 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | 0c186ed968 | Merge branch 'lash/rehabilitate-tests-eth' into 'master' Fix outdated module names in cic-eth tests
See merge request grassrootseconomics/cic-internal-integration!162 | 2021-05-19 15:11:08 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | c44439bd90 | Fix outdated module names in cic-eth tests | 2021-05-19 15:11:08 +00:00 |  | 
			
				
					| 
							
							
								 Geoff Turk | 0411603078 | Add success field to transactions_all_data | 2021-05-19 16:47:22 +02:00 |  | 
			
				
					|  | eee895ea71 | Merge branch 'willruddick-master-patch-91858' into 'master' small updates. note other gender
See merge request grassrootseconomics/cic-internal-integration!154 | 2021-05-19 10:26:52 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | a5ca898532 | Merge branch 'lash/update-contracts-in-migration-2' into 'master' imports: Fix stale dep in sovereign import users script
See merge request grassrootseconomics/cic-internal-integration!149 | 2021-05-19 09:57:03 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | 6d8508aebf | imports: Fix stale dep in sovereign import users script | 2021-05-19 09:57:02 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | f8f66984d2 | Merge branch 'lash/no-ussd-contamination' into 'master' Isolate ussd-related data files in imports
See merge request grassrootseconomics/cic-internal-integration!150 | 2021-05-19 09:55:24 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | 0f02dd1b7c | Isolate ussd-related data files in imports | 2021-05-19 09:55:24 +00:00 |  | 
			
				
					|  | 63a4a82ab0 | Merge branch 'philip/replicate-wills-changes' into 'master' Replicates changes in broken MR by will.
See merge request grassrootseconomics/cic-internal-integration!158 | 2021-05-19 08:25:19 +00:00 |  | 
			
				
					|  | 949c1070a9 | Replicates changes in broken MR by will. | 2021-05-19 11:19:29 +03:00 |  | 
			
				
					|  | 5d9fbe9b64 | Merge branch 'willruddick-master-patch-28332' into 'master' shortened and changed service code
See merge request grassrootseconomics/cic-internal-integration!152 | 2021-05-19 07:47:09 +00:00 |  | 
			
				
					|  | 873a3f082a | shortened and changed service code | 2021-05-19 07:47:09 +00:00 |  | 
			
				
					|  | 7b408cf564 | Merge branch 'willruddick-master-patch-28450' into 'master' small changes, note the 'other' gender
See merge request grassrootseconomics/cic-internal-integration!151 | 2021-05-19 07:33:37 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | 9dfbd7034c | Merge branch 'lash/decimals-in-api' into 'master' cic-eth-tasker: Add decimals and token name to default token api call return struct
Closes cic-eth#123
See merge request grassrootseconomics/cic-internal-integration!148 | 2021-05-19 06:59:43 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | 235f5cede8 | cic-eth-tasker: Add decimals and token name to default token api call return struct | 2021-05-19 06:59:42 +00:00 |  | 
			
				
					| 
							
							
								 Geoff Turk | 0a59539f9a | Merge branch 'lash/cache-data-api' into 'master' cic-cache: Add data API
Closes cic-cache#11
See merge request grassrootseconomics/cic-internal-integration!157 | 2021-05-18 17:13:57 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | 60b36945df | cic-cache: Add data API | 2021-05-18 17:13:57 +00:00 |  | 
			
				
					|  | dae6526677 | Merge branch 'philip/remove-notify-config-defaults' into 'master' Refactors at configs.
See merge request grassrootseconomics/cic-internal-integration!156 | 2021-05-17 16:47:30 +00:00 |  | 
			
				
					|  | 1e94a516c2 | Refactors at configs. | 2021-05-17 19:41:07 +03:00 |  | 
			
				
					|  | e8512ebbae | small updates. note other gender | 2021-05-17 11:27:45 +00:00 |  | 
			
				
					|  | f2c955c60b | small changes, note the 'other' gender | 2021-05-17 11:06:10 +00:00 |  | 
			
				
					|  | 17b3b27d81 | Merge branch 'philip/import-pins-script' into 'master' Philip/import pins script
See merge request grassrootseconomics/cic-internal-integration!109 | 2021-05-15 07:40:34 +00:00 |  | 
			
				
					|  | 1cb172b8bf | Philip/import pins script | 2021-05-15 07:40:34 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | 9d47e4c764 | Merge branch 'lash/descriptive-documentation' into 'master' cic-eth system documentation
See merge request grassrootseconomics/cic-internal-integration!122 | 2021-05-15 04:36:55 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | c68cc318ab | cic-eth system documentation | 2021-05-15 04:36:54 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | af99ac823a | Merge branch 'lash/custom-offset' into 'master' cic-cache-tracker, cic-eth-tracker: Add optional and customizable history start for trackers
Closes #50
See merge request grassrootseconomics/cic-internal-integration!143 | 2021-05-13 16:37:44 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | 06652eb30f | cic-cache-tracker, cic-eth-tracker: Add optional and customizable history start for trackers | 2021-05-13 16:37:44 +00:00 |  |