psychobunny
|
6acdc66470
|
fixed bug if default templates folder missing (in case you planned on building an entire theme from scratch)
|
11 years ago |
|
psychobunny
|
464c2f42c3
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
public/templates/admin/themes.tpl
src/meta.js
src/routes/api.js
|
11 years ago |
|
psychobunny
|
37840d35f0
|
missing variable - numCSS
|
11 years ago |
|
psychobunny
|
68b41083ad
|
removing re-added templates from core
|
11 years ago |
barisusakli
|
73c89010cb
|
closes #1182
|
11 years ago |
|
barisusakli
|
57f9f8bc57
|
closes #1176
|
11 years ago |
|
psychobunny
|
1ef95bd09e
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
app.js
public/templates/category.tpl
public/templates/popular.tpl
public/templates/recent.tpl
public/templates/unread.tpl
src/routes/plugins.js
src/webserver.js
|
11 years ago |
|
barisusakli
|
281c482f1c
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
barisusakli
|
6496b91c29
|
closes #1180
|
11 years ago |
Julian Lam
|
4309fe3192
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
820cdf8a47
|
temporarily removing cronjob until upstream bugs are fixed -- resolved #1178
|
11 years ago |
|
barisusakli
|
ec86aafb48
|
return user object
|
11 years ago |
|
barisusakli
|
b4b9ed1841
|
optimized getTopicsByTids, single db call to get topicData, added cache for privilege/category/user data
|
11 years ago |
|
barisusakli
|
1568c50906
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
barisusakli
|
23e1cc010c
|
removed removeHiddenFields function, using mongo selector instead
|
11 years ago |
|
Julian Lam
|
6fb393de78
|
fixing #1177
|
11 years ago |
|
Julian Lam
|
f00f7c8818
|
fixed apple-touch-icon for subfolder installs
|
11 years ago |
|
Julian Lam
|
d9d04a3982
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
5a8a3627d2
|
bringing subfolder installations to v0.4.0 - JUST FOR @PLANNER
|
11 years ago |
|
barisusakli
|
7fa8f5ef36
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
barisusakli
|
284276cbb6
|
messaging jshint
|
11 years ago |
psychobunny
|
f99c1f9921
|
removed code climate badge until analysis is complete
|
11 years ago |
|
psychobunny
|
e84dd4fd94
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
public/templates/accountedit.tpl
public/templates/header.tpl
src/routes/meta.js
src/webserver.js
|
11 years ago |
|
Julian Lam
|
c9642cecd2
|
setting Lavender as default theme for 0.4.0, woo!
|
11 years ago |
|
Baris Soner Usakli
|
e51016ee66
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
30130b2d62
|
set back to false when loading indicator fades out
|
11 years ago |
|
Julian Lam
|
90b29031fe
|
backwards compatibility with older plugins using css with staticDir
|
11 years ago |
|
Julian Lam
|
6a31bd9af6
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
552a63367d
|
workaround for problem arising from switch to Date.UTC()
|
11 years ago |
|
Baris Soner Usakli
|
6a824a2e10
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
7dfdab0a2d
|
search page change
|
11 years ago |
|
Julian Lam
|
5880590425
|
removing "pluginCSS", "css" in plugins is now included directly into stylesheet.css. This is a breaking change.
fixes #1168
|
11 years ago |
|
psychobunny
|
23e4eb7cd9
|
deprecating filter:server.create_routes and filter:admin.create_routes; maintains limited functionality but recommended you migrate asap
|
11 years ago |
|
psychobunny
|
7183fda2eb
|
console.log
|
11 years ago |
|
psychobunny
|
bcd8137d0e
|
console.log
|
11 years ago |
|
psychobunny
|
55a7838725
|
temporary templateMapping fix for admin side; will come back to this after merging this branch
|
11 years ago |
|
Julian Lam
|
958e85a31f
|
updated readme to point to wiki for platform specific install docs
|
11 years ago |
|
Julian Lam
|
4add89cea4
|
Merge branch 'master' of github.com:tparnell8/NodeBB into tparnell8-master
|
11 years ago |
|
Julian Lam
|
1f23642ab4
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
b2bc1d4555
|
setting password to null in getUserData, because Object.delete is bad? :P (thanks @barisusakli)
|
11 years ago |
|
Julian Lam
|
e9e53ad95e
|
added a new property to userData "hasPassword", disabling "current password" field in user editing if no password is set (for SSO logins, for example)
|
11 years ago |
|
Baris Soner Usakli
|
d34e68ca25
|
convert score to int in mongo
|
11 years ago |
|
Baris Soner Usakli
|
acd4771012
|
dbmock changes
|
11 years ago |
|
Baris Soner Usakli
|
da0e1a8eb9
|
added back err to redis flushdb
|
11 years ago |
|
Baris Soner Usakli
|
4986c8ed3a
|
fixed tests
|
11 years ago |
|
psychobunny
|
8c8055fbae
|
fix for multiple synchronous hooks (synchronous hooks to be deprecated in 0.4x)
|
11 years ago |
|
psychobunny
|
178edd150a
|
moved action:app.load out of webserver; passing in app, mdw, and controllers into action:app.load. now we can create routes dynamically ;)
|
11 years ago |
|
psychobunny
|
a9cccc9b9c
|
allow hooks to accept single/multiple arguments instead of requiring you to send in a hash
|
11 years ago |
|
Baris Soner Usakli
|
7135e9424c
|
closes #1167
|
11 years ago |
|
Baris Soner Usakli
|
3fe9bdc24c
|
removed the postbar selector from activeusers
|
11 years ago |