psychobunny
|
10f4fa004e
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
2014-03-04 14:53:31 -05:00 |
|
psychobunny
|
48df0cf889
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
src/routes/admin.js
|
2014-03-04 14:50:44 -05:00 |
|
Baris Soner Usakli
|
b28e4846a4
|
fixed disconnect check
|
2014-03-04 13:28:24 -05:00 |
|
Baris Soner Usakli
|
4b64b9dcdc
|
closes #951
|
2014-03-03 17:46:54 -05:00 |
|
psychobunny
|
c24c2a5422
|
search and reset routes, the very last of the views to be refactored :shipit:
|
2014-03-03 17:16:53 -05:00 |
|
psychobunny
|
8802fc5a33
|
fixing link tags; misc bug fixes
|
2014-03-03 16:56:35 -05:00 |
|
psychobunny
|
d3aead7c13
|
changing renderHeader function signature to req, res, next
|
2014-03-03 16:54:28 -05:00 |
|
psychobunny
|
48b9289002
|
use the proper footer for admin
|
2014-03-03 16:40:26 -05:00 |
|
psychobunny
|
7ef6f9bbf5
|
buckled down and refactored pretty much all of admin routes x_x
|
2014-03-03 16:35:21 -05:00 |
|
Julian Lam
|
8846f7fb9b
|
fixing mappedPath in windows
|
2014-03-03 16:32:41 -05:00 |
|
Baris Soner Usakli
|
37aeda14c4
|
fixed email retrieval in mongo
|
2014-03-03 16:16:41 -05:00 |
|
Baris Soner Usakli
|
be70b3de57
|
closes #1090
|
2014-03-03 15:26:15 -05:00 |
|
psychobunny
|
d360320441
|
finally got admin header and footer working 👍
|
2014-03-03 14:30:39 -05:00 |
|
psychobunny
|
eed97648b1
|
started moving admin mdw into middleware/admin.js; res.render post-processing to append admin footer/header
|
2014-03-03 13:17:10 -05:00 |
|
psychobunny
|
e588762aa0
|
yes, I've finally started on the dreaded admin refactor (not much else left to do :/)
|
2014-03-03 12:50:21 -05:00 |
|
psychobunny
|
209bcaba8c
|
middleware.updateLastOnlineTime; middleware.prepareAPI (reinstated)
|
2014-03-03 12:49:47 -05:00 |
|
psychobunny
|
f785f7f6e3
|
added deprecation notice to plugins/fireHook
|
2014-03-03 12:37:57 -05:00 |
|
psychobunny
|
94aeb3ab22
|
notifications route; added middleware.authenticate to user/uploadpicture api route
|
2014-03-03 12:30:27 -05:00 |
|
psychobunny
|
5b8e8e4b67
|
deprecating use of templates.setGlobal on server side in favour of passing in api.config into res.locals (still needs work)
|
2014-03-03 12:16:46 -05:00 |
|
psychobunny
|
188aeabba8
|
missed a file in previous commit
|
2014-03-03 11:45:40 -05:00 |
|
psychobunny
|
7bef58deb1
|
started moving out api functionality out of the route file into controllers/api.js
|
2014-03-03 11:45:23 -05:00 |
|
psychobunny
|
138b12e815
|
re-added linkTags into header; clean up
|
2014-03-03 11:44:52 -05:00 |
|
psychobunny
|
d18ce28de0
|
fixxed categories.get; privileges object and currentPage were missing on original route
|
2014-03-03 11:28:31 -05:00 |
|
psychobunny
|
c5066ed100
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
2014-03-03 10:40:56 -05:00 |
|
Julian Lam
|
30e83fdabe
|
fixing upgrade script if order is not set
|
2014-03-03 10:17:11 -05:00 |
|
psychobunny
|
31d576e9ed
|
deprecation notice
|
2014-03-03 00:22:10 -05:00 |
|
psychobunny
|
fe9d4efa98
|
moved api-only routes into routes/api.js, cleanup & linting
|
2014-03-03 00:12:25 -05:00 |
|
psychobunny
|
d75bc9578b
|
deprecating middleware.prepareAPI in favour of using app.all('*') in /api namespace
|
2014-03-02 23:49:15 -05:00 |
|
psychobunny
|
88ca3733a7
|
more jshinting
|
2014-03-02 23:07:16 -05:00 |
|
psychobunny
|
d20501b29d
|
meta.js merge conflict
|
2014-03-02 22:59:57 -05:00 |
|
psychobunny
|
cdf92c5cda
|
fixed a really annoying bug - the original topics route pre-refactor never actually included a privileges object
|
2014-03-02 22:54:03 -05:00 |
|
Julian Lam
|
fc53385ede
|
removing socket.io library from minfile
|
2014-03-02 22:34:57 -05:00 |
|
psychobunny
|
fa2b5d1ee6
|
re-implementing meta and link tags - completified
|
2014-03-02 22:15:27 -05:00 |
|
psychobunny
|
3eb9f65c2e
|
jshinting controllers/index.js; adding back meta tags to home page
|
2014-03-02 22:12:08 -05:00 |
|
psychobunny
|
8df33e65ac
|
fixing bug in topics causing meta tags to revert on subsequent refresh
|
2014-03-02 22:10:57 -05:00 |
|
Julian Lam
|
1837a8443c
|
shifting socket.io back to the end :\
|
2014-03-02 19:55:50 -05:00 |
|
Julian Lam
|
a8d2b46911
|
fixed incorrect path in plugin script inclusion
|
2014-03-02 16:44:41 -05:00 |
|
Julian Lam
|
e70bc9f163
|
added deprecation warning for plugins using filter:scripts.get
|
2014-03-02 16:33:45 -05:00 |
|
Julian Lam
|
5553e07bbd
|
moving socket.IO client lib to top of file, just in case
|
2014-03-02 16:29:21 -05:00 |
|
Julian Lam
|
4c2a6953f1
|
concatenating the client scripts, instead of compressing, in development mode
|
2014-03-02 15:34:12 -05:00 |
|
psychobunny
|
dbbbe21883
|
re-implementing meta and link tags part 1
|
2014-03-02 15:14:38 -05:00 |
|
psychobunny
|
6820e9e662
|
random jshinting expedition
|
2014-03-02 14:45:57 -05:00 |
|
psychobunny
|
f0dfee5402
|
clean up
|
2014-03-02 14:21:24 -05:00 |
|
psychobunny
|
6c3c669e31
|
moved middleware out of webserver.js and into middleware.js
|
2014-03-02 14:16:16 -05:00 |
|
psychobunny
|
936e52a43f
|
require db
|
2014-03-02 14:00:28 -05:00 |
|
Julian Lam
|
3860abdc24
|
plugins can now pass in scripts in plugin.json, and they will be bundled into nodebb.min.js
|
2014-03-02 13:58:25 -05:00 |
|
psychobunny
|
4d598dcd63
|
moved process events out of webserver.js and into app.js
|
2014-03-02 13:56:46 -05:00 |
|
psychobunny
|
ee5596fad5
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
2014-03-02 13:51:34 -05:00 |
|
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.
|
2014-03-02 13:28:09 -05:00 |
|
Baris Soner Usakli
|
feeb220514
|
removed console.log
|
2014-03-01 22:52:30 -05:00 |
|