NodeBB

mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-05 20:11:26 +01:00

Files

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

2015-03-25 11:16:37 -04:00

meta

closes #2593

2015-03-20 19:36:18 -04:00

middleware

Merge remote-tracking branch 'origin/master' into mongodb-3.0-driver-2.0

2015-03-13 13:14:43 -04:00

navigation

added compatibility for deprecated filter:header.build

2015-02-25 17:43:31 -05:00

plugins

closes #2851

2015-03-11 18:04:27 -04:00

posts

#2886 Check subcategories when showing category recent topics

2015-03-24 21:39:28 +03:00

privileges

fixed my logic fail

2015-03-24 13:21:54 -04:00

rewards

fixed potential bug in rewards

2015-02-25 13:42:14 -05:00

routes

Merge branch 'master' into categories_revamp

2015-03-25 11:16:37 -04:00

socket.io

removedu if from filter:parse,post, parse strip teaser content

2015-03-23 19:32:32 -04:00

topics

closes #2773

2015-03-24 13:10:18 -04:00

user

generateNotificationPaths

2015-03-19 15:24:46 -04:00

views

Merge branch 'master' into categories_revamp

2015-03-25 11:16:37 -04:00

analytics.js

show monthly page views

2014-12-20 20:05:59 -05:00

batch.js

use processSortedSet instead of getting all users

2014-10-26 20:10:57 -04:00

categories.js

remove hardcoded topic_row_size

2015-03-17 11:17:00 -04:00

database.js

updated error text to show proper setup command

2014-06-30 14:55:21 -04:00

emailer.js

updated emailer to pass through "fromUid" if available

2015-03-17 11:29:19 -04:00

emitter.js

fixing previous commit properly

2014-10-04 16:19:43 -04:00

events.js

closes #2550 , closes #2518

2015-02-01 19:12:03 -05:00

favourites.js

results.owner*

2015-02-20 14:23:57 -05:00

file.js

file upload with spaces / general file upload fix wrt ajaxiy

2015-03-18 13:54:43 -04:00

groups.js

doggy.gif

2015-03-19 22:59:12 -04:00

hotswap.js

moving nearly all startup messages to verbose type

2014-11-26 13:28:10 -05:00

image.js

took out the meta config check from image.js

2014-08-08 17:30:37 -04:00

install.js

better local function name in install.js

2015-03-24 13:47:47 -04:00

languages.js

cleaned languages.js

2014-07-09 12:21:40 -04:00

logger.js

disable stuff that crashes in socket.io 1.x

2014-11-25 15:18:33 -05:00

messaging.js

require socket.io only when you need it, shaves off another 0.5s on load

2015-02-23 16:24:43 -05:00

meta.js

doggy.gif

2015-03-19 22:59:12 -04:00

notifications.js

we just need the group members :trollface:

2015-03-09 19:29:56 -04:00

pagination.js

search newer/older than and better pagination

2015-02-06 19:47:27 -05:00

password.js

use send for child process

2014-11-18 22:55:44 -05:00

plugins.js

closes #2851

2015-03-11 18:04:27 -04:00

posts.js

removedu if from filter:parse,post, parse strip teaser content

2015-03-23 19:32:32 -04:00

postTools.js

removedu if from filter:parse,post, parse strip teaser content

2015-03-23 19:32:32 -04:00

privileges.js

more linting

2014-10-08 12:11:06 -04:00

pubsub.js

sync config changes over redis pubsub

2014-12-21 20:25:54 -05:00

search.js

fix search on mongo

2015-03-15 01:45:24 -04:00

settings.js

linting settings.js

2014-05-12 12:59:34 -04:00

sitemap.js

sitemap style

2015-01-31 13:37:34 -05:00

threadTools.js

even more search changes

2015-03-15 01:12:13 -04:00

topics.js

use topic.getMainPids

2015-03-13 16:33:00 -04:00

upgrade.js

allow language strings in menu items

2015-02-25 17:12:17 -05:00

user.js

fix profile image upload on subfolder install

2015-03-20 14:48:19 -04:00

webserver.js

Skip setTimeout if it doesn't exist (<= 0.10.36)

2015-03-10 10:36:34 +01:00

widgets.js

not referencing parent scope when inside BEGIN in widgets tpl

2015-03-09 16:15:06 -04:00