Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-18 05:22:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,066 Commits 69 Branches 489 Tags
dc5bd7601fb3da170aab380ff8f8c8c778342e76
Commit Graph

5262 Commits

Author SHA1 Message Date
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
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
MrWaffle
33a5a2177e Send the callback to the retry 2014-03-05 20:57:32 +01: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
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
medwards20x6
76b53478ce Don't fire click when closing an alert 2014-03-04 10:30:44 -08:00
Baris Soner Usakli
dbb814fe4e category permission page fixes 2014-03-04 12:54:25 -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
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
5b25e21606 console.log 2014-03-02 23:45:41 -05:00
psychobunny
d20501b29d meta.js merge conflict 2014-03-02 22:59:57 -05:00
psychobunny
c44934cc0d all JS files properly required on cold load 2014-03-02 22:51:40 -05:00
psychobunny
52a50a80ba templates.parseTemplateVariables, added optional callback 2014-03-02 22:48:18 -05:00
psychobunny
b9264dea76 ajaxify.loadScript 2014-03-02 22:47:14 -05:00
Baris Soner Usakli
98fa8c419d closes #1152 2014-03-02 19:55:26 -05:00
Baris Soner Usakli
e4b6d0e1ff closes #1096 2014-03-02 16:58:49 -05:00
psychobunny
ee5596fad5 Merge remote-tracking branch 'origin/master' into webserver.js-refactor 2014-03-02 13:51:34 -05:00
Baris Soner Usakli
5732994097 reset_code click fix 2014-03-01 23:18:05 -05:00
Baris Soner Usakli
1b7f8cc5cb active users fix 2014-03-01 22:51:39 -05:00
Julian Lam
77f5d6ff7d Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-01 22:00:28 -05:00
Julian Lam
1c324f45cf tried fixing absentee detection in active users 2014-03-01 21:59:51 -05:00
Baris Soner Usakli
c6ff8e1042 #1148 2014-03-01 21:55:29 -05:00
Julian Lam
2b178ff76d proper tracking of users' reply status when others enter the room 2014-03-01 21:31:50 -05:00
Julian Lam
a9b78d2600 minimizing the composer should unregister it 2014-03-01 17:49:39 -05:00
Julian Lam
68fb6ec09a Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-01 17:36:30 -05:00
Julian Lam
f2ffc2b533 properly referencing the tid of the composer instead of blindly checking templates.get('topic_id') 2014-03-01 17:34:06 -05:00
Baris Soner Usakli
3c6e4ebda1 possible fix to #1148 2014-03-01 17:11:49 -05:00
Julian Lam
7ef84e0daa switched to 'ping active' system 2014-03-01 16:53:41 -05:00
Julian Lam
b3d7ae1c86 showing who is replying in the active users block 2014-03-01 15:46:13 -05:00
psychobunny
26853d024e Merge remote-tracking branch 'origin/master' into webserver.js-refactor 2014-03-01 15:37:57 -05:00
Baris Soner Usakli
8eca195530 updateHeader once on load 2014-02-28 22:08:33 -05:00
Baris Soner Usakli
84dc012198 closes #1142 2014-02-28 18:17:17 -05:00
Baris Soner Usakli
e75c303b89 added unique visitor count to admin dashboard 2014-02-28 17:19:42 -05:00