11415 Commits

Author	SHA1	Message	Date
Julian Lam	06238f6894	partial fix to #2655	2015-01-27 11:12:19 -05:00
barisusakli	c33b369858	closes #2658	2015-01-27 10:36:35 -05:00
barisusakli	20a2262e43	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-26 18:24:24 -05:00
barisusakli	bf9b633d50	fix Group.exists if an array is passed in	2015-01-26 16:48:39 -05:00
barisusakli	26defd7dca	Groups.getGroupNameByGroupSlug	2015-01-25 20:53:57 -05:00
barisusakli	e31bf9131f	added topics.follow and toggleFollow	2015-01-25 16:47:51 -05:00
Julian Lam	5a1c2b9ddf	booleanifying sendPostNotification user setting when requested, and now only sending the post notification if the user has flipped that option on in user settings... kind of an important thing to forget...	2015-01-25 09:41:51 -05:00
barisusakli	835ad3ea53	fix post.getUpvoters to work with an array	2015-01-24 13:16:07 -05:00
Julian Lam	bc9ede7b6c	changed emailer.send so that it processes a callback, if provided. Also added new option to receive emails every time a topic you subscribe to is posted to.	2015-01-23 21:28:18 -05:00
barisusakli	90b1b13914	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-23 18:21:24 -05:00
barisusakli	4b3aa26abd	closes #2633	2015-01-23 18:19:30 -05:00
barisusakli	19814a619d	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-23 15:13:24 -05:00
barisusakli	caec718092	callback for getUidsInRoom	2015-01-23 15:12:57 -05:00
psychobunny	3fb7eb766b	closes #2646	2015-01-23 15:06:53 -05:00
Julian Lam	ca92372676	fixed #2644	2015-01-23 07:27:49 -05:00
barisusakli	535f30aa9e	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-22 16:40:31 -05:00
Julian Lam	70f6c396fc	updated widget container to use h3 in panel header	2015-01-22 16:38:24 -05:00
barisusakli	bd8a77a22b	dont crash if callback isnt passed in	2015-01-22 16:23:38 -05:00
barisusakli	2c45dc6450	redis helpers	2015-01-22 16:21:36 -05:00
Julian Lam	0bf98b5494	simplified isOwner check because there's no need to check admin status as admins automatically become owners now	2015-01-22 16:08:55 -05:00
Julian Lam	070215b05e	simplified isOwner check because there's no need to check admin status as admins automatically become owners now	2015-01-22 16:08:20 -05:00
Julian Lam	4c927060d9	Merge branch 'master' into 0.7.0	2015-01-22 16:02:41 -05:00
Julian Lam	0c2d2a28ba	admins can bypass the request step of a group and just join it, and they also become owners when they join a group	2015-01-22 16:01:17 -05:00
Julian Lam	72f28b7b38	closed #2641	2015-01-22 14:20:33 -05:00
barisusakli	d895ca6827	missing semicolon	2015-01-22 14:20:33 -05:00
barisusakli	5fb8817b3c	closes #2643	2015-01-22 14:20:33 -05:00
Julian Lam	d2217b8137	closed #2641	2015-01-22 14:20:10 -05:00
barisusakli	740c52fc4f	missing semicolon	2015-01-22 14:19:23 -05:00
barisusakli	22c541d95f	closes #2643	2015-01-22 14:13:39 -05:00
barisusakli	d40646ac42	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-22 12:19:46 -05:00
barisusakli	f3719df997	getGroups method to get a range	2015-01-21 23:16:31 -05:00
Julian Lam	c8c7081f5d	Merge branch 'master' into 0.7.0	2015-01-21 23:11:20 -05:00
Julian Lam	3ade5da00f	groups sorting by creation date	2015-01-21 23:10:59 -05:00
barisusakli	afe29d3133	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-21 22:54:15 -05:00
barisusakli	25f6b816ed	send iso and unix timestamp	2015-01-21 22:53:33 -05:00
barisusakli	274523266f	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-21 22:51:18 -05:00
barisusakli	c379753341	upgrade scripts ... upgrade groups to sorted set(groups:createtime) upgrade upgrade groups:<name>:members to sorted set new database methods tests	2015-01-21 22:48:27 -05:00
Julian Lam	4a3255d4fd	search sorting	2015-01-21 17:41:43 -05:00
Julian Lam	be30dcc2d0	Merge branch 'master' into 0.7.0 ... Conflicts: public/src/client/groups/list.js	2015-01-21 17:16:06 -05:00
Julian Lam	2a6de59277	if group search is executed with empty string, return all groups	2015-01-21 16:55:20 -05:00
Julian Lam	fd8a885145	fixed tests by removing the broken one, heh heh heh	2015-01-21 16:33:18 -05:00
Julian Lam	78a5843ae4	fixed tests by removing the broken one, heh heh heh	2015-01-21 16:33:09 -05:00
Julian Lam	d4779c8c0a	Merge branch 'master' into 0.7.0	2015-01-21 15:46:58 -05:00
Julian Lam	6502dd2561	group searching	2015-01-21 15:43:05 -05:00
Julian Lam	fa27461abc	upgrading administrator groups as well	2015-01-21 14:41:42 -05:00
barisusakli	dd38ee96fa	return cover:url in user groups	2015-01-21 13:46:40 -05:00
barisusakli	f8a03c4fca	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-20 20:13:01 -05:00
Julian Lam	22a619d9c7	fixed #2631	2015-01-20 19:30:11 -05:00
barisusakli	ea3d7d610a	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-20 19:24:30 -05:00
barisusakli	7efc0619cc	dont crash if data.username is undefined, dont set username to empty value	2015-01-20 18:13:48 -05:00