status-im
/
meritocracy
mirror of https://github.com/status-im/meritocracy.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
82 Commits 16 Branches 0 Tags 5.5 MiB
Commit Graph

82 Commits

Author SHA1 Message Date
dependabot[bot] 7ddeda2a5d
Bump shelljs from 0.8.3 to 0.8.5 
Bumps [shelljs](https://github.com/shelljs/shelljs) from 0.8.3 to 0.8.5.
- [Release notes](https://github.com/shelljs/shelljs/releases)
- [Changelog](https://github.com/shelljs/shelljs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/shelljs/shelljs/compare/v0.8.3...v0.8.5)

---
updated-dependencies:
- dependency-name: shelljs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-15 04:10:55 +00:00
Richard Ramos af55ca0311
feat: approval and allocation in separate operations (#35) 2019-06-05 08:59:00 -04:00
Richard Ramos 9c5640605b
Admin forms (#33) 
* feat: added kudos wall

* feat: add admin forms

* feat: add forfeit and allocate functionality

* fix: moved leaderboard out of admin panel
 2019-06-02 18:02:05 -04:00
Richard Ramos 9d983c2b9d
feat: admin panel (#29) 
* feat: added kudos wall

* feat: add admin forms

* feat: add forfeit and allocate functionality

* fix: moved leaderboard out of admin panel
 2019-05-14 13:35:10 -04:00
Richard Ramos 7233fb934b
feat: added kudos wall (#24) 
* feat: leaderboard for admins

* feat: added kudos wall
 2019-05-07 09:37:54 -04:00
Richard Ramos 445e7f8471
feat: leaderboard for admins (#23) 2019-05-07 09:34:59 -04:00
ceripower 58b73de7f1
Update register.md 2019-05-01 17:52:16 +01:00
Richard Ramos 12459f3ee8
Merge pull request #13 from status-im/reward-screen 
Reward and Withdraw UI changes + code format
 2019-05-01 10:57:03 -04:00
Richard Ramos 5a47719e00
Create register.md 2019-05-01 10:54:50 -04:00
Richard Ramos 83ded6bfc1 added higher resolution icon 2019-05-01 09:29:36 -04:00
Richard Ramos f93fd4a1ba fix: header links and allocation warning 2019-04-28 14:06:37 -04:00
Richard Ramos 9cd9b61637 Updated contract address 2019-04-28 12:43:52 -04:00
Richard Ramos 64fdef7697 feat: withdrawal screens + prettier 2019-04-27 18:10:34 -04:00
Richard Ramos ae884d278c changed forfeit rule 2019-04-27 09:19:33 -04:00
Richard Ramos 891d8d7e40 added prettier and eslint 2019-04-27 09:18:46 -04:00
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