Commit Graph

Select branches

Hide Pull Requests

dependabot/npm_and_yarn/acorn-6.4.1

dependabot/npm_and_yarn/ajv-6.12.6

dependabot/npm_and_yarn/async-2.6.4

dependabot/npm_and_yarn/eslint-utils-1.4.3

dependabot/npm_and_yarn/hosted-git-info-2.8.9

dependabot/npm_and_yarn/lodash-4.17.21

dependabot/npm_and_yarn/moment-2.29.4

dependabot/npm_and_yarn/path-parse-1.0.7

dependabot/npm_and_yarn/shelljs-0.8.5

dependabot/npm_and_yarn/ua-parser-js-0.7.28

develop

feat/the-graph

fix/allocation

fix/ipfs

master

slither

#10

#11

#12

#13

#2

#23

#24

#29

#33

#35

#38

#39

#4

#40

#41

#42

#42

#43

#43

#44

#45

#45

#46

#46

#47

#47

#48

#48

#49

#49

#5

#50

#50

#51

#52

#52

#53

#53

#6

#7

#8

#9

Mono Color

• b96f3f2b94
  Merge 4b86d47067 into af55ca0311 dependabot[bot] 2022-07-07 04:47:15 +0000
• 4b86d47067
  Bump moment from 2.24.0 to 2.29.4 dependabot/npm_and_yarn/moment-2.29.4 dependabot[bot] 2022-07-07 04:47:13 +0000
• 484e328f70
  Merge 3a9c7c1e35 into af55ca0311 dependabot[bot] 2022-04-28 19:48:39 +0000
• 3a9c7c1e35
  Bump async from 2.6.2 to 2.6.4 dependabot/npm_and_yarn/async-2.6.4 dependabot[bot] 2022-04-28 19:48:37 +0000
• 4b850ec927
  Bump moment from 2.24.0 to 2.29.2 dependabot[bot] 2022-04-09 01:38:39 +0000
• 5a51cfd2a5
  Merge 1c6e284e59 into af55ca0311 dependabot[bot] 2022-02-11 20:44:04 +0000
• 1c6e284e59
  Bump ajv from 6.10.0 to 6.12.6 dependabot/npm_and_yarn/ajv-6.12.6 dependabot[bot] 2022-02-11 20:44:01 +0000
• 1098ba5421
  Merge 7ddeda2a5d into af55ca0311 dependabot[bot] 2022-01-15 04:10:57 +0000
• 7ddeda2a5d
  Bump shelljs from 0.8.3 to 0.8.5 dependabot/npm_and_yarn/shelljs-0.8.5 dependabot[bot] 2022-01-15 04:10:55 +0000
• 8e592638df
  Merge 4236458b50 into af55ca0311 dependabot[bot] 2021-08-10 21:50:20 +0000
• 4236458b50
  Bump path-parse from 1.0.6 to 1.0.7 dependabot/npm_and_yarn/path-parse-1.0.7 dependabot[bot] 2021-08-10 21:50:19 +0000
• d3582c760b
  Merge bcf67b987c into af55ca0311 dependabot[bot] 2021-05-10 08:04:29 +0000
• bcf67b987c
  Bump hosted-git-info from 2.7.1 to 2.8.9 dependabot/npm_and_yarn/hosted-git-info-2.8.9 dependabot[bot] 2021-05-10 08:04:27 +0000
• 2d9b53c78d
  Merge c2ac874d2f into af55ca0311 dependabot[bot] 2021-05-08 03:25:51 +0000
• c2ac874d2f
  Bump lodash from 4.17.11 to 4.17.21 dependabot/npm_and_yarn/lodash-4.17.21 dependabot[bot] 2021-05-08 03:25:50 +0000
• cb2ae36b83
  Merge 016a08754a into af55ca0311 dependabot[bot] 2021-05-06 22:49:04 +0000
• 016a08754a
  Bump ua-parser-js from 0.7.19 to 0.7.28 dependabot/npm_and_yarn/ua-parser-js-0.7.28 dependabot[bot] 2021-05-06 22:49:02 +0000
• a977267cea
  Bump lodash from 4.17.11 to 4.17.19 dependabot[bot] 2020-07-16 17:23:56 +0000
• d90d0dc86e
  Merge 10ad23ae1c into af55ca0311 dependabot[bot] 2020-03-14 15:15:50 +0000
• 10ad23ae1c
  Bump acorn from 6.1.1 to 6.4.1 dependabot/npm_and_yarn/acorn-6.4.1 dependabot[bot] 2020-03-14 15:15:48 +0000
• 74180b5516
  Merge 10876d7883 into af55ca0311 dependabot[bot] 2019-11-01 12:51:04 +0000
