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
|
6496b91c29
|
closes #1180
|
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
|
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
|
284276cbb6
|
messaging jshint
|
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 |
|
Julian Lam
|
90b29031fe
|
backwards compatibility with older plugins using css with staticDir
|
11 years ago |
|
Julian Lam
|
552a63367d
|
workaround for problem arising from switch to Date.UTC()
|
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 |
|
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
|
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 |
|
psychobunny
|
a9046b926d
|
clean templates directory before beginning compilation
|
11 years ago |
|
psychobunny
|
90a80ad83d
|
plugins can now define a templates directory which gets compiled onload without requiring any hooks
|
11 years ago |
|
psychobunny
|
c054ae121b
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
11 years ago |
|
Julian Lam
|
4a1513eabf
|
fixed #1161 properly - Merge remote-tracking branch 'origin/master'
Conflicts:
src/upgrade.js
|
11 years ago |
Anthony Webb
|
6f8ed7f073
|
err doesnt exist here
|
11 years ago |
|
psychobunny
|
f20a2a2047
|
merging changes from deprecated routes/user.js
|
11 years ago |
|
psychobunny
|
8a05eee1f5
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
src/routes/user.js
|
11 years ago |
|
Baris Soner Usakli
|
096f352c82
|
closes #1130
|
11 years ago |
|
Julian Lam
|
e956c19587
|
#1110 - moved isEmailAvailable into User.email
|
11 years ago |
|
Julian Lam
|
e0dcf95138
|
fixed missing err in upgrade script
|
11 years ago |
|
Baris Soner Usakli
|
38145abae1
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
58cb51bb02
|
removed unused imagemagick require
|
11 years ago |
|
Julian Lam
|
b404b0197f
|
final pass, resolved #1155
|
11 years ago |
|
Julian Lam
|
5f52ef5f01
|
removed all 0.3.x related upgrade scripts, and updated minSchemaDate
|
11 years ago |
|
Julian Lam
|
64aa89f5ee
|
updating upgrade script to use UTC timestamps *facepalm*. God, I hope I didn't break anything...
(first pass #1155)
|
11 years ago |
|
psychobunny
|
34552f7fb0
|
added middleware.guestSearchingAllowed to the actual search API call
|
11 years ago |
|
psychobunny
|
542f937589
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
src/routes/api.js
|
11 years ago |
|
psychobunny
|
b9e119241e
|
moved get_custom_templates into plugins.js
|
11 years ago |
|
psychobunny
|
8f7a7fec7d
|
more cleanup; commenting out custom plugin routes until its fixed properly
|
11 years ago |
|
psychobunny
|
c0cd6148f4
|
one final push, cleanup + organize + lint; made feeds/meta/plugins routes follow same pattern as other route files
|
11 years ago |
|
Baris Soner Usakli
|
c028761857
|
new route to get recent posts
|
11 years ago |
|
psychobunny
|
1dbc47b890
|
deps cleanup
|
11 years ago |
|
psychobunny
|
73d637096c
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
public/templates/account.tpl
public/templates/accountposts.tpl
public/templates/favourites.tpl
public/templates/search.tpl
|
11 years ago |
|
psychobunny
|
3efca794fd
|
regex cleanup; fixed indenting on partials
|
11 years ago |
|
Baris Soner Usakli
|
c9c25bd174
|
added getRecentPost
|
11 years ago |
|
psychobunny
|
67517c58e3
|
added warning if partial template was not found
|
11 years ago |
|
psychobunny
|
d442e10037
|
template compilation + partials support
|
11 years ago |
|
Baris Soner Usakli
|
976744480f
|
post summary change
|
11 years ago |
|
psychobunny
|
552eb78db8
|
template compiling init; changing themes now finally works on this branch
|
11 years ago |
|
psychobunny
|
d471ea2d5b
|
app.create_route removed
|
11 years ago |
|
psychobunny
|
da331a1e6b
|
clean up in routes/admin.js
|
11 years ago |
|
psychobunny
|
1dc63caf77
|
using views_dir config
|
11 years ago |
|
psychobunny
|
a3a0aabd22
|
return error if template doesn't exist
|
11 years ago |
|
psychobunny
|
10f4fa004e
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
11 years ago |
|
psychobunny
|
48df0cf889
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
src/routes/admin.js
|
11 years ago |
|
Baris Soner Usakli
|
b28e4846a4
|
fixed disconnect check
|
11 years ago |
|
Baris Soner Usakli
|
4b64b9dcdc
|
closes #951
|
11 years ago |
|
psychobunny
|
c24c2a5422
|
search and reset routes, the very last of the views to be refactored :shipit:
|
11 years ago |
|
psychobunny
|
8802fc5a33
|
fixing link tags; misc bug fixes
|
11 years ago |
|
psychobunny
|
d3aead7c13
|
changing renderHeader function signature to req, res, next
|
11 years ago |
|
psychobunny
|
48b9289002
|
use the proper footer for admin
|
11 years ago |
|
psychobunny
|
7ef6f9bbf5
|
buckled down and refactored pretty much all of admin routes x_x
|
11 years ago |
|
Julian Lam
|
8846f7fb9b
|
fixing mappedPath in windows
|
11 years ago |
|
Baris Soner Usakli
|
37aeda14c4
|
fixed email retrieval in mongo
|
11 years ago |
|
Baris Soner Usakli
|
be70b3de57
|
closes #1090
|
11 years ago |
|
psychobunny
|
d360320441
|
finally got admin header and footer working 👍
|
11 years ago |
|
psychobunny
|
eed97648b1
|
started moving admin mdw into middleware/admin.js; res.render post-processing to append admin footer/header
|
11 years ago |
|
psychobunny
|
e588762aa0
|
yes, I've finally started on the dreaded admin refactor (not much else left to do :/)
|
11 years ago |
|
psychobunny
|
209bcaba8c
|
middleware.updateLastOnlineTime; middleware.prepareAPI (reinstated)
|
11 years ago |
|
psychobunny
|
f785f7f6e3
|
added deprecation notice to plugins/fireHook
|
11 years ago |
|
psychobunny
|
94aeb3ab22
|
notifications route; added middleware.authenticate to user/uploadpicture api route
|
11 years ago |
|
psychobunny
|
5b8e8e4b67
|
deprecating use of templates.setGlobal on server side in favour of passing in api.config into res.locals (still needs work)
|
11 years ago |
|
psychobunny
|
188aeabba8
|
missed a file in previous commit
|
11 years ago |
|
psychobunny
|
7bef58deb1
|
started moving out api functionality out of the route file into controllers/api.js
|
11 years ago |
|
psychobunny
|
138b12e815
|
re-added linkTags into header; clean up
|
11 years ago |
|
psychobunny
|
d18ce28de0
|
fixxed categories.get; privileges object and currentPage were missing on original route
|
11 years ago |
|
psychobunny
|
c5066ed100
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
11 years ago |
|
Julian Lam
|
30e83fdabe
|
fixing upgrade script if order is not set
|
11 years ago |
|
psychobunny
|
31d576e9ed
|
deprecation notice
|
11 years ago |
|
psychobunny
|
fe9d4efa98
|
moved api-only routes into routes/api.js, cleanup & linting
|
11 years ago |
|
psychobunny
|
d75bc9578b
|
deprecating middleware.prepareAPI in favour of using app.all('*') in /api namespace
|
11 years ago |
|
psychobunny
|
88ca3733a7
|
more jshinting
|
11 years ago |
|
psychobunny
|
d20501b29d
|
meta.js merge conflict
|
11 years ago |
|
psychobunny
|
cdf92c5cda
|
fixed a really annoying bug - the original topics route pre-refactor never actually included a privileges object
|
11 years ago |
|
Julian Lam
|
fc53385ede
|
removing socket.io library from minfile
|
11 years ago |
|
psychobunny
|
fa2b5d1ee6
|
re-implementing meta and link tags - completified
|
11 years ago |
|
psychobunny
|
3eb9f65c2e
|
jshinting controllers/index.js; adding back meta tags to home page
|
11 years ago |
|
psychobunny
|
8df33e65ac
|
fixing bug in topics causing meta tags to revert on subsequent refresh
|
11 years ago |
|
Julian Lam
|
1837a8443c
|
shifting socket.io back to the end :\
|
11 years ago |
|
Julian Lam
|
a8d2b46911
|
fixed incorrect path in plugin script inclusion
|
11 years ago |
|
Julian Lam
|
e70bc9f163
|
added deprecation warning for plugins using filter:scripts.get
|
11 years ago |
|
Julian Lam
|
5553e07bbd
|
moving socket.IO client lib to top of file, just in case
|
11 years ago |
|
Julian Lam
|
4c2a6953f1
|
concatenating the client scripts, instead of compressing, in development mode
|
11 years ago |
|
psychobunny
|
dbbbe21883
|
re-implementing meta and link tags part 1
|
11 years ago |