Commit Graph

12220 Commits

Author SHA1 Message Date
Julian Lam
d102ff0704 fixed #2656 2015-01-26 21:35:30 -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
psychobunny
c9f0e61b57 Update CONTRIBUTING.md 2015-01-26 15:47:28 -05:00
psychobunny
d3d321f1b7 CLA mention in contributing.md 2015-01-26 15:46:34 -05:00
Julian Lam
57a3d53dee updating mentions minver 2015-01-25 21:04:11 -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
288d507eb6 pass the loaded pids to action:posts.loaded 2015-01-24 18:48:34 -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
a526577927 only attempt to remove address bar if current position is at the top of screen 2015-01-22 15:08:23 -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
77216acbcc user.delete test 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
4603484558 user.delete test 2015-01-22 14:18:19 -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
63f449d0ad Merge remote-tracking branch 'origin/0.7.0' into 0.7.0 2015-01-21 23:11:14 -05:00
Julian Lam
3ade5da00f groups sorting by creation date 2015-01-21 23:10:59 -05:00
barisusakli
c6ae6fae54 fix typo in test 2015-01-21 22:55:13 -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
0d8dcbf734 Merge branch 'master' into 0.7.0 2015-01-21 17:41:51 -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
af1fa11606 rejigged search so it grabs the values on method execution, instead of being passed in 2015-01-21 17:15:28 -05:00
Julian Lam
2a6de59277 if group search is executed with empty string, return all groups 2015-01-21 16:55:20 -05:00