|  | 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 |  | 
			
				
					| 
							
							
								 Louis Holbrook | f66f913307 | Merge branch 'lash/update-contracts-in-migration-2' into 'master' Upgrade accounts index
See merge request grassrootseconomics/cic-internal-integration!146 | 2021-05-13 16:29:02 +00:00 |  | 
			
				
					| 
							
							
								 nolash | 8bf1364864 | Upgrade acoutns index | 2021-05-13 18:00:59 +02:00 |  | 
			
				
					|  | 0d6d7179eb | Merge branch 'philip/default-token-bug-fix' into 'master' Fix hard-coded token symbols.
Closes cic-ussd#42
See merge request grassrootseconomics/cic-internal-integration!142 | 2021-05-12 11:26:20 +00:00 |  | 
			
				
					|  | e7f48f3ce0 | Refactors to fix hard-coded token symbols. | 2021-05-12 12:51:55 +03:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | b252fab018 | Merge branch 'lash/catch-no-contract-crash' into 'master' cic-eth-tracker: Catch bogus transfers where token address is no contract
See merge request grassrootseconomics/cic-internal-integration!141 | 2021-05-12 08:10:46 +00:00 |  | 
			
				
					| 
							
							
								 nolash | 4667916d80 | Catch bogus transfers where token address is no contract | 2021-05-12 08:48:50 +02:00 |  | 
			
				
					|  | 1f668384cc | Merge branch 'philip/fix-africastalking-parser' into 'master' Philip/fix africastalking parser
Closes cic-ussd#41
See merge request grassrootseconomics/cic-internal-integration!140 | 2021-05-11 10:58:00 +00:00 |  | 
			
				
					|  | 123dc55687 | Philip/fix africastalking parser | 2021-05-11 10:58:00 +00:00 |  | 
			
				
					| 
							
							
								 nolash | 0b4d8d5937 | Add registry to cic-eth-info tool | 2021-05-05 19:04:56 +02:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | ed6bef4052 | Merge branch 'lash/cache-faucet' into 'master' Add faucet filter to cic-cache
Closes cic-cache#13
See merge request grassrootseconomics/cic-internal-integration!134 | 2021-05-05 16:25:21 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | 6a8a356f09 | Add faucet filter to cic-cache | 2021-05-05 16:25:21 +00:00 |  | 
			
				
					|  | 5ec0b67496 | Merge branch 'bvander/fix-user-pip-install' into 'master' should have dropped the user flag
See merge request grassrootseconomics/cic-internal-integration!136 | 2021-05-02 19:38:57 +00:00 |  | 
			
				
					|  | 7d935bcbc3 | should have dropped the user flag | 2021-05-02 12:32:05 -07:00 |  | 
			
				
					|  | fd69a3c6bb | Update .cic-template.yml | 2021-05-02 17:31:34 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | 298bcf89e5 | Merge branch 'lash/chainlib-erc20-split' into 'master' Update componens for chainlib erc20 split
See merge request grassrootseconomics/cic-internal-integration!135 | 2021-05-02 17:11:03 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | 5d3d773f41 | Update componens for chainlib erc20 split | 2021-05-02 17:11:03 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | e71b2411d0 | Merge branch 'lash/contract-interfaces' into 'master' cic-eth: Update deps for contract standardization refactor
See merge request grassrootseconomics/cic-internal-integration!129 | 2021-05-02 17:02:45 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | b4bfb76634 | cic-eth: Update deps for contract standardization refactor | 2021-05-02 17:02:45 +00:00 |  | 
			
				
					|  | aab5c8bf85 | Merge branch 'contract-migration-include-data-scripts' into 'master' puts the scripts in the container and take out the user
See merge request grassrootseconomics/cic-internal-integration!133 | 2021-05-02 16:56:08 +00:00 |  | 
			
				
					|  | e1564574f7 | puts the scripts in the container and take out the user | 2021-05-02 16:56:08 +00:00 |  | 
			
				
					|  | 13253a2dcc | Update .cic-template.yml | 2021-05-02 02:54:03 +00:00 |  | 
			
				
					|  | 9020fe1000 | Update .cic-template.yml | 2021-05-02 02:47:01 +00:00 |  | 
			
				
					|  | a2e7d2973c | Merge branch 'fix-cic-meta-migration-onerror' into 'master' meta exit error fixed
