barisusakli
|
def600e927
|
search in categories and children
|
10 years ago |
Julian Lam
|
f7ccdc3668
|
Merge branch 'master' of github.com:NodeBB/NodeBB
|
10 years ago |
|
Julian Lam
|
fdaccc804c
|
handling cases where no callback is passed to emailer.send
|
10 years ago |
|
barisusakli
|
57ebcb8b8a
|
closes #2694
|
10 years ago |
|
barisusakli
|
39a75ea2d7
|
fix recent replies
|
10 years ago |
|
barisusakli
|
385760bdda
|
#2690
|
10 years ago |
|
barisusakli
|
2911de0af9
|
really fix tests
|
10 years ago |
|
barisusakli
|
cba9ad3d60
|
fix tests, and groups.join duh
|
10 years ago |
|
barisusakli
|
16537bc636
|
prevent double callback
|
10 years ago |
|
barisusakli
|
311fd00ecd
|
dont allow guests to join groups
|
10 years ago |
|
barisusakli
|
b7602c6e80
|
removed winston.err
|
10 years ago |
|
barisusakli
|
fd773807e9
|
#2685 fix copy paste fail 😦
|
10 years ago |
|
barisusakli
|
25ccc573c0
|
closes #2687
|
10 years ago |
|
barisusakli
|
255f50343c
|
closes #2685
|
10 years ago |
|
barisusakli
|
28c57b6635
|
removed unused requires
|
10 years ago |
|
barisusakli
|
cc2ab12f29
|
removed bans from downvotes and flags
cleanup thread tools emits
|
10 years ago |
|
Julian Lam
|
b3278cf8e8
|
fixed #2681
|
10 years ago |
|
barisusakli
|
6a837632fa
|
fix first post loading when pagination is enabled
|
10 years ago |
|
Julian Lam
|
cfcfc8e0b1
|
Revert "fixed #2681"
This reverts commit a46aaf2c87.
|
10 years ago |
|
Julian Lam
|
a46aaf2c87
|
fixed #2681
|
10 years ago |
|
barisusakli
|
2c8e8a1f1c
|
closes #2550, closes #2518
|
10 years ago |
|
Julian Lam
|
904daf7776
|
Merge branch 'master' into 0.7.0
|
10 years ago |
|
Julian Lam
|
c652d1b80e
|
removed console log from upgrade script
|
10 years ago |
|
barisusakli
|
feeeb83a43
|
Merge remote-tracking branch 'origin/master' into 0.7.0
|
10 years ago |
|
barisusakli
|
4d9e7fce22
|
notifyOnlineUsers helper
|
10 years ago |
|
barisusakli
|
f988959989
|
Merge remote-tracking branch 'origin/master' into 0.7.0
|
10 years ago |
|
barisusakli
|
7363c71180
|
sitemap style
|
10 years ago |
|
Barış Soner Uşaklı
|
63fd3f259f
|
Merge pull request #2676 from MegaGM/Fix-User.setUserField/s
Uploading avatar causes crash on 0.6.1-dev
|
10 years ago |
|
barisusakli
|
dc0229fc73
|
closes #2677
|
10 years ago |
Mega
|
2e1d1ac665
|
Uploading avatar causes crash on 0.6.1-dev
|
10 years ago |
|
barisusakli
|
15b5c56612
|
Merge remote-tracking branch 'origin/master' into 0.7.0
|
10 years ago |
|
barisusakli
|
2c033bf286
|
set memberCount to 0 on creation
|
10 years ago |
|
barisusakli
|
b3a968e006
|
merge
|
10 years ago |
|
barisusakli
|
dc2a2aa98e
|
store group member count in group hash
yet another upgrade script
|
10 years ago |
|
Julian Lam
|
ecfa8f7a7d
|
passing memberCount and createTime into getUserGroups
|
10 years ago |
|
Julian Lam
|
e4e9020e1f
|
added groups page to user profile
|
10 years ago |
|
Julian Lam
|
da0b2c84e6
|
passing memberCount and createTime into getUserGroups
|
10 years ago |
|
Julian Lam
|
4a7ec3ccc6
|
added groups page to user profile
|
10 years ago |
psychobunny
|
4f5918390a
|
if user search is blank, return all users
|
10 years ago |
|
barisusakli
|
2512598917
|
Merge remote-tracking branch 'origin/master' into 0.7.0
|
10 years ago |
|
barisusakli
|
3bb9c9531f
|
catch errors from static hook
|
10 years ago |
|
Julian Lam
|
77a9c7c195
|
Merge branch 'master' into 0.7.0
|
10 years ago |
|
Julian Lam
|
939e623547
|
collapsing a bunch of whitespace using async.apply, and also fixed #2672 as well
|
10 years ago |
|
barisusakli
|
39cac43b96
|
if key isn't found dont error
Conflicts:
src/database/redis/main.js
|
10 years ago |
|
barisusakli
|
f3f3ca8e50
|
if key isn't found dont error
|
10 years ago |
|
Julian Lam
|
a7a4edfd37
|
administrators group no longer shows up in group searches
|
10 years ago |
|
barisusakli
|
d1a1cada19
|
fix typo
|
10 years ago |
|
barisusakli
|
530bdbbd1a
|
dont rename if key doesn't exist
|
10 years ago |
|
barisusakli
|
b54f2de504
|
pass uid to getUsers and getUsersFromSets
|
10 years ago |
|
barisusakli
|
4413c70d3c
|
Merge remote-tracking branch 'origin/master' into 0.7.0
|
10 years ago |
|
barisusakli
|
57453f33ab
|
new group members route
getMembers can take start end
ability to specify how many group members to return
|
10 years ago |
|
barisusakli
|
e16cfa396b
|
Merge remote-tracking branch 'origin/master' into 0.7.0
|
10 years ago |
|
barisusakli
|
a1c8902b4e
|
hook fixes
new hook, action:user.online,
fix action:user.set hooks so they pass in uid
check err before firing hooks
|
10 years ago |
|
barisusakli
|
aaa1fae558
|
closes #2597
|
10 years ago |
|
barisusakli
|
f9fecf4bc1
|
faster sort users
|
10 years ago |
|
barisusakli
|
60fecdbdf8
|
Merge remote-tracking branch 'origin/master' into 0.7.0
|
10 years ago |
|
barisusakli
|
0fab6c243c
|
increase rate limit timeframe from 1 second to 10 seconds
|
10 years ago |
|
barisusakli
|
c87c99eadd
|
dont check admin emits against flooding
|
10 years ago |
|
barisusakli
|
ed714cdf77
|
user search paginator
|
10 years ago |
|
barisusakli
|
98ff75b9c3
|
closes #2581
|
10 years ago |
|
Julian Lam
|
aabfeba38d
|
Merge branch 'master' into 0.7.0
Conflicts:
src/user.js
|
10 years ago |
|
barisusakli
|
9db7f0f9a0
|
doing on master as well
|
10 years ago |
|
psychobunny
|
d47cd270df
|
some random favourite typo
|
10 years ago |
|
barisusakli
|
ab69477b24
|
moved filter:user,get to central function
|
10 years ago |
|
psychobunny
|
c06132e779
|
Merge remote-tracking branch 'origin/master' into 0.7.0
|
10 years ago |
|
psychobunny
|
f253b11d71
|
passed in wrong object
|
10 years ago |
|
psychobunny
|
0828caab32
|
renamed to filter:userlist.get
|
10 years ago |
|
psychobunny
|
943e268ffc
|
add filter:users.get
|
10 years ago |
|
barisusakli
|
ddee93beab
|
Merge remote-tracking branch 'origin/master' into 0.7.0
|
10 years ago |
|
barisusakli
|
27518716a0
|
make getUsers public for plugins
|
10 years ago |
|
Julian Lam
|
891731ca52
|
enabled saving of sendPostNotification setting
|
10 years ago |
|
Julian Lam
|
08e39d150e
|
fixed #2655
|
10 years ago |
|
Julian Lam
|
06238f6894
|
partial fix to #2655
|
10 years ago |
|
barisusakli
|
c33b369858
|
closes #2658
|
10 years ago |
|
barisusakli
|
20a2262e43
|
Merge remote-tracking branch 'origin/master' into 0.7.0
|
10 years ago |
|
barisusakli
|
bf9b633d50
|
fix Group.exists if an array is passed in
|
10 years ago |
|
barisusakli
|
26defd7dca
|
Groups.getGroupNameByGroupSlug
|
10 years ago |
|
barisusakli
|
e31bf9131f
|
added topics.follow and toggleFollow
|
10 years ago |
|
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...
|
10 years ago |
|
barisusakli
|
835ad3ea53
|
fix post.getUpvoters to work with an array
|
10 years ago |
|
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.
|
10 years ago |
|
barisusakli
|
90b1b13914
|
Merge remote-tracking branch 'origin/master' into 0.7.0
|
10 years ago |
|
barisusakli
|
4b3aa26abd
|
closes #2633
|
10 years ago |
|
barisusakli
|
19814a619d
|
Merge remote-tracking branch 'origin/master' into 0.7.0
|
10 years ago |
|
barisusakli
|
caec718092
|
callback for getUidsInRoom
|
10 years ago |
|
psychobunny
|
3fb7eb766b
|
closes #2646
|
10 years ago |
|
Julian Lam
|
ca92372676
|
fixed #2644
|
10 years ago |
|
barisusakli
|
535f30aa9e
|
Merge remote-tracking branch 'origin/master' into 0.7.0
|
10 years ago |
|
Julian Lam
|
70f6c396fc
|
updated widget container to use h3 in panel header
|
10 years ago |
|
barisusakli
|
bd8a77a22b
|
dont crash if callback isnt passed in
|
10 years ago |
|
barisusakli
|
2c45dc6450
|
redis helpers
|
10 years ago |
|
Julian Lam
|
0bf98b5494
|
simplified isOwner check because there's no need to check admin status as admins automatically become owners now
|
10 years ago |
|
Julian Lam
|
070215b05e
|
simplified isOwner check because there's no need to check admin status as admins automatically become owners now
|
10 years ago |
|
Julian Lam
|
4c927060d9
|
Merge branch 'master' into 0.7.0
|
10 years ago |
|
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
|
10 years ago |
|
Julian Lam
|
72f28b7b38
|
closed #2641
|
10 years ago |
|
barisusakli
|
d895ca6827
|
missing semicolon
|
10 years ago |
|
barisusakli
|
5fb8817b3c
|
closes #2643
|
10 years ago |
|
Julian Lam
|
d2217b8137
|
closed #2641
|
10 years ago |
|
barisusakli
|
740c52fc4f
|
missing semicolon
|
10 years ago |
|
barisusakli
|
22c541d95f
|
closes #2643
|
10 years ago |
|
barisusakli
|
d40646ac42
|
Merge remote-tracking branch 'origin/master' into 0.7.0
|
10 years ago |
|
barisusakli
|
f3719df997
|
getGroups method to get a range
|
10 years ago |
|
Julian Lam
|
c8c7081f5d
|
Merge branch 'master' into 0.7.0
|
10 years ago |
|
Julian Lam
|
3ade5da00f
|
groups sorting by creation date
|
10 years ago |
|
barisusakli
|
afe29d3133
|
Merge remote-tracking branch 'origin/master' into 0.7.0
|
10 years ago |
|
barisusakli
|
25f6b816ed
|
send iso and unix timestamp
|
10 years ago |
|
barisusakli
|
274523266f
|
Merge remote-tracking branch 'origin/master' into 0.7.0
|
10 years ago |
|
barisusakli
|
c379753341
|
upgrade scripts
upgrade groups to sorted set(groups:createtime) upgrade
upgrade groups:<name>:members to sorted set
new database methods
tests
|
10 years ago |
|
Julian Lam
|
4a3255d4fd
|
search sorting
|
10 years ago |
|
Julian Lam
|
be30dcc2d0
|
Merge branch 'master' into 0.7.0
Conflicts:
public/src/client/groups/list.js
|
10 years ago |
|
Julian Lam
|
2a6de59277
|
if group search is executed with empty string, return all groups
|
10 years ago |
|
Julian Lam
|
fd8a885145
|
fixed tests by removing the broken one, heh heh heh
|
10 years ago |
|
Julian Lam
|
78a5843ae4
|
fixed tests by removing the broken one, heh heh heh
|
10 years ago |
|
Julian Lam
|
d4779c8c0a
|
Merge branch 'master' into 0.7.0
|
10 years ago |
|
Julian Lam
|
6502dd2561
|
group searching
|
10 years ago |
|
Julian Lam
|
fa27461abc
|
upgrading administrator groups as well
|
10 years ago |
|
barisusakli
|
dd38ee96fa
|
return cover:url in user groups
|
10 years ago |
|
barisusakli
|
f8a03c4fca
|
Merge remote-tracking branch 'origin/master' into 0.7.0
|
10 years ago |
|
Julian Lam
|
22a619d9c7
|
fixed #2631
|
10 years ago |
|
barisusakli
|
ea3d7d610a
|
Merge remote-tracking branch 'origin/master' into 0.7.0
|
10 years ago |
|
barisusakli
|
7efc0619cc
|
dont crash if data.username is undefined, dont set username to empty value
|
10 years ago |
|
barisusakli
|
f1a3815ddc
|
action:user.updateProfile
|
10 years ago |
|
barisusakli
|
aab2bc0b39
|
keep track of the last 20 events
|
10 years ago |
|
Julian Lam
|
c4bc51b834
|
fixing installation script that broke with recent updates to groups
|
10 years ago |
|
barisusakli
|
21522e59c4
|
added slug to user group return #2635
|
10 years ago |
|
barisusakli
|
96c27d29f4
|
dont crash if callback isn't supplied
|
10 years ago |
|
barisusakli
|
2f955c3af4
|
getUpvoters works with array
|
10 years ago |
|
Julian Lam
|
d2938ea509
|
closed #2626
|
10 years ago |
|
barisusakli
|
d96a1f0365
|
closes #2630
|
10 years ago |
|
Julian Lam
|
5160ab1ed1
|
closed #2625
|
10 years ago |
|
barisusakli
|
4c62590bc8
|
closes #2628
|
10 years ago |
|
barisusakli
|
ad21e73491
|
send values to plugins when updating groups
|
10 years ago |
|
Julian Lam
|
eb5b8ccec3
|
better check for group exist, groups with different cases can no longer be created, #2588
|
10 years ago |
|
barisusakli
|
9f8b274e24
|
filter:group.get
|
10 years ago |
|
barisusakli
|
94fa212eab
|
added filter:groups.get
|
10 years ago |
|
Julian Lam
|
c026a64e8e
|
adding concept of group slugs, #2588. ping @barisusakli for downstream plugin changes
|
10 years ago |
|
barisusakli
|
6f140384e0
|
send groupData on action:group.create
|
10 years ago |
|
Julian Lam
|
491e0060d4
|
more files that should be loaded for maintenanceMode to work
|
10 years ago |
|
Julian Lam
|
fe45fc967d
|
updating maintenance mode middleware so js doesn't crash until login client-side js is ready
|
10 years ago |
|
barisusakli
|
f5b448c300
|
closes #2623
|
10 years ago |
|
barisusakli
|
e46cda835a
|
closes #2624
|
10 years ago |
TheBronx
|
0bd48ef023
|
fix error in previous commit
fix error in previous commit
|
10 years ago |
|
TheBronx
|
e3cf528b57
|
pass also user id on fireHook
pass also user id on fireHook as suggested by @barisusakli
|
10 years ago |
|
TheBronx
|
6ccb35576c
|
new filter hooks on favourite actions #2620
before a favourite action is made, fire a filter hook so plugins can
modify or cancel that action before it takes place.
|
10 years ago |
|
barisusakli
|
03ae7db561
|
on user delete remove from ip sorted set, fix search by ip
|
10 years ago |
|
barisusakli
|
0741f00e4f
|
Merge remote-tracking branch 'origin/master' into 0.7.0
|
10 years ago |
|
barisusakli
|
f67053df52
|
figure out pathname, dont crash if callback isnt supplied
|
10 years ago |
|
Julian Lam
|
04be40158c
|
if you attempt to join a group when you're already in a group, you can't anymore.
|
10 years ago |
|
Julian Lam
|
8ba05c08fe
|
category privilege rescinding
|
10 years ago |