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
|
11 years ago |
MrWaffle
|
33a5a2177e
|
Send the callback to the retry
|
11 years ago |
|
psychobunny
|
3614211f0e
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
public/templates/accountposts.tpl
public/templates/header.tpl
|
11 years ago |
|
psychobunny
|
552eb78db8
|
template compiling init; changing themes now finally works on this branch
|
11 years ago |
|
psychobunny
|
88e5ddac76
|
deprecating hook events on body
|
11 years ago |
|
psychobunny
|
c67182204f
|
clean-up + bugfixes
|
11 years ago |
|
psychobunny
|
444956d517
|
deprecated loadTemplates client-side as well
|
11 years ago |
|
psychobunny
|
68d526b762
|
deprecated templates.ready, templates.init, templates.loadServer; start webserver immediately without having to wait for templates.js
|
11 years ago |
|
psychobunny
|
f73fd1eeae
|
removed an unused hack in utils.js
|
11 years ago |
Baris Soner Usakli
|
76d8d09f9b
|
closes #1141
|
11 years ago |
|
Baris Soner Usakli
|
d100a41ce7
|
fixes topic follow
|
11 years ago |
|
psychobunny
|
6e8c618fb1
|
prevent translator crash if data is undefined; linted/cleanup
|
11 years ago |
|
psychobunny
|
cd336006fc
|
optimized cold loading
|
11 years ago |
|
Baris Soner Usakli
|
8c11299197
|
template language fix
|
11 years ago |
|
psychobunny
|
10f4fa004e
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
11 years ago |
|
psychobunny
|
48df0cf889
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
src/routes/admin.js
|
11 years ago |
medwards20x6
|
76b53478ce
|
Don't fire click when closing an alert
|
11 years ago |
|
Baris Soner Usakli
|
dbb814fe4e
|
category permission page fixes
|
11 years ago |
|
Baris Soner Usakli
|
be70b3de57
|
closes #1090
|
11 years ago |
|
Baris Soner Usakli
|
529cd60dd2
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
70299ea5c2
|
better search result page
|
11 years ago |
|
psychobunny
|
c26af77a24
|
fixing cold load of admin/index
|
11 years ago |
Julian Lam
|
64ee792013
|
fixed #1154
|
11 years ago |
|
Julian Lam
|
5a8fa9b1f7
|
fixed regression in groups management modal
|
11 years ago |
|
psychobunny
|
5b25e21606
|
console.log
|
11 years ago |
|
psychobunny
|
d20501b29d
|
meta.js merge conflict
|
11 years ago |
|
psychobunny
|
c44934cc0d
|
all JS files properly required on cold load
|
11 years ago |
|
psychobunny
|
52a50a80ba
|
templates.parseTemplateVariables, added optional callback
|
11 years ago |
|
psychobunny
|
b9264dea76
|
ajaxify.loadScript
|
11 years ago |
|
Baris Soner Usakli
|
98fa8c419d
|
closes #1152
|
11 years ago |
|
Baris Soner Usakli
|
e4b6d0e1ff
|
closes #1096
|
11 years ago |
|
psychobunny
|
ee5596fad5
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
11 years ago |
|
Baris Soner Usakli
|
5732994097
|
reset_code click fix
|
11 years ago |
|
Baris Soner Usakli
|
1b7f8cc5cb
|
active users fix
|
11 years ago |
|
Julian Lam
|
77f5d6ff7d
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
1c324f45cf
|
tried fixing absentee detection in active users
|
11 years ago |
|
Baris Soner Usakli
|
c6ff8e1042
|
#1148
|
11 years ago |
|
Julian Lam
|
2b178ff76d
|
proper tracking of users' reply status when others enter the room
|
11 years ago |
|
Julian Lam
|
a9b78d2600
|
minimizing the composer should unregister it
|
11 years ago |
|
Julian Lam
|
68fb6ec09a
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
f2ffc2b533
|
properly referencing the tid of the composer instead of blindly checking templates.get('topic_id')
|
11 years ago |
|
Baris Soner Usakli
|
3c6e4ebda1
|
possible fix to #1148
|
11 years ago |
|
Julian Lam
|
7ef84e0daa
|
switched to 'ping active' system
|
11 years ago |
|
Julian Lam
|
b3d7ae1c86
|
showing who is replying in the active users block
|
11 years ago |
|
psychobunny
|
26853d024e
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
11 years ago |
|
Baris Soner Usakli
|
8eca195530
|
updateHeader once on load
|
11 years ago |
|
Baris Soner Usakli
|
84dc012198
|
closes #1142
|
11 years ago |
|
Baris Soner Usakli
|
e75c303b89
|
added unique visitor count to admin dashboard
|
11 years ago |
|
psychobunny
|
e73f8d6f37
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
11 years ago |
|
psychobunny
|
0211b4484b
|
on cold load, only display page after widgets are rendered
|
11 years ago |