Commit Graph

67 Commits

Author SHA1 Message Date
Richard Ramos 6c296c626a feat: reward screen 2019-04-26 18:17:13 -04:00
Richard Ramos 4cdf41835d Updated contributor address 2019-04-20 09:20:50 -04:00
Richard Ramos ba1f4ad18c updated testnet contract and sort contributors 2019-04-15 20:39:08 -04:00
Richard Ramos 20b4ff0351
Merge pull request #12 from jrainville/feat/a-bit-of-style
Add a bit of style
2019-04-10 23:24:26 -04:00
Richard Ramos 4e69665dea
Merge pull request #11 from jrainville/feat/admin-tab-submit
Add real interactions for the admin tab
2019-04-10 23:23:38 -04:00
Jonathan Rainville 555a1e5b17
add storage config for testnet and livenet 2019-04-10 18:03:35 -04:00
Jonathan Rainville 8837315c30
convert hash to bytes in contract 2019-04-10 18:02:22 -04:00
Jonathan Rainville 170b64b468
only display admin menu if the user is admin 2019-04-10 17:38:14 -04:00
Jonathan Rainville eaa79d7c29
add fonts and style sheets and style components a bit 2019-04-10 17:29:04 -04:00
Jonathan Rainville 8963427f64
do remove contributor 2019-04-10 16:21:22 -04:00
Jonathan Rainville 7c308ef261
add ipfs hash to removeCOntributor function and add test 2019-04-10 16:21:21 -04:00
Jonathan Rainville 5d069afb06
add ui for removing contributors 2019-04-10 16:21:21 -04:00
Jonathan Rainville 21b2b6cb43
move getContributor function to Meritocracy service 2019-04-10 16:21:21 -04:00
Jonathan Rainville b766031cd7
remove axios 2019-04-10 16:21:20 -04:00
Jonathan Rainville 08b967978d
make adding new contributors work 2019-04-10 16:21:20 -04:00
Jonathan Rainville 16eaafc688
get contributor list from hash gotten from contract 2019-04-10 16:21:20 -04:00
Jonathan Rainville 38be32c60c
add ipfs hash to addCOntributor methods plus tests 2019-04-10 16:21:15 -04:00
Jonathan Rainville a3c296d3ce
WIP add contributor 2019-04-10 16:20:34 -04:00
Jonathan Rainville 610c1b2542
add Meritocracy service and get contributors from IPFS 2019-04-10 16:20:33 -04:00
Richard Ramos f6b500b33a
Merge pull request #10 from jrainville/feat/admin-tab
Add basic admin tab + header, router and validation
2019-04-10 16:19:08 -04:00
Richard Ramos e57166df95 Added contributor 2019-04-10 11:15:13 -04:00
Richard Ramos 97772ce68d added contributor 2019-04-09 16:31:28 -04:00
Jonathan Rainville 0a9774a687
add missing react-router-dom dependency 2019-04-09 15:42:16 -04:00
Jonathan Rainville f3e37ed568
fix favicon paths 2019-04-09 15:36:36 -04:00
Jonathan Rainville 6860e2727f
add icons 2019-04-09 14:30:42 -04:00
Jonathan Rainville 58637423d1
add form validators and html form to add contributors 2019-04-09 14:23:36 -04:00
Jonathan Rainville 9b61c3da45
add header and basic admin page 2019-04-09 13:29:40 -04:00
Jonathan Rainville 2bb59c4fd1
update bootstrap to 4 and add embark-solc 2019-04-09 13:23:31 -04:00
Richard Ramos a7bc5d6682
Merge pull request #9 from jrainville/feat/restructure
Restructure the files so that App only contains the router
2019-04-09 10:42:24 -04:00
Richard Ramos 5b9f5da50d
Merge pull request #8 from jrainville/fix/fixes
Fix to circular dep and tiny cleanup
2019-04-09 10:38:15 -04:00
Richard Ramos 06c4b4018f
Merge pull request #7 from decanus/patch-2
Update Meritocracy.sol
2019-04-09 10:38:03 -04:00
Jonathan Rainville 857112137f
restructure files so that App only contains the loading and router 2019-04-09 10:34:22 -04:00
Jonathan Rainville d46102ca3a
use new function syntax for afterDeploy - 2019-04-09 09:57:08 -04:00
Jonathan Rainville 92e0c8282a
fix circular dependency with MiniMeToken - 2019-04-09 09:57:03 -04:00
Dean Eigenmann 4828244509
Update Meritocracy.sol 2019-03-22 00:27:20 +01:00
Richard Ramos df2bbab7a0 updated contributors and addresses 2019-03-21 19:21:05 -04:00
Richard Ramos bbed4b678f
Merge pull request #5 from status-im/fix/contract-transfer
fix: contract transfer of SNT
2019-03-21 17:40:14 -04:00
Richard Ramos cf155b6f44
Merge pull request #4 from status-im/feat/embark4beta1
feat: migrate to embark 4
2019-03-21 17:38:09 -04:00
Richard Ramos 6b82b5c834
Merge pull request #6 from decanus/patch-1
Create .gitattributes
2019-03-21 17:37:44 -04:00
Dean Eigenmann 1a985d74b2
Create .gitattributes 2019-03-21 19:14:20 +01:00
Richard Ramos d4a4a0457d Added viewport for mobile 2019-03-20 11:15:43 -04:00
Richard Ramos eb0386afe4 fix: change `transferFrom` to `transfer`
Changed the transfer function when the contract is who initiates the token transfer.
transferFrom requires an approval to work.
2019-03-20 10:26:55 -04:00
Richard Ramos bf38c31452 removing web3js from version list 2019-03-18 11:55:24 -04:00
Richard Ramos e8060c5326 feat: initial step for migration 2019-03-18 11:28:40 -04:00
Richard Ramos c9db6abd18
Merge pull request #2 from status-im/feat/fix
refactoring and additional UI functionality for improved UX
2019-03-15 10:24:11 -04:00
Richard Ramos bae5ed9c50 extract contributors to single file 2019-03-12 09:31:11 -04:00
Richard Ramos c90c63b930 reset ui state and dismiss decimals when allocating kudos balance 2019-03-11 15:35:21 -04:00
Richard Ramos 418ccee9d7 check for network, and list praises 2019-03-10 09:34:12 -04:00
Richard Ramos cc913bf21e error handling 2019-03-09 15:14:32 -04:00
Richard Ramos 25f0956b95 handle busy state 2019-03-09 10:47:26 -04:00