Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-08 15:47:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,506 Commits 73 Branches 490 Tags
62afe65ccf776ed00c84bcaccaeb098fbd328073
Commit Graph

4506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
psychobunny
62afe65ccf bugfix + deprecated templates.getTemplateNameFromUrl 2014-03-09 21:05:01 -04:00
psychobunny
712c382a28 optimizing ajaxify (still needs work though) 2014-03-09 20:48:15 -04:00
psychobunny
4e54d500c0 fix bug where inactive plugin templates were being compiled as well 2014-03-09 20:45:37 -04:00
psychobunny
4793b6b4f9 fixed invalid path for apple-touch-icon 2014-03-09 20:08:51 -04:00
psychobunny
a99be8e7be got rid of all the res.locals.isAPI checks in all controller methods. now 1000% cleaner :shipit: 2014-03-09 20:05:14 -04:00
psychobunny
faf3de7e27 added a check for res.locals.isAPI inside res.render, instead of doing it all over the place in code 2014-03-09 19:54:16 -04:00
psychobunny
1b3f089804 fixed /admin/index 404 2014-03-09 19:47:39 -04:00
psychobunny
6acdc66470 fixed bug if default templates folder missing (in case you planned on building an entire theme from scratch) 2014-03-09 19:47:33 -04:00
psychobunny
464c2f42c3 Merge remote-tracking branch 'origin/master' into webserver.js-refactor 
Conflicts:
	public/templates/admin/themes.tpl
	src/meta.js
	src/routes/api.js
 2014-03-09 19:19:13 -04:00
psychobunny
37840d35f0 missing variable - numCSS 2014-03-09 19:15:18 -04:00
psychobunny
68b41083ad removing re-added templates from core 2014-03-09 19:14:50 -04:00
barisusakli
73c89010cb closes #1182 2014-03-09 17:29:05 -04:00
barisusakli
57f9f8bc57 closes #1176 2014-03-09 16:39:31 -04:00
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
barisusakli
281c482f1c Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-09 14:02:33 -04:00
barisusakli
6496b91c29 closes #1180 2014-03-09 14:02:30 -04:00
Julian Lam
4309fe3192 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-09 00:47:25 -05:00
Julian Lam
820cdf8a47 temporarily removing cronjob until upstream bugs are fixed -- resolved #1178 2014-03-09 00:47:21 -05:00
barisusakli
ec86aafb48 return user object 2014-03-09 00:20:29 -05:00
barisusakli
b4b9ed1841 optimized getTopicsByTids, single db call to get topicData, added cache for privilege/category/user data 2014-03-09 00:16:05 -05:00
barisusakli
1568c50906 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-08 17:41:51 -05:00
barisusakli
23e1cc010c removed removeHiddenFields function, using mongo selector instead 2014-03-08 17:41:23 -05:00
Julian Lam
6fb393de78 fixing #1177 2014-03-08 16:50:32 -05:00
Julian Lam
f00f7c8818 fixed apple-touch-icon for subfolder installs 2014-03-08 16:08:52 -05:00
Julian Lam
d9d04a3982 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-08 16:04:43 -05:00
Julian Lam
5a8a3627d2 bringing subfolder installations to v0.4.0 - JUST FOR @PLANNER 2014-03-08 16:04:22 -05:00
barisusakli
7fa8f5ef36 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-08 15:45:56 -05:00
barisusakli
284276cbb6 messaging jshint 2014-03-08 15:45:42 -05:00
psychobunny
f99c1f9921 removed code climate badge until analysis is complete 2014-03-08 02:56:24 -05: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
Julian Lam
c9642cecd2 setting Lavender as default theme for 0.4.0, woo! 2014-03-06 23:24:47 -05:00
Baris Soner Usakli
e51016ee66 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-06 20:53:51 -05:00
Baris Soner Usakli
30130b2d62 set back to false when loading indicator fades out 2014-03-06 20:53:41 -05:00
Julian Lam
90b29031fe backwards compatibility with older plugins using css with staticDir 2014-03-06 20:36:05 -05:00
Julian Lam
6a31bd9af6 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-06 19:48:54 -05:00
Julian Lam
552a63367d workaround for problem arising from switch to Date.UTC() 2014-03-06 19:48:38 -05:00
Baris Soner Usakli
6a824a2e10 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-06 17:57:15 -05:00
Baris Soner Usakli
7dfdab0a2d search page change 2014-03-06 17:57:07 -05:00
Julian Lam
5880590425 removing "pluginCSS", "css" in plugins is now included directly into stylesheet.css. This is a breaking change. 
fixes #1168
 2014-03-06 17:51:17 -05:00
psychobunny
23e4eb7cd9 deprecating filter:server.create_routes and filter:admin.create_routes; maintains limited functionality but recommended you migrate asap 2014-03-06 16:49:32 -05:00
psychobunny
7183fda2eb console.log 2014-03-06 16:48:55 -05:00
psychobunny
bcd8137d0e console.log 2014-03-06 16:47:59 -05:00
psychobunny
55a7838725 temporary templateMapping fix for admin side; will come back to this after merging this branch 2014-03-06 16:00:17 -05:00
Julian Lam
958e85a31f updated readme to point to wiki for platform specific install docs 2014-03-06 15:56:14 -05:00
Julian Lam
4add89cea4 Merge branch 'master' of github.com:tparnell8/NodeBB into tparnell8-master 2014-03-06 15:40:07 -05:00
Julian Lam
1f23642ab4 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-06 15:38:02 -05:00
Julian Lam
b2bc1d4555 setting password to null in getUserData, because Object.delete is bad? :P (thanks @barisusakli) 2014-03-06 15:37:29 -05:00
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) 2014-03-06 15:32:06 -05:00
Baris Soner Usakli
d34e68ca25 convert score to int in mongo 2014-03-06 15:31:10 -05:00
Baris Soner Usakli
acd4771012 dbmock changes 2014-03-06 15:11:29 -05:00