Commit Graph

9270 Commits (9e3b2148bacac7ec3e7c787c4d47618cdeb486d5)
 

Author SHA1 Message Date
Julian Lam 9dece4a1db added some missing files from previous commits, fixed setParent mechanic which broke after I refactored,
Barış Soner Uşaklı 4a18a041c9 no need to remove if there are no new posts
Julian Lam 25cb1f9284 Merge remote-tracking branch 'origin/master' into categories_revamp
Julian Lam d3af278123 removed old code that was no longer necessary, updated privilege table to show all groups (similar to previous behaviour), fixes
Barış Soner Uşaklı 36942125e6 closes
also mark user online if they post a reply
Julian Lam 9b84a887d3 a huge frickin' number of changes for . This is part of
Julian Lam 815ea88fa5 readded some missing classes, fixed some styling on category.tpl, fixed image uploading code
Julian Lam 765f15096b removed wrapping .row around tables in acp/manage/categories
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
Barış Soner Uşaklı f928b87997 use component, add user.watch title
Barış Soner Uşaklı 08ec35820d Merge pull request from EvSpirit/master
 Check subcategories when showing category recent topics
EvSpirit 2ea840e65d Check subcategories when showing category recent topics
EvSpirit 0fcd4dee58 Check subcategories when showing category recent topics
psychobunny 11710987a4 fixed navigator pagination
Julian Lam fcbc02d48a better local function name in install.js
Barış Soner Uşaklı 203d4d052a fixed my logic fail
Barış Soner Uşaklı c7b5cd48ba closes
psychobunny d39c2924e4 found a rogue topic class selector
Barış Soner Uşaklı 29fd89407c closes
show the last posts content and user in topic feeds
psychobunny 705111a1d9 chat/icon component
Barış Soner Uşaklı f6d0ad9b0f Merge remote-tracking branch 'origin/master' into mongodb-3.0-driver-2.0
Julian Lam 4dbb1c08b6 added default host port and db settings for mongo, if not set in config file
Barış Soner Uşaklı fc28cbf887 filter cids with a single .filter thanks @julianlam
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,
barisusakli b268927cf9 removedu if from filter:parse,post, parse strip teaser content
psychobunny 7c9e76132d topic/follow component fix
barisusakli 9754dc8be0 open user link in new tab
psychobunny 4ec43f662c don't actually need to restart nodebb to apply skins
barisusakli 6b950d0596 fix endsWith if check
barisusakli 810d3be512 closes
barisusakli 4c31535c4b closes
barisusakli 6c0e07c384 Merge remote-tracking branch 'origin/master' into mongodb-3.0-driver-2.0
barisusakli 38726243fe closes
barisusakli 04ed79e587 fix profile image upload on subfolder install
barisusakli c8e0eab34e escape data on room enter
barisusakli 7dde229517 added filter:teasers.get
barisusakli ea91518f30 slugs lowercase duh
Barış Soner Uşaklı 9e7af15bbc Merge pull request from cismous/master
remove comma
barisusakli 9d62709f7c doggy.gif
barisusakli a51b7257c7 fix group name in tests
barisusakli 8b5643fe90 system and hidden groups cant be renamed
barisusakli e5bea19f56 renamed groupname
barisusakli 649ef93768 its called foo :dull
barisusakli e4431f62b2 fix group update text
barisusakli 358f6f61f7 closes , closes
options.unescape was not used correctly
fix groups.update so it  doesnt overwrite data if some fields are not
passed in
psychobunny d2dae2d62f standardize showSelect amongst category and topic_list routes
Barış Soner Uşaklı 0ebad0fe10 Merge pull request from FokkeZB/patch-1
Skip setTimeout if it doesn't exist (Node 0.10.x with SSL)
Barış Soner Uşaklı 9edfcb0053 dont save user obj in db
psychobunny 6acfec9d25 add teaser content to category view
Julian Lam eee2aa8051 making sure to pass in userData to notifications.create on user follow