Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-04 19:41:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,287 Commits 72 Branches 492 Tags
a76eab1ca202b94dea5229068d5fa6a9ab2eec56
Commit Graph

9005 Commits

Author SHA1 Message Date
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
6496b91c29 closes #1180 2014-03-09 14:02:30 -04: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
Julian Lam
6fb393de78 fixing #1177 2014-03-08 16:50:32 -05:00
Julian Lam
5a8a3627d2 bringing subfolder installations to v0.4.0 - JUST FOR @PLANNER 2014-03-08 16:04:22 -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
Baris Soner Usakli
30130b2d62 set back to false when loading indicator fades out 2014-03-06 20:53:41 -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
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
1f23642ab4 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-06 15:38:02 -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
7135e9424c closes #1167 2014-03-06 13:32:26 -05:00
Baris Soner Usakli
3fe9bdc24c removed the postbar selector from activeusers 2014-03-06 13:08:22 -05:00
psychobunny
542f937589 Merge remote-tracking branch 'origin/master' into webserver.js-refactor 
Conflicts:
	src/routes/api.js
 2014-03-05 17:35:41 -05:00
Baris Soner Usakli
c028761857 new route to get recent posts 2014-03-05 16:49:42 -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
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
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
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
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
d4f453cde3 added gitignore to public/templates dir 2014-03-04 16:11:03 -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
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
Julian Lam
57d0273c13 dutch translations 2014-03-03 16:40:57 -05:00
Baris Soner Usakli
be70b3de57 closes #1090 2014-03-03 15:26:15 -05:00