Commit Graph

4398 Commits

Author SHA1 Message Date
psychobunny
a3a0aabd22 return error if template doesn't exist 2014-03-04 16:08:02 -05:00
psychobunny
66ef8c8284 removed vanilla templates from core into nodebb-theme-vanilla :shipit: 2014-03-04 16:07:50 -05:00
psychobunny
6e8c618fb1 prevent translator crash if data is undefined; linted/cleanup 2014-03-04 15:18:05 -05:00
psychobunny
cd336006fc optimized cold loading 2014-03-04 15:02:05 -05:00
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
Barış Soner Uşaklı
81378e071b Merge pull request #1157 from MakerStudios/alertclose_nofire_click
Don't fire click when closing an alert
2014-03-04 13:43:04 -05:00
Julian Lam
9b53dd1014 english fallback for 'reset_password' translations 2014-03-04 13:35:20 -05:00
medwards20x6
76b53478ce Don't fire click when closing an alert 2014-03-04 10:30:44 -08:00
Baris Soner Usakli
b28e4846a4 fixed disconnect check 2014-03-04 13:28:24 -05:00
Baris Soner Usakli
3c97ef6829 closes #1156 2014-03-04 13:09:58 -05:00
Baris Soner Usakli
dbb814fe4e category permission page fixes 2014-03-04 12:54:25 -05:00
Baris Soner Usakli
7bb3766ebd 2 column layout for admin index 2014-03-03 22:05:25 -05:00
Baris Soner Usakli
814db2e1d8 icon first 2014-03-03 17:52:00 -05:00
Baris Soner Usakli
4b64b9dcdc closes #951 2014-03-03 17:46:54 -05:00
Baris Soner Usakli
1f7a717bf0 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-03 17:24:52 -05:00
Baris Soner Usakli
50f83abf75 closes 1150 2014-03-03 17:24:38 -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
Julian Lam
57d0273c13 dutch translations 2014-03-03 16:40:57 -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
Baris Soner Usakli
529cd60dd2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-03 14:46:57 -05:00
Baris Soner Usakli
70299ea5c2 better search result page 2014-03-03 14:46:50 -05:00
psychobunny
c26af77a24 fixing cold load of admin/index 2014-03-03 14:43:25 -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
Julian Lam
9c55b202e7 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-03 12:47:43 -05:00
Julian Lam
dc8839b63c updating validator to 3.4.0 2014-03-03 12:47:40 -05:00
psychobunny
f943a194b6 added plugin deprecation notices to NOTES.md 2014-03-03 12:39:58 -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
Julian Lam
64ee792013 fixed #1154 2014-03-03 11:12:28 -05:00
Julian Lam
5a8fa9b1f7 fixed regression in groups management modal 2014-03-03 11:07:37 -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