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
|
2014-03-09 16:07:34 -04:00 |
|
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
|
2014-03-07 19:21:40 -05:00 |
|
psychobunny
|
a3a0aabd22
|
return error if template doesn't exist
|
2014-03-04 16:08:02 -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
|
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
|
209bcaba8c
|
middleware.updateLastOnlineTime; middleware.prepareAPI (reinstated)
|
2014-03-03 12:49:47 -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
|
138b12e815
|
re-added linkTags into header; clean up
|
2014-03-03 11:44:52 -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
|
8df33e65ac
|
fixing bug in topics causing meta tags to revert on subsequent refresh
|
2014-03-02 22:10:57 -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
|
6c3c669e31
|
moved middleware out of webserver.js and into middleware.js
|
2014-03-02 14:16:16 -05:00 |
|