See merge request grassrootseconomics/cic-internal-integration!132 | 2021-05-01 19:52:30 +00:00 |  | 
			
				
					|  | 82f650e81d | meta exit error fixed | 2021-05-01 12:52:03 -07:00 |  | 
			
				
					|  | e77940d0de | Merge branch 'philip/metadata-salt' into 'master' Update metadata pointer salt values
See merge request grassrootseconomics/cic-internal-integration!131 | 2021-05-01 14:52:54 +00:00 |  | 
			
				
					|  | 1df62717ef | Update metadata pointer salt values | 2021-05-01 14:52:54 +00:00 |  | 
			
				
					|  | c4919d56b1 | Merge branch 'philip/default-token-integration' into 'master' Philip/default token integration
See merge request grassrootseconomics/cic-internal-integration!128 | 2021-05-01 14:14:20 +00:00 |  | 
			
				
					|  | 6d44863a49 | Philip/default token integration | 2021-05-01 14:14:20 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | b02cdee1bd | Merge branch 'lash/cic-cache-tags' into 'master' cic-cache: Add tx tags in persistent storage
Closes cic-cache#14
See merge request grassrootseconomics/cic-internal-integration!130 | 2021-05-01 13:20:14 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | 75bf8f15be | cic-cache: Add tx tags in persistent storage | 2021-05-01 13:20:14 +00:00 |  | 
			
				
					|  | 8db76dc0a8 | Merge branch 'fix-cic-meta-migrations' into 'master' fixed cic meta migration and removed pg schema stuff during init
See merge request grassrootseconomics/cic-internal-integration!127 | 2021-04-30 08:33:34 +00:00 |  | 
			
				
					|  | a3261f2f0e | fixed cic meta migration and removed pg schema stuff during init | 2021-04-30 08:33:33 +00:00 |  | 
			
				
					|  | 850dd15451 | Merge branch 'philip/separate-telco-cicada-http-apis' into 'master' Philip/separate telco cicada http apis
See merge request grassrootseconomics/cic-internal-integration!124 | 2021-04-30 08:15:03 +00:00 |  | 
			
				
					|  | 0c56e84704 | Philip/separate telco cicada http apis | 2021-04-30 08:15:03 +00:00 |  | 
			
				
					|  | 63cd8a4aab | Merge branch 'lash/contracts-kill' into 'master' Remove cic-contracts references
See merge request grassrootseconomics/cic-internal-integration!126 | 2021-04-30 06:25:49 +00:00 |  | 
			
				
					| 
							
							
								 Louis Holbrook | 2c326f62ae | Remove cic-contracts references | 2021-04-30 06:25:49 +00:00 |  | 
			
				
					|  | 9ed62c58ae | Merge branch 'lash/right-token' into 'master' Correct default token env vars in deployment step 2
See merge request grassrootseconomics/cic-internal-integration!125 | 2021-04-28 17:31:49 +00:00 |  | 
			
				
					| 
							
							
								 nolash | 04e9f45feb | Correct default token env vars in deployment step 2 | 2021-04-28 19:24:33 +02:00 |  | 
			
				
					| 
							
							
								 Spencer Ofwiti | 9126a75c4a | Merge branch 'spencer/refactor-meta-library' into 'master' Remove library files into crdt-meta.
See merge request grassrootseconomics/cic-internal-integration!98 | 2021-04-28 09:11:39 +00:00 |  | 
			
				
					| 
							
							
								 Spencer Ofwiti | 1bc29588a1 | Remove library files into crdt-meta. | 2021-04-28 09:11:39 +00:00 |  | 
			
				
					|  | e6d57d3bbb | Merge branch 'fix-contract-migration-build' into 'master' switch to deb solc package
See merge request grassrootseconomics/cic-internal-integration!123 | 2021-04-28 04:07:29 +00:00 |  | 
			
				
					|  | f64ff1290c | switch to deb solc package | 2021-04-27 21:01:58 -07:00 |  |