Commit Graph

5434 Commits

Author SHA1 Message Date
Barış Soner Uşaklı
14888a96cb Merge remote-tracking branch 'origin/master'
Conflicts:
	src/upgrade.js
2015-02-23 15:04:46 -05:00
Barış Soner Uşaklı
55884220b4 #2749 upgrade plugins:active to zset 2015-02-23 14:57:22 -05:00
Julian Lam
d3ff6a9f47 hidden groups are invisible to non-members, #2758 2015-02-23 14:54:48 -05:00
psychobunny
44c6375d91 it's on line 24 now 2015-02-23 14:11:51 -05:00
psychobunny
f63ecac8ee upgrade script for nodebb-rewards-essentials 2015-02-23 14:11:50 -05:00
Barış Soner Uşaklı
89f2520eba #2560 fix user link pic 2015-02-23 14:07:51 -05:00
Barış Soner Uşaklı
e6e755dd46 #2560 2015-02-23 14:05:43 -05:00
Barış Soner Uşaklı
1d5e15eab4 closes #2560 2015-02-23 13:39:29 -05:00
Julian Lam
8b81f3d835 server-side support for hidden option in group admin, #2758 2015-02-23 13:05:33 -05:00
Julian Lam
218ecce6c1 accessing search route with no term auto-expands the form now, part 1 of 2, #2757 2015-02-23 09:12:13 -05:00
barisusakli
56d18666d6 closes #2752 2015-02-22 14:47:07 -05:00
psychobunny
cb7c318377 closes #2751 2015-02-20 19:31:33 -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
bb35950a5a rewards acp - ability to set amount of times a user can claim reward 2015-02-20 17:19:39 -05:00
Barış Soner Uşaklı
61b1251a73 removed sort methods 2015-02-20 16:34:31 -05:00
psychobunny
5a6457ec7c adding rewards-essentials to core 2015-02-20 16:09:20 -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
2ba1363e12 results.owner* 2015-02-20 14:23:57 -05:00
psychobunny
aa38d6dda2 rewards bug fixes 2015-02-20 14:21:40 -05:00
psychobunny
7e9095b21b added "owner" to action:post.upvote/downvote/unvote 2015-02-20 14:21:33 -05:00
Barış Soner Uşaklı
f9581e435d getGroupsData method and filter:groups.get 2015-02-20 14:20:49 -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
a7c3d193cc include nodebb-rewards namespace 2015-02-20 12:17:58 -05:00
psychobunny
7fa61f03e2 saving conditions 2015-02-20 12:16:13 -05:00
psychobunny
1998f102d6 using tjs to load new lines instead of cloning 2015-02-20 00:26:19 -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
cd26f5d06d passing in values for saving rewards 2015-02-19 22:44:23 -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
2cc6f0c507 fixed disable logic 2015-02-19 21:56:50 -05:00
psychobunny
4acf8cafee rewards: adding new rows 2015-02-19 21:51:32 -05:00
Julian Lam
88aa427669 updated upgrade script so that it does not rely on Groups.list, as the method has changed between v0.5.0 and v0.6.0.
Also added setImmediate call so eachLimit doesn't explode
2015-02-19 19:34:13 -05:00
psychobunny
3ca11c1947 rewards: disable / delete 2015-02-19 18:51:42 -05:00
psychobunny
4145046e02 rewards: got everything loading 2015-02-19 18:46:36 -05:00
psychobunny
b1c37775c5 more styling 2015-02-19 18:22:21 -05:00
barisusakli
756d03fa62 closes #2745
generate paths on retrieval instead of notification creation
also fix follow notification path
2015-02-19 18:14:38 -05:00
psychobunny
7457b22427 added more api fields to rewards 2015-02-19 17:48:01 -05:00
psychobunny
9291ec64f9 styling 2015-02-19 17:47:47 -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
Julian Lam
ceb18fe73d added new hook and method for plugins to introduce their own formatting options, #2743 2015-02-19 16:51:15 -05:00