c865c154a4 
							
						 
					 
					
						
						
							
							Merge pull request  #198  from 67P/feature/expenses  
						
						... 
						
						
						
						Add Reimbursement app 
						
						
					 
					
						2021-06-02 14:25:33 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							6c80179a3d 
							
						 
					 
					
						
						
							
							Re-add veto auth  
						
						... 
						
						
						
						Accidentally merged during pairing with some minor changes in #210  
						
						
					 
					
						2021-01-14 15:46:33 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
							
						
						
						
							
						
						
							c471060cfd 
							
						 
					 
					
						
						
							
							Merge pull request  #210  from 67P/chore/variable_naming  
						
						... 
						
						
						
						Improve variable name clarity 
						
						
					 
					
						2021-01-14 15:43:26 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							8984ba3802 
							
						 
					 
					
						
						
							
							Improve variable name clarity  
						
						
						
						
					 
					
						2021-01-14 15:39:19 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							2238ccf40e 
							
						 
					 
					
						
						
							
							Fix confirmations being 1 block too late  
						
						... 
						
						
						
						block.number refers to the last mined block, so we need to add +1 to
wait from the current block on (the one in which this function is
executed). 
						
						
					 
					
						2021-01-14 15:36:55 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							b22d16e61e 
							
						 
					 
					
						
						
							
							We do not need the appIds in the reimbursement app  
						
						... 
						
						
						
						this might make it easier to deploy? 
						
						
					 
					
						2020-12-01 13:27:39 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							6bc6bcb7f6 
							
						 
					 
					
						
						
							
							We don't use those helpers right now. but maybe later?  
						
						
						
						
					 
					
						2020-12-01 12:54:28 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							eadca6904a 
							
						 
					 
					
						
						
							
							Rename contributor to recipient  
						
						... 
						
						
						
						And remove addedBy entry. 
						
						
					 
					
						2020-12-01 10:33:09 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							c4e7e1259e 
							
						 
					 
					
						
						
							
							Remove obsolete manual expense schema import  
						
						
						
						
					 
					
						2020-06-27 16:27:11 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							2c567fa71a 
							
						 
					 
					
						
						
							
							Use contributorId instead or address for reimbursements  
						
						
						
						
					 
					
						2020-06-12 00:29:59 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							7fdeb78617 
							
						 
					 
					
						
						
							
							Support multiple expenses in one reimburesement  
						
						
						
						
					 
					
						2020-05-29 18:47:49 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							19f212f283 
							
						 
					 
					
						
						
							
							Cleanup  
						
						... 
						
						
						
						we do not support claiming/withdrawal yet. 
						
						
					 
					
						2020-05-29 17:25:27 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							1f248812a7 
							
						 
					 
					
						
						
							
							Reimbursement.getReimbursement vs. Reimbursement.get  
						
						
						
						
					 
					
						2020-05-29 15:12:57 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
							
						
						
						
							
						
						
							3f8407fa02 
							
						 
					 
					
						
						
							
							Update apps/reimbursement/contracts/Reimbursement.sol  
						
						... 
						
						
						
						Co-authored-by: Sebastian Kippe <sebastian@kip.pe> 
						
						
					 
					
						2020-05-29 11:31:51 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							a0b0183beb 
							
						 
					 
					
						
						
							
							Add Reimbursement app  
						
						
						
						
					 
					
						2020-05-29 10:46:55 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							3c72fa3a8b 
							
						 
					 
					
						
						
							
							run npm upgrade in every app  
						
						... 
						
						
						
						are those package-lock.json there actually used? 
						
						
					 
					
						2020-05-27 10:31:12 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							190d3b77d5 
							
						 
					 
					
						
						
							
							Update tests  
						
						... 
						
						
						
						getContract now seems to return a Promise 
						
						
					 
					
						2020-02-10 14:59:22 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
							
						
						
						
							
						
						
							93aeea69c6 
							
						 
					 
					
						
						
							
							Fix test commands  
						
						... 
						
						
						
						Aragon CLI does not come with the contracts command anymore. 
						
						
					 
					
						2020-02-08 17:37:26 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
							
						
						
						
							
						
						
							e7700d5ec7 
							
						 
					 
					
						
						
							
							Remove @aragon/cli from app package configs  
						
						... 
						
						
						
						We're assuming a global install now. 
						
						
					 
					
						2020-02-08 17:36:48 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
							
						
						
						
							
						
						
							48ff304861 
							
						 
					 
					
						
						
							
							Merge pull request  #166  from 67P/dev/remove_yarn_lockfile  
						
						... 
						
						
						
						Remove yarn lockfiles 
						
						
					 
					
						2019-08-27 12:34:29 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
							
						
						
						
							
						
						
							580d6e8f51 
							
						 
					 
					
						
						
							
							Remove yarn lockfiles  
						
						
						
						
					 
					
						2019-08-09 19:03:29 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							f1941eb6b8 
							
						 
					 
					
						
						
							
							Remove cached artifacts  
						
						... 
						
						
						
						Thos should be generated on every contract app deployment and thus don't need to
