5148 Commits

Author	SHA1	Message	Date
Julian Lam	ade12116a1	closed #2766	2015-02-25 10:51:35 -05:00
Julian Lam	ba7c873f07	closed #2765	2015-02-25 09:57:32 -05:00
psychobunny	aa12ab9478	think its fairly safe to say this isn't experimental anymore ... worked every single time I reloaded today, and that'd be about a hundred thousand times so far	2015-02-24 17:57:18 -05:00
psychobunny	7fe8180cf4	Merge remote-tracking branch 'origin/master' into grunt-dev	2015-02-24 16:41:07 -05:00
psychobunny	f8663bbfd0	added tpl flag to --from-file	2015-02-24 15:46:37 -05:00
psychobunny	e5c842d923	ability to send in extensions (comma delimited) to --from-file	2015-02-24 15:33:37 -05:00
Julian Lam	98158fb6f9	@barisusakli works perfectly	2015-02-24 15:22:25 -05:00
Julian Lam	912de27c9d	fixed indentation issues	2015-02-24 14:43:19 -05:00
Barış Soner Uşaklı	c94c1430b7	api/post/pid route	2015-02-24 13:02:58 -05:00
psychobunny	eb6754c5eb	nice, I figured out how to speed up grunt watch	2015-02-24 12:56:49 -05:00
psychobunny	01c15b8884	Merge remote-tracking branch 'origin/master' into grunt-dev	2015-02-24 12:23:52 -05:00
Barış Soner Uşaklı	52aa7d27e8	#2761	2015-02-24 11:58:09 -05:00
Barış Soner Uşaklı	9de0c0cdd4	closes #2761	2015-02-24 11:55:16 -05:00
psychobunny	fdc8b67449	require pkg when needed	2015-02-23 17:25:36 -05:00
psychobunny	f408c76a98	requiring plugins in meta when needed	2015-02-23 17:24:20 -05:00
Julian Lam	3e3fff9fe8	hooking up accept/reject invite, #2758	2015-02-23 16:46:48 -05:00
Julian Lam	03e39f7b9b	isInvited mechanic for #2758	2015-02-23 16:31:23 -05:00
psychobunny	13fa1f6b9a	require socket.io only when you need it, shaves off another 0.5s on load	2015-02-23 16:24:43 -05:00
psychobunny	61b8fd2402	woops, left in some debug statements	2015-02-23 16:13:04 -05:00
psychobunny	dee5d18439	require npm module only as needed - shaves off a full second of loading time yay	2015-02-23 16:08:29 -05:00
Barış Soner Uşaklı	66d6c49ed4	closes #2749	2015-02-23 15:55:45 -05:00
Julian Lam	8262c38ac8	upgrading privilege sets to be system groups, so they're not in the way	2015-02-23 15:43:32 -05:00
Julian Lam	4984f2f449	Merge branch 'master' of github.com:nodebb/NodeBB	2015-02-23 15:25:37 -05:00
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