• 10876d7883
  Bump eslint-utils from 1.3.1 to 1.4.3 dependabot/npm_and_yarn/eslint-utils-1.4.3 dependabot[bot] 2019-11-01 12:51:01 +0000
• 779890394e feat: calculate allocation using contract's balance from prev kudos cycle fix/allocation Richard Ramos 2019-08-07 15:27:38 -0400
• 6e6ff4ef33 fix #37: remove contribs from IPFS if they are not in the registry. fix/ipfs Richard Ramos 2019-08-05 14:24:07 -0400
• 5673915a88
  feat: approve and call functionality (#39) develop Richard Ramos 2019-08-05 13:13:30 -0400
• 150ffe1517 rename function Richard Ramos 2019-08-05 13:12:22 -0400
• f356b40ba6 feat: approveAndCall functionality for allocating funds Richard Ramos 2019-05-09 09:54:49 -0400
• 5021d83482
  feat: forfeit logic (#38) Richard Ramos 2019-08-05 12:42:06 -0400
• 5203033db5 feat: forfeit logic Richard Ramos 2019-08-05 12:34:29 -0400
• af55ca0311
  feat: approval and allocation in separate operations (#35) master Richard Ramos 2019-06-05 08:59:00 -0400
• d77020e63d feat: approval and allocation in separate operations Richard Ramos 2019-06-02 20:06:48 -0400
• 9c5640605b
  Admin forms (#33) Richard Ramos 2019-06-02 18:02:05 -0400
• 774ec1bc30 experiment using thegraph feat/the-graph Richard Ramos 2019-05-27 11:01:26 -0400
• 9d983c2b9d
  feat: admin panel (#29) Richard Ramos 2019-05-14 13:35:10 -0400
• 59d43dab5a fix: moved leaderboard out of admin panel Richard Ramos 2019-05-14 09:37:51 -0400
• 05418a09bc feat: add forfeit and allocate functionality Richard Ramos 2019-05-09 09:37:45 -0400
• 9ed818c385 feat: add admin forms Richard Ramos 2019-05-05 20:37:48 -0400
• b86da87143 feat: added kudos wall Richard Ramos 2019-05-03 18:07:45 -0400
• 7233fb934b
  feat: added kudos wall (#24) Richard Ramos 2019-05-07 09:37:54 -0400
• 61ade0e8a5
  Merge branch 'master' into the-wall Richard Ramos 2019-05-07 09:37:18 -0400
• 445e7f8471
  feat: leaderboard for admins (#23) Richard Ramos 2019-05-07 09:34:59 -0400
• 16a7f1ac1e feat: added kudos wall Richard Ramos 2019-05-03 18:07:45 -0400
• d25d7c1c40 feat: leaderboard for admins Richard Ramos 2019-05-03 15:37:34 -0400
• 58b73de7f1
  Update register.md ceripower 2019-05-01 17:52:16 +0100
• 12459f3ee8
  Merge pull request #13 from status-im/reward-screen Richard Ramos 2019-05-01 10:57:03 -0400
• 5a47719e00
  Create register.md Richard Ramos 2019-05-01 10:54:50 -0400
• 83ded6bfc1 added higher resolution icon Richard Ramos 2019-05-01 09:29:36 -0400
• f93fd4a1ba fix: header links and allocation warning Richard Ramos 2019-04-28 14:06:37 -0400
• 9cd9b61637 Updated contract address Richard Ramos 2019-04-28 12:43:52 -0400
• 4f12c63541 slither slither Richard Ramos 2019-04-28 12:30:02 -0400
• 64fdef7697 feat: withdrawal screens + prettier Richard Ramos 2019-04-27 18:10:34 -0400
• ae884d278c changed forfeit rule Richard Ramos 2019-04-27 09:19:33 -0400
• 891d8d7e40 added prettier and eslint Richard Ramos 2019-04-27 09:18:46 -0400
• 6c296c626a feat: reward screen Richard Ramos 2019-04-26 18:17:13 -0400
• 4cdf41835d Updated contributor address Richard Ramos 2019-04-20 09:20:50 -0400
• ba1f4ad18c updated testnet contract and sort contributors Richard Ramos 2019-04-15 20:39:08 -0400
• 20b4ff0351
  Merge pull request #12 from jrainville/feat/a-bit-of-style Richard Ramos 2019-04-10 23:24:26 -0400
• 4e69665dea
  Merge pull request #11 from jrainville/feat/admin-tab-submit Richard Ramos 2019-04-10 23:23:38 -0400
• 555a1e5b17
  add storage config for testnet and livenet Jonathan Rainville 2019-04-10 18:03:35 -0400
• 8837315c30
  convert hash to bytes in contract Jonathan Rainville 2019-04-10 18:02:22 -0400
• 170b64b468
  only display admin menu if the user is admin Jonathan Rainville 2019-04-10 17:38:14 -0400
• eaa79d7c29
  add fonts and style sheets and style components a bit Jonathan Rainville 2019-04-10 17:29:04 -0400
• 8963427f64
  do remove contributor Jonathan Rainville 2019-04-10 16:12:47 -0400
• 7c308ef261
  add ipfs hash to removeCOntributor function and add test Jonathan Rainville 2019-04-10 15:42:16 -0400
• 5d069afb06
  add ui for removing contributors Jonathan Rainville 2019-04-10 15:14:58 -0400
• 21b2b6cb43
  move getContributor function to Meritocracy service Jonathan Rainville 2019-04-10 14:35:33 -0400
• b766031cd7
  remove axios Jonathan Rainville 2019-04-10 13:52:53 -0400
• 08b967978d
  make adding new contributors work Jonathan Rainville 2019-04-10 13:52:00 -0400
• 16eaafc688
  get contributor list from hash gotten from contract Jonathan Rainville 2019-04-10 12:46:44 -0400
• 38be32c60c
  add ipfs hash to addCOntributor methods plus tests Jonathan Rainville 2019-04-10 16:21:15 -0400
• a3c296d3ce
  WIP add contributor Jonathan Rainville 2019-04-09 16:43:09 -0400
• 610c1b2542
  add Meritocracy service and get contributors from IPFS Jonathan Rainville 2019-04-09 15:35:05 -0400
• f6b500b33a
  Merge pull request #10 from jrainville/feat/admin-tab Richard Ramos 2019-04-10 16:19:08 -0400
• e57166df95 Added contributor Richard Ramos 2019-04-10 11:15:13 -0400
• 97772ce68d added contributor Richard Ramos 2019-04-09 16:31:28 -0400
• 0a9774a687
  add missing react-router-dom dependency Jonathan Rainville 2019-04-09 15:42:16 -0400
• f3e37ed568
  fix favicon paths Jonathan Rainville 2019-04-09 15:36:36 -0400
• 6860e2727f
  add icons Jonathan Rainville 2019-04-09 14:30:42 -0400
• 58637423d1
  add form validators and html form to add contributors Jonathan Rainville 2019-04-09 14:23:36 -0400
• 9b61c3da45
  add header and basic admin page Jonathan Rainville 2019-04-09 13:29:40 -0400
• 2bb59c4fd1
  update bootstrap to 4 and add embark-solc Jonathan Rainville 2019-04-09 13:23:31 -0400
• a7bc5d6682
  Merge pull request #9 from jrainville/feat/restructure Richard Ramos 2019-04-09 10:42:24 -0400
• 5b9f5da50d
  Merge pull request #8 from jrainville/fix/fixes Richard Ramos 2019-04-09 10:38:15 -0400
• 06c4b4018f
  Merge pull request #7 from decanus/patch-2 Richard Ramos 2019-04-09 10:38:03 -0400
• 857112137f
  restructure files so that App only contains the loading and router Jonathan Rainville 2019-04-09 10:34:22 -0400
• d46102ca3a
  use new function syntax for afterDeploy - Jonathan Rainville 2019-04-08 16:34:37 -0400
• 92e0c8282a
  fix circular dependency with MiniMeToken - Jonathan Rainville 2019-04-08 16:34:04 -0400
• 4828244509
  Update Meritocracy.sol Dean Eigenmann 2019-03-22 00:27:20 +0100
• df2bbab7a0 updated contributors and addresses Richard Ramos 2019-03-21 19:21:05 -0400
• bbed4b678f
  Merge pull request #5 from status-im/fix/contract-transfer Richard Ramos 2019-03-21 17:40:14 -0400
• cf155b6f44
  Merge pull request #4 from status-im/feat/embark4beta1 Richard Ramos 2019-03-21 17:38:09 -0400
• 6b82b5c834
  Merge pull request #6 from decanus/patch-1 Richard Ramos 2019-03-21 17:37:44 -0400
• 1a985d74b2
  Create .gitattributes Dean Eigenmann 2019-03-21 19:14:20 +0100
• d4a4a0457d Added viewport for mobile Richard Ramos 2019-03-20 11:15:43 -0400
• eb0386afe4 fix: change `transferFrom` to `transfer` Richard Ramos 2019-03-20 10:26:55 -0400
• bf38c31452 removing web3js from version list Richard Ramos 2019-03-18 11:55:24 -0400
• e8060c5326 feat: initial step for migration Richard Ramos 2019-03-18 11:28:40 -0400
• c9db6abd18
  Merge pull request #2 from status-im/feat/fix Richard Ramos 2019-03-15 10:24:11 -0400
• bae5ed9c50 extract contributors to single file Richard Ramos 2019-03-12 09:31:11 -0400
• c90c63b930 reset ui state and dismiss decimals when allocating kudos balance Richard Ramos 2019-03-11 15:35:21 -0400