Commit Graph

11851 Commits

Author SHA1 Message Date
barisusakli
0bfa8d337a removed console.logs 2015-02-01 19:13:27 -05:00
barisusakli
2c8e8a1f1c closes #2550, closes #2518 2015-02-01 19:12:03 -05:00
Mega
2f19f4106a Added data argument to action:posts.edited hook 2015-02-02 02:36:17 +03:00
Julian Lam
904daf7776 Merge branch 'master' into 0.7.0 2015-02-01 17:24:56 -05:00
Julian Lam
79083004e4 added missing file 2015-02-01 17:22:40 -05:00
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
Mega
c16689503d Added as argument post id in action:posts.edited 2015-01-31 15:34:40 +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
607e88b3c3 fixed browser title in user groups page 2015-01-30 16:29:33 -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
b62337b0b9 fixed browser title in user groups page 2015-01-30 16:27:29 -05:00
Julian Lam
da0b2c84e6 passing memberCount and createTime into getUserGroups 2015-01-30 16:24:57 -05:00
barisusakli
c8f87e5d36 removed console.log 2015-01-30 16:16:49 -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
psychobunny
7639bff0fe updated package.json 2015-01-30 13:06:17 -05:00
psychobunny
f5ef3cf866 Gruntfile.js 2015-01-30 13:06:04 -05:00
barisusakli
2512598917 Merge remote-tracking branch 'origin/master' into 0.7.0 2015-01-30 12:33:31 -05:00
barisusakli
60e052e788 closes #2674 2015-01-30 12:28:29 -05:00
barisusakli
3bb9c9531f catch errors from static hook 2015-01-30 12:25:07 -05:00
psychobunny
66b6e12aa3 added grunt deps 2015-01-30 12:21:00 -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
Julian Lam
f793536131 latest translations and fallbacks 2015-01-29 17:45:42 -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
Julian Lam
f753cfb1c9 search on grop sort change too 2015-01-29 16:45:51 -05:00
Julian Lam
b052ed3504 searching on keyup instead of enter key 2015-01-29 16:42:00 -05:00
Julian Lam
6ebc048f1f searching on keyup instead of enter key 2015-01-29 16:41:48 -05:00
psychobunny
6a2c35c263 latest t.js 2015-01-29 15:45:31 -05:00
Barış Soner Uşaklı
eb5746b2b4 Merge pull request #2589 from Schamper/bat-script
Simple bat file for Windows. Not all options are supported, but it's a start
2015-01-29 14:19:48 -05:00
Barış Soner Uşaklı
af4a272264 Merge pull request #2636 from Schamper/fix-editorconfig
Fix editorconfig syntax
2015-01-29 14:19:29 -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