Commit Graph

43 Commits

Author SHA1 Message Date
Barış Soner Uşaklı
5c51a91e85 fix reward claimable check 2017-05-26 18:34:45 -04:00
Barış Soner Uşaklı
f6ac92111b style changes 2017-05-26 00:02:20 -04:00
Julian Lam
72e77772db Merge branch 'master' into develop 2017-02-24 12:46:40 -05:00
Peter Jaszkowiak
896c8c7343 ESlint object-curly-spacing 2017-02-18 12:30:49 -07:00
Peter Jaszkowiak
3b0dd2d1ef ESlint padded-blocks 2017-02-18 02:32:24 -07:00
Peter Jaszkowiak
a038c66549 ESlint quotes 2017-02-18 01:56:23 -07:00
Peter Jaszkowiak
bc1d70c126 ESlint comma-dangle 2017-02-17 19:31:21 -07:00
Julian Lam
fcaefbadca Merge remote-tracking branch 'origin/master' into develop 2017-02-15 12:06:52 -05:00
barisusakli
4bbf517af3 rewards test 2017-02-14 15:04:48 +03:00
Peter Jaszkowiak
ec544518e8 Use async v2 2017-01-02 22:23:17 -07:00
HeeL
4a3c31b2dc Fix space-before-function-paren linter rule 2016-10-13 11:43:39 +02:00
Mathias Schreck
ce9ee62fa0 Handle callback errors 2016-08-17 12:54:59 +02:00
psychobunny
1d607cbed7 closes #4574 2016-04-27 12:11:54 -04:00
psychobunny
effcd20597 fixed a bug calling getSortedSetRangeByScoreWithScores 2016-03-01 18:40:15 -05:00
pichalite
0db1caa3f6 ACP rewards page fix 2016-01-17 00:15:57 -08:00
psychobunny
65e2c4cd20 missing error 2015-06-29 16:58:34 -04:00
psychobunny
ca3e0b59b0 filter out illegitimate rewards 2015-04-01 14:54:09 -04:00
psychobunny
4a9498e105 closes #2916 2015-04-01 11:49:46 -04:00
psychobunny
80116c3e30 fixed potential bug in rewards 2015-02-25 13:42:14 -05:00
psychobunny
f5eaa08340 fixed complications with deleted id's 2015-02-20 19:29:57 -05:00
psychobunny
def57d2926 don't rely on client side to increment id (duh) 2015-02-20 17:37:34 -05:00
psychobunny
7a8d84c011 ability to add a claimability limit to rewards 2015-02-20 17:33:29 -05:00
psychobunny
fe83adcbae prevent rewards from clobbering each other on save 2015-02-20 15:21:09 -05:00
psychobunny
b26bf9f22d rewards: bug fixes and cleanup, pretty much done part 1 ;) 2015-02-20 14:45:07 -05:00
psychobunny
aa38d6dda2 rewards bug fixes 2015-02-20 14:21:40 -05:00
psychobunny
949fcbbf11 rewards: big feature sprint 2015-02-20 13:40:19 -05:00
psychobunny
54c5034ce0 moved rewards/conditions/conditoinals out of core into rewards-essentials 2015-02-20 12:31:38 -05:00
psychobunny
7fa61f03e2 saving conditions 2015-02-20 12:16:13 -05:00
psychobunny
8373f7359e don't error out if reward not filled 2015-02-19 23:53:50 -05:00
psychobunny
09086f7d30 deleting rewards 2015-02-19 23:49:36 -05:00
psychobunny
c844400ab9 cleanup and fix for adding new rewards 2015-02-19 23:40:23 -05:00
psychobunny
5f54de3b37 successfully got loading and saving of rewards working 2015-02-19 23:39:39 -05:00
psychobunny
e5115c0cf2 differentiate between rid and id 2015-02-19 23:15:37 -05:00
psychobunny
67b693cd3a pass in expected format of active rewards 2015-02-19 23:02:52 -05:00
psychobunny
91c02d4e29 ditching rewardID in favour of verbose id's 2015-02-19 22:19:04 -05:00
psychobunny
46e0fad2d8 rewards: code organization, getting ready to code saving/loading of active rewards 2015-02-19 22:06:52 -05:00
psychobunny
b1c37775c5 more styling 2015-02-19 18:22:21 -05:00
psychobunny
7457b22427 added more api fields to rewards 2015-02-19 17:48:01 -05:00
psychobunny
4f53bd59be rewards - got custom inputs loading 2015-02-19 17:24:58 -05:00
psychobunny
94c1c2d547 fixed loading mock data 2015-02-19 16:57:32 -05:00
psychobunny
2bebac964e loading mock data 2015-02-19 16:09:58 -05:00
psychobunny
0e7c3be9d3 made some progress with mock api + acp 2015-02-19 15:04:13 -05:00
psychobunny
bdcf090aaa init rewards system 2015-02-19 14:20:13 -05:00