be in the repo.
We also don't have those for the other contract apps. 
						
						
					 
					
						2019-08-09 18:46:36 +02:00 
						 
				 
			
				
					
						
							
							
								Haythem Sellami 
							
						 
					 
					
						
						
						
						
							
						
						
							fd844a00fd 
							
						 
					 
					
						
						
							
							Test token app ( #157 )  
						
						... 
						
						
						
						* test token app
* update travis config 
						
						
					 
					
						2019-07-31 15:17:38 +00:00 
						 
				 
			
				
					
						
							
							
								Haythem Sellami 
							
						 
					 
					
						
						
						
						
							
						
						
							eb4e06edf1 
							
						 
					 
					
						
						
							
							Contributor app tests ( #143 )  
						
						... 
						
						
						
						Adds tests for the contributor contract 
						
						
					 
					
						2019-07-22 06:55:22 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							e14cb0a77d 
							
						 
					 
					
						
						
							
							refactor get apps contract functions  
						
						
						
						
					 
					
						2019-07-20 15:06:17 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							e485bd90c0 
							
						 
					 
					
						
						
							
							install packages  
						
						
						
						
					 
					
						2019-06-19 14:34:14 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							1d89759c49 
							
						 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2019-06-19 13:47:58 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							32a123a825 
							
						 
					 
					
						
						
							
							Default to open.aragonpm.eth  
						
						... 
						
						
						
						it is now also available on the devchain 
						
						
					 
					
						2019-06-19 00:52:47 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							ca0a6f6ef9 
							
						 
					 
					
						
						
							
							user 7545 port for tests  
						
						
						
						
					 
					
						2019-06-17 23:35:53 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							4614c454a5 
							
						 
					 
					
						
						
							
							test setup  
						
						
						
						
					 
					
						2019-06-17 12:13:35 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d5322530c3 
							
						 
					 
					
						
						
							
							Update aragon CLI to latest version  
						
						
						
						
					 
					
						2019-06-13 18:37:33 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c4f8e9278e 
							
						 
					 
					
						
						
							
							Use consitently uint32 for amounts  
						
						
						
						
					 
					
						2019-06-08 17:56:50 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							6a64842415 
							
						 
					 
					
						
						
							
							Only count not-vetoed contributions for total balances  
						
						
						
						
					 
					
						2019-06-08 17:49:24 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
							
						
						
						
							
						
						
							555cb53c78 
							
						 
					 
					
						
						
							
							Improve totalKreditsEarned  
						
						... 
						
						
						
						* Use a more reasonable size of integer
* Use better variable names (count != amount, balance != count) 
						
						
					 
					
						2019-04-27 21:01:51 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c69ebd0a62 
							
						 
					 
					
						
						
							
							Fix canPerform method  
						
						... 
						
						
						
						Even if the variable is not used and the linter might complain we have
to have that parameter in the signature. otherwise the method is not
found and can not be called. 
						
						
					 
					
						2019-04-25 22:06:40 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c9fed46054 
							
						 
					 
					
						
						
							
							Add contract test linting  
						
						
						
						
					 
					
						2019-04-24 19:56:37 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							ad034d7712 
							
						 
					 
					
						
						
							
							Naming is hard  
						
						
						
						
					 
					
						2019-04-19 14:15:30 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c248725cc1 
							
						 
					 
					
						
						
							
							Add balances to getContributorById call  
						
						
						
						
					 
					
						2019-04-19 13:19:55 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							59135bf312 
							
						 
					 
					
						
						
							
							Add contract calls for total contribution balances  
						
						... 
						
						
						
						Those methods return the total kredits amounts of contribtions. 
						
						
					 
					
						2019-04-19 13:06:36 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							24933f31a7 
							
						 
					 
					
						
						
							
							Add yarn lock files  
						
						
						
						
					 
					
						2019-04-15 17:34:48 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							1dbf3b5742 
							
						 
					 
					
						
						
							
							Cosmetic cleanups  
						
						
						
						
					 
					
						2019-04-12 20:16:24 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							4d2e0ea84b 
							
						 
					 
					
						
						
							
							Update Token symbol  
						
						
						
						
					 
					
						2019-04-10 15:50:33 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							26d12ba239 
							
						 
					 
					
						
						
							
							Store kredits tokens as wei with 18 decimals  
						
						... 
						
						
						
						This stores the tokens with 18 decimals as most other tokens and as
assumed by a potential future token standard EIP 777. 
						
						
					 
					
						2019-04-10 13:59:00 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							f717968402 
							
						 
					 
					
						
						
							
							Better function naming to update contributor profiles  
						
						
						
						
					 
					
						2019-04-06 15:42:16 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							14d7fbd75e 
							
						 
					 
					
						
						
							
							Rename ipfsHash to hashDigest in Contributor  
						
						... 
						
						
						
						naming should be consistent with the other contracts and digest is more
correct. 
						
						
					 
					
						2019-04-06 15:24:44 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
							
						
						
						
							
						
						
							7eb1fedb42 
							
						 
					 
					
						
						
							
							Merge pull request  #76  from 67P/features/dynamic-core-flag  
						
						... 
						
						
						
						Dynamic function to test for core contributor flag 
						
						
					 
					
						2019-04-06 15:19:01 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							a0e4f5410d 
							
						 
					 
					
						
						
							
							Set veto period to 1 week  
						
						... 
						
						
						
						This makes a contribution claimable after roughly 7 days 
						
						
					 
					
						2019-04-05 20:30:02 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							766463b57b 
							
						 
					 
					
						
						
							
							Dynamic function to test for core contributor flag  
						
						... 
						
						
						
						This removes the isCore flag and allows us to dynamically calculate the
core flag for contributors.
For now this is just us (the first 6 contirbutors)
Also we do not need the default contributor anymore because the deploy
user has the role to manage contributors and can create the first real
contributors. 
						
						
					 
					
						2019-04-05 18:55:21 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
							
						
						
						
							
						
						
							a049f2eedb 
							
						 
					 
					
						
						
							
							Adjust proposals for format changes  
						
						
						
						
					 
					
						2019-04-04 23:11:43 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
							
						
						
						
							
						
						
							6088f30cd8 
							
						 
					 
					
						
						
							
							Use smaller numbers for contributor ID  
						
						... 
						
						
						
						2.2 billion contributors should be enough. 
						
						
					 
					
						2019-04-04 16:01:08 +02:00