Commit Graph

5675 Commits

Author SHA1 Message Date
psychobunny
1dbc47b890 deps cleanup 2014-03-05 16:25:55 -05:00
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
2014-03-05 15:59:50 -05:00
psychobunny
3efca794fd regex cleanup; fixed indenting on partials 2014-03-05 15:58:43 -05:00
Baris Soner Usakli
6f806d80c2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-05 15:39:02 -05:00
Baris Soner Usakli
c9c25bd174 added getRecentPost 2014-03-05 15:38:54 -05:00
Julian Lam
6192af18ab Merge pull request #1159 from BitBangersCode/settings-callback
Send the callback to the retry
2014-03-05 15:37:45 -05:00
psychobunny
67517c58e3 added warning if partial template was not found 2014-03-05 15:31:02 -05:00
psychobunny
d442e10037 template compilation + partials support 2014-03-05 15:13:54 -05:00
MrWaffle
33a5a2177e Send the callback to the retry 2014-03-05 20:57:32 +01:00
Baris Soner Usakli
976744480f post summary change 2014-03-05 14:52:32 -05:00
David Hoff
c25835c63e Remove text 2014-03-05 13:59:59 -05:00
psychobunny
3614211f0e Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	public/templates/accountposts.tpl
	public/templates/header.tpl
2014-03-04 17:52:15 -05:00
psychobunny
552eb78db8 template compiling init; changing themes now finally works on this branch 2014-03-04 17:49:56 -05:00
psychobunny
88e5ddac76 deprecating hook events on body 2014-03-04 17:22:45 -05:00
psychobunny
c67182204f clean-up + bugfixes 2014-03-04 17:20:12 -05:00
psychobunny
444956d517 deprecated loadTemplates client-side as well 2014-03-04 17:16:12 -05:00
psychobunny
68d526b762 deprecated templates.ready, templates.init, templates.loadServer; start webserver immediately without having to wait for templates.js 2014-03-04 17:14:01 -05:00
psychobunny
d471ea2d5b app.create_route removed 2014-03-04 17:11:40 -05:00
psychobunny
da331a1e6b clean up in routes/admin.js 2014-03-04 17:10:51 -05:00
psychobunny
fe147bfb67 have supervisor ignore public/templates folder 2014-03-04 17:08:30 -05:00
psychobunny
f73fd1eeae removed an unused hack in utils.js 2014-03-04 17:08:15 -05:00
Baris Soner Usakli
76d8d09f9b closes #1141 2014-03-04 16:48:07 -05:00
psychobunny
1dc63caf77 using views_dir config 2014-03-04 16:12:02 -05:00
psychobunny
d4f453cde3 added gitignore to public/templates dir 2014-03-04 16:11:03 -05:00
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
Baris Soner Usakli
d100a41ce7 fixes topic follow 2014-03-04 15:23:26 -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
Baris Soner Usakli
8c11299197 template language fix 2014-03-04 14:56: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