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 |
|
psychobunny
|
6820e9e662
|
random jshinting expedition
|
11 years ago |
|
psychobunny
|
f0dfee5402
|
clean up
|
11 years ago |
|
psychobunny
|
6c3c669e31
|
moved middleware out of webserver.js and into middleware.js
|
11 years ago |
|
psychobunny
|
936e52a43f
|
require db
|
11 years ago |
|
Julian Lam
|
3860abdc24
|
plugins can now pass in scripts in plugin.json, and they will be bundled into nodebb.min.js
|
11 years ago |
|
psychobunny
|
4d598dcd63
|
moved process events out of webserver.js and into app.js
|
11 years ago |
|
psychobunny
|
ee5596fad5
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
11 years ago |
|
Julian Lam
|
14d7453a23
|
bundling socket.io client library into minfile, minfile always used from this point forward, even in development mode.
Development mode will not compress the scripts, but will just concatenate.
|
11 years ago |
|
Baris Soner Usakli
|
feeb220514
|
removed console.log
|
11 years ago |
|
Baris Soner Usakli
|
1b7f8cc5cb
|
active users fix
|
11 years ago |
|
Baris Soner Usakli
|
fb691b23b4
|
moved topic locked check to topic.reply
|
11 years ago |
|
Julian Lam
|
079ed10631
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
2b178ff76d
|
proper tracking of users' reply status when others enter the room
|
11 years ago |
|
Baris Soner Usakli
|
2966cc4a49
|
minor fix
|
11 years ago |
|
Baris Soner Usakli
|
b2f9184562
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
b6d97281d3
|
closes #1015
|
11 years ago |
|
Julian Lam
|
a9b78d2600
|
minimizing the composer should unregister it
|
11 years ago |
|
Baris Soner Usakli
|
42a7c037e6
|
removed dupe i var
|
11 years ago |
|
psychobunny
|
f46e563b8a
|
moved all route definitions in webserver.js into routes/index.js
|
11 years ago |
|
psychobunny
|
08a9ce4950
|
moved all app.configure() code into middleware/index.js + organization/cleanup
|
11 years ago |
|
Julian Lam
|
fcb44ae256
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
d012d237bf
|
added back clearInterval
|
11 years ago |
|
Baris Soner Usakli
|
c4d1c8feff
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
87f337f2fb
|
cleanup
|
11 years ago |
|
Julian Lam
|
7ef84e0daa
|
switched to 'ping active' system
|
11 years ago |
|
Julian Lam
|
7ff9fa1a44
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
b3d7ae1c86
|
showing who is replying in the active users block
|
11 years ago |
|
Baris Soner Usakli
|
0c9ab5e93f
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
psychobunny
|
804da0d8de
|
removed unused deps in webser.js
|
11 years ago |
|
Baris Soner Usakli
|
fff3ba5bec
|
hinted redis.js
|
11 years ago |
|
psychobunny
|
26853d024e
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
11 years ago |
|
Julian Lam
|
0fecbf7cbf
|
entity decoding in filenames
|
11 years ago |
|
Julian Lam
|
6bc759748f
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
1f136c6a72
|
ninjafix to mappedPath
|
11 years ago |
|
Baris Soner Usakli
|
24b669bd39
|
some fixes for search plugin
|
11 years ago |
|
Julian Lam
|
1c19ae48bd
|
fixed #1143 -- also removed near-meaningless info messages saying that a Hook had been registered.
|
11 years ago |
|
Julian Lam
|
5540313b7f
|
fixing path resolution for plugins in production mode
|
11 years ago |
|
Julian Lam
|
5e2460e17e
|
fixed #1144
|
11 years ago |
|
Baris Soner Usakli
|
e75c303b89
|
added unique visitor count to admin dashboard
|
11 years ago |
|
Baris Soner Usakli
|
7081c7dcc4
|
moved ip log to api
|
11 years ago |
|
psychobunny
|
e73f8d6f37
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
11 years ago |
|
Julian Lam
|
6a649f9b9a
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
561b42d0f9
|
new staticDirs format, @mrwaffle
|
11 years ago |
|
psychobunny
|
f35c14ee07
|
bugfixes + cleanup for accounts and users routes
|
11 years ago |
|
psychobunny
|
fa103b2d6e
|
finally done with routes/user.js; accounts.getUserByUID; bug fixing and cleanup
|
11 years ago |
|
psychobunny
|
08d3d9feb3
|
accounts.uploadPicture
|
11 years ago |
|
Baris Soner Usakli
|
ccd29bfd61
|
added callback to category update
|
11 years ago |
|
psychobunny
|
e67f6d2169
|
re-added filter:footer.build temporarily - to be deprecated for 0.4x
|
11 years ago |
|
psychobunny
|
607bc8545b
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
11 years ago |
|
psychobunny
|
cb15655c9c
|
app.checkAccountPermissions middleware; some clean up & bug fixes
|
11 years ago |
|
psychobunny
|
bfcb61f37d
|
forgot to port getUserDataByUserSlug
|
11 years ago |
|
psychobunny
|
d072ad60de
|
all users/ pages converted
|
11 years ago |
|
psychobunny
|
7c873c4314
|
decided to functionally separate accounts from users
|
11 years ago |
|
psychobunny
|
e64d87cb1d
|
all user account pages; all static pages; outgoing page
|
11 years ago |
Matthew Conlen
|
a2a9c8fd8a
|
fix error with undefined callback
|
11 years ago |
|
Baris Soner Usakli
|
9b4ca12dc1
|
fixed missing var, posts.js cleanup
|
11 years ago |
|
Baris Soner Usakli
|
091723a8c5
|
closes #1101
|
11 years ago |
|
psychobunny
|
00df660fa5
|
robots + sitemap; some clean up
|
11 years ago |
|
psychobunny
|
942d16a3b4
|
confirmEmail route
|
11 years ago |
|
psychobunny
|
dae7b06f4d
|
initial login and register routes
|
11 years ago |
|
psychobunny
|
e193d58112
|
unreadTotal route
|
11 years ago |
|
psychobunny
|
08c0a7fa5e
|
removing old unread and recent routes
|
11 years ago |
|
psychobunny
|
beafc881c4
|
added recent and unread in categoriesController
|
11 years ago |
|
psychobunny
|
062e35c89e
|
app.authenticate middleware; added new recent, unread routes
|
11 years ago |
|
psychobunny
|
4435a20d90
|
fixed merge conflict
|
11 years ago |
|
psychobunny
|
96d6b96ce4
|
controllers.home
|
11 years ago |
|
psychobunny
|
c084529597
|
removed old api/home and api/popular
|
11 years ago |
|
psychobunny
|
ad222dce2a
|
controller indexx
|
11 years ago |
|
psychobunny
|
233e49fd34
|
topics controller
|
11 years ago |
|
psychobunny
|
62a4b419e3
|
categories controller
|
11 years ago |
|
psychobunny
|
27b99d5c56
|
webserver.js refactor init
|
11 years ago |
|
psychobunny
|
1db0651bff
|
removing old api/popular code
|
11 years ago |
|
Julian Lam
|
dfd13fac0d
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
44ac7ec262
|
added new hooks for rendering help messages in composer, removed markdown text from translation
|
11 years ago |
|
Baris Soner Usakli
|
30eb85f96e
|
fixed conflicts
|
11 years ago |
|
Julian Lam
|
c7274e11d0
|
removing the bit of code that disables plugins if the minver does not satisfy (too annoying imo)... now that we have ./nodebb reset, this is moot
|
11 years ago |
|
Julian Lam
|
5b301772bb
|
added daemon capability to ./nodebb start, npm start/stop scripts
|
11 years ago |
|
Baris Soner Usakli
|
38e4a6c8b0
|
better check
|
11 years ago |
|
Baris Soner Usakli
|
b8c089cfaa
|
added check for invalid tags
|
11 years ago |
akhoury
|
3f1d5c6656
|
merge fork with upstream master
|
11 years ago |
|
akhoury
|
1b207d8276
|
IE8 support, general cleanups, from native to $ objects ...
|
11 years ago |
|
akhoury
|
b59c10a1e9
|
took out some overrides out utils to a new overrides.js
|
11 years ago |
|
Baris Soner Usakli
|
81f4767687
|
user.js hint
|
11 years ago |
|
Baris Soner Usakli
|
6a962655e4
|
jshint for topics.js
|
11 years ago |
|
Baris Soner Usakli
|
f1f7b59d58
|
missed this one
|
11 years ago |
|
Baris Soner Usakli
|
99bf882a1c
|
removed cid from getTopicsByTids
|
11 years ago |
|
Baris Soner Usakli
|
ad37715972
|
empty array if not topics in catgory
|
11 years ago |
|
Baris Soner Usakli
|
d5268f5497
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
56bbeb9950
|
use disableSocialButtons from config
|
11 years ago |
|
psychobunny
|
2247a8b21f
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
psychobunny
|
aee2b2ecd0
|
allow express to serve parsed tpls via res.render
|
11 years ago |
|
Baris Soner Usakli
|
7f2d70d7f6
|
minor cleanups
|
11 years ago |
|
Baris Soner Usakli
|
a83d4a9dd5
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
ea6cf3bbd5
|
more cleanup and changes to topics
|
11 years ago |
|
psychobunny
|
87baeebc3f
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
psychobunny
|
5145ba1aac
|
added a route to get moderators by category id
|
11 years ago |
|
Baris Soner Usakli
|
8da7a6f2f3
|
cleanup
|
11 years ago |
|
Julian Lam
|
3f7e458866
|
fixed #1127
|
11 years ago |
|
Julian Lam
|
815e78339f
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
101a6ab812
|
minifying css
|
11 years ago |
|
Baris Soner Usakli
|
1ba3acfd03
|
display ips to admins/users on profile
|
11 years ago |
|
Baris Soner Usakli
|
de3bc84fde
|
removed logs
|
11 years ago |
|
Baris Soner Usakli
|
cc8ac2c026
|
get ips if admin or self
|
11 years ago |
|
Julian Lam
|
309dcaee06
|
fixed issue where even dev mode would call the minifier for js
|
11 years ago |
|
Julian Lam
|
12e3e45398
|
closed #1095 - js is now minified and saved to memory the first time it is requested (on prod mode), same with theme CSS
|
11 years ago |
|
Julian Lam
|
bc1c419722
|
caching compiled CSS locally, so repeated calls to the stylesheet serve from cache
|
11 years ago |
|
Julian Lam
|
7f11d78b82
|
Merge branch 'master' into less-is-moar
|
11 years ago |
|
Baris Soner Usakli
|
7c1a46f25d
|
misc cleanup
|
11 years ago |
|
Julian Lam
|
53f1e4d3d4
|
dedicated stylesheet.css route for LESS compilation, no longer usin less-middleware for base theme...
|
11 years ago |
|
Baris Soner Usakli
|
fd8e7327f0
|
removed console.log
|
11 years ago |
|
Baris Soner Usakli
|
7e5a7c53bd
|
changes to templates
|
11 years ago |