11415 Commits

Author	SHA1	Message	Date
Julian Lam	c652d1b80e	removed console log from upgrade script	2015-02-01 17:22:08 -05:00
barisusakli	feeeb83a43	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-31 15:47:40 -05:00
barisusakli	4d9e7fce22	notifyOnlineUsers helper	2015-01-31 15:42:10 -05:00
barisusakli	f988959989	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-31 13:37:57 -05:00
barisusakli	7363c71180	sitemap style	2015-01-31 13:37:34 -05:00
Barış Soner Uşaklı	63fd3f259f	Merge pull request #2676 from MegaGM/Fix-User.setUserField/s ... Uploading avatar causes crash on 0.6.1-dev	2015-01-31 13:16:25 -05:00
barisusakli	dc0229fc73	closes #2677	2015-01-31 13:10:43 -05:00
Mega	2e1d1ac665	Uploading avatar causes crash on 0.6.1-dev	2015-01-31 18:06:54 +03:00
barisusakli	15b5c56612	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-31 00:00:24 -05:00
barisusakli	2c033bf286	set memberCount to 0 on creation	2015-01-31 00:00:02 -05:00
barisusakli	b3a968e006	merge	2015-01-30 22:41:18 -05:00
barisusakli	dc2a2aa98e	store group member count in group hash ... yet another upgrade script	2015-01-30 22:38:42 -05:00
Julian Lam	ecfa8f7a7d	passing memberCount and createTime into getUserGroups	2015-01-30 16:29:33 -05:00
Julian Lam	e4e9020e1f	added groups page to user profile	2015-01-30 16:29:33 -05:00
Julian Lam	da0b2c84e6	passing memberCount and createTime into getUserGroups	2015-01-30 16:24:57 -05:00
Julian Lam	4a7ec3ccc6	added groups page to user profile	2015-01-30 15:48:21 -05:00
psychobunny	4f5918390a	if user search is blank, return all users	2015-01-30 14:19:15 -05:00
barisusakli	2512598917	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-30 12:33:31 -05:00
barisusakli	3bb9c9531f	catch errors from static hook	2015-01-30 12:25:07 -05:00
Julian Lam	77a9c7c195	Merge branch 'master' into 0.7.0	2015-01-29 19:51:29 -05:00
Julian Lam	939e623547	collapsing a bunch of whitespace using async.apply, and also fixed #2672 as well	2015-01-29 19:49:32 -05:00
barisusakli	39cac43b96	if key isn't found dont error ... Conflicts: src/database/redis/main.js	2015-01-29 19:40:51 -05:00
barisusakli	f3f3ca8e50	if key isn't found dont error	2015-01-29 19:25:01 -05:00
Julian Lam	a7a4edfd37	administrators group no longer shows up in group searches	2015-01-29 19:18:18 -05:00
barisusakli	d1a1cada19	fix typo	2015-01-29 17:12:12 -05:00
barisusakli	530bdbbd1a	dont rename if key doesn't exist	2015-01-29 17:10:49 -05:00
barisusakli	b54f2de504	pass uid to getUsers and getUsersFromSets	2015-01-29 17:02:20 -05:00
barisusakli	4413c70d3c	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-29 13:42:05 -05:00
barisusakli	57453f33ab	new group members route ... getMembers can take start end ability to specify how many group members to return	2015-01-29 13:37:45 -05:00
barisusakli	e16cfa396b	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-29 12:53:01 -05:00
barisusakli	a1c8902b4e	hook fixes ... new hook, action:user.online, fix action:user.set hooks so they pass in uid check err before firing hooks	2015-01-29 12:52:30 -05:00
barisusakli	aaa1fae558	closes #2597	2015-01-29 01:06:48 -05:00
barisusakli	f9fecf4bc1	faster sort users	2015-01-28 19:19:55 -05:00
barisusakli	60fecdbdf8	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-28 19:08:19 -05:00
barisusakli	0fab6c243c	increase rate limit timeframe from 1 second to 10 seconds	2015-01-28 19:07:44 -05:00
barisusakli	c87c99eadd	dont check admin emits against flooding	2015-01-28 17:08:41 -05:00
barisusakli	ed714cdf77	user search paginator	2015-01-28 15:08:33 -05:00
barisusakli	98ff75b9c3	closes #2581	2015-01-28 13:46:11 -05:00
Julian Lam	aabfeba38d	Merge branch 'master' into 0.7.0 ... Conflicts: src/user.js	2015-01-28 13:39:21 -05:00
barisusakli	9db7f0f9a0	doing on master as well	2015-01-28 10:30:18 -05:00
psychobunny	d47cd270df	some random favourite typo	2015-01-27 23:37:47 -05:00
barisusakli	ab69477b24	moved filter:user,get to central function	2015-01-27 17:37:21 -05:00
psychobunny	c06132e779	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-27 17:13:43 -05:00
psychobunny	f253b11d71	passed in wrong object	2015-01-27 17:09:45 -05:00
psychobunny	0828caab32	renamed to filter:userlist.get	2015-01-27 16:51:48 -05:00
psychobunny	943e268ffc	add filter:users.get	2015-01-27 16:39:33 -05:00
barisusakli	ddee93beab	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-27 16:20:20 -05:00
barisusakli	27518716a0	make getUsers public for plugins	2015-01-27 16:04:02 -05:00
Julian Lam	891731ca52	enabled saving of sendPostNotification setting	2015-01-27 11:42:03 -05:00
Julian Lam	08e39d150e	fixed #2655	2015-01-27 11:19:36 -05:00