Julian Lam
|
a1621145d5
|
Merge branch 'master' into categories_revamp
Conflicts:
public/less/admin/admin.less
public/src/admin/manage/categories.js
src/controllers/admin.js
src/views/admin/manage/categories.tpl
src/views/config.json
|
10 years ago |
Barış Soner Uşaklı
|
f928b87997
|
use component, add user.watch title
|
10 years ago |
|
Barış Soner Uşaklı
|
08ec35820d
|
Merge pull request #2890 from EvSpirit/master
#2886 Check subcategories when showing category recent topics
|
10 years ago |
EvSpirit
|
2ea840e65d
|
#2886 Check subcategories when showing category recent topics
|
10 years ago |
|
EvSpirit
|
0fcd4dee58
|
#2886 Check subcategories when showing category recent topics
|
10 years ago |
psychobunny
|
11710987a4
|
fixed navigator pagination
|
10 years ago |
|
Julian Lam
|
fcbc02d48a
|
better local function name in install.js
|
10 years ago |
|
Barış Soner Uşaklı
|
203d4d052a
|
fixed my logic fail
|
10 years ago |
|
Barış Soner Uşaklı
|
c7b5cd48ba
|
closes #2773
|
10 years ago |
|
psychobunny
|
d39c2924e4
|
found a rogue topic class selector
|
10 years ago |
|
Barış Soner Uşaklı
|
29fd89407c
|
closes #2872
show the last posts content and user in topic feeds
|
10 years ago |
|
psychobunny
|
705111a1d9
|
chat/icon component
|
10 years ago |
|
Barış Soner Uşaklı
|
f6d0ad9b0f
|
Merge remote-tracking branch 'origin/master' into mongodb-3.0-driver-2.0
|
10 years ago |
|
Julian Lam
|
4dbb1c08b6
|
added default host port and db settings for mongo, if not set in config file
|
10 years ago |
|
Barış Soner Uşaklı
|
fc28cbf887
|
filter cids with a single .filter thanks @julianlam
|
10 years ago |
|
Julian Lam
|
06d547a6cb
|
fixed bug in privilege settings where categories near the end of a list were not having their permissions read properly if earlier categories were disabled, #2887
|
10 years ago |
|
barisusakli
|
b268927cf9
|
removedu if from filter:parse,post, parse strip teaser content
|
10 years ago |
|
psychobunny
|
7c9e76132d
|
topic/follow component fix
|
10 years ago |
|
barisusakli
|
9754dc8be0
|
open user link in new tab
|
10 years ago |
|
psychobunny
|
4ec43f662c
|
don't actually need to restart nodebb to apply skins
|
10 years ago |
|
barisusakli
|
6b950d0596
|
fix endsWith if check
|
10 years ago |
|
barisusakli
|
810d3be512
|
closes #2593
|
10 years ago |
|
barisusakli
|
4c31535c4b
|
closes #2799
|
10 years ago |
|
barisusakli
|
6c0e07c384
|
Merge remote-tracking branch 'origin/master' into mongodb-3.0-driver-2.0
|
10 years ago |
|
barisusakli
|
38726243fe
|
closes #2879
|
10 years ago |
|
barisusakli
|
04ed79e587
|
fix profile image upload on subfolder install
|
10 years ago |
|
barisusakli
|
c8e0eab34e
|
escape data on room enter
|
10 years ago |
|
barisusakli
|
7dde229517
|
added filter:teasers.get
|
10 years ago |
|
barisusakli
|
ea91518f30
|
slugs lowercase duh
|
10 years ago |
|
Barış Soner Uşaklı
|
9e7af15bbc
|
Merge pull request #2876 from cismous/master
remove comma
|
10 years ago |
|
barisusakli
|
9d62709f7c
|
doggy.gif
|
10 years ago |
|
barisusakli
|
a51b7257c7
|
fix group name in tests
|
10 years ago |
|
barisusakli
|
8b5643fe90
|
system and hidden groups cant be renamed
|
10 years ago |
|
barisusakli
|
e5bea19f56
|
renamed groupname
|
10 years ago |
|
barisusakli
|
649ef93768
|
its called foo :dull
|
10 years ago |
|
barisusakli
|
e4431f62b2
|
fix group update text
|
10 years ago |
|
barisusakli
|
358f6f61f7
|
closes #2803, closes #2883
options.unescape was not used correctly
fix groups.update so it doesnt overwrite data if some fields are not
passed in
|
10 years ago |
|
psychobunny
|
d2dae2d62f
|
standardize showSelect amongst category and topic_list routes
|
10 years ago |
|
Barış Soner Uşaklı
|
0ebad0fe10
|
Merge pull request #2843 from FokkeZB/patch-1
Skip setTimeout if it doesn't exist (Node 0.10.x with SSL)
|
10 years ago |
|
Barış Soner Uşaklı
|
9edfcb0053
|
dont save user obj in db
|
10 years ago |
|
psychobunny
|
6acfec9d25
|
add teaser content to category view
|
10 years ago |
|
Julian Lam
|
eee2aa8051
|
making sure to pass in userData to notifications.create on user follow
|
10 years ago |
|
Barış Soner Uşaklı
|
027f9e5a83
|
dont need start time anymore
|
10 years ago |
|
Barış Soner Uşaklı
|
8b429a2e05
|
removed path
|
10 years ago |
|
Barış Soner Uşaklı
|
cc92d09498
|
generateNotificationPaths
|
10 years ago |
|
psychobunny
|
8c0dfa1217
|
data/category partial
|
10 years ago |
|
psychobunny
|
8fbb085718
|
Merge remote-tracking branch 'origin/master'
Conflicts:
public/src/client/topic/postTools.js
|
10 years ago |
|
psychobunny
|
f2c220988b
|
fix for posting in multiple threads bug
|
10 years ago |
|
Barış Soner Uşaklı
|
b1478ad5da
|
dont add events multiple timest to #content
|
10 years ago |
|
Julian Lam
|
82f7ca5e0f
|
added a path to follow notification
|
10 years ago |