psychobunny
|
d4f453cde3
|
added gitignore to public/templates dir
|
12 years ago |
|
psychobunny
|
66ef8c8284
|
removed vanilla templates from core into nodebb-theme-vanilla :shipit:
|
12 years ago |
Baris Soner Usakli
|
d100a41ce7
|
fixes topic follow
|
12 years ago |
|
psychobunny
|
6e8c618fb1
|
prevent translator crash if data is undefined; linted/cleanup
|
12 years ago |
|
psychobunny
|
cd336006fc
|
optimized cold loading
|
12 years ago |
|
Baris Soner Usakli
|
8c11299197
|
template language fix
|
12 years ago |
|
psychobunny
|
10f4fa004e
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
12 years ago |
|
psychobunny
|
48df0cf889
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
src/routes/admin.js
|
12 years ago |
|
Barış Soner Uşaklı
|
81378e071b
|
Merge pull request #1157 from MakerStudios/alertclose_nofire_click
Don't fire click when closing an alert
|
12 years ago |
Julian Lam
|
9b53dd1014
|
english fallback for 'reset_password' translations
|
12 years ago |
medwards20x6
|
76b53478ce
|
Don't fire click when closing an alert
|
12 years ago |
|
Baris Soner Usakli
|
3c97ef6829
|
closes #1156
|
12 years ago |
|
Baris Soner Usakli
|
dbb814fe4e
|
category permission page fixes
|
12 years ago |
|
Baris Soner Usakli
|
7bb3766ebd
|
2 column layout for admin index
|
12 years ago |
|
Baris Soner Usakli
|
814db2e1d8
|
icon first
|
12 years ago |
|
Baris Soner Usakli
|
4b64b9dcdc
|
closes #951
|
12 years ago |
|
Julian Lam
|
57d0273c13
|
dutch translations
|
12 years ago |
|
Baris Soner Usakli
|
be70b3de57
|
closes #1090
|
12 years ago |
|
Baris Soner Usakli
|
529cd60dd2
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
70299ea5c2
|
better search result page
|
12 years ago |
|
psychobunny
|
c26af77a24
|
fixing cold load of admin/index
|
12 years ago |
|
Julian Lam
|
64ee792013
|
fixed #1154
|
12 years ago |
|
Julian Lam
|
5a8fa9b1f7
|
fixed regression in groups management modal
|
12 years ago |
|
psychobunny
|
5b25e21606
|
console.log
|
12 years ago |
|
psychobunny
|
8ad24818df
|
fixed FOUS in category sidebar
|
12 years ago |
|
psychobunny
|
71675d0aa0
|
removed required "ajaxifying" class for #content - breaks browsers with noscript turned on.
|
12 years ago |
|
psychobunny
|
d20501b29d
|
meta.js merge conflict
|
12 years ago |
|
psychobunny
|
c44934cc0d
|
all JS files properly required on cold load
|
12 years ago |
|
psychobunny
|
52a50a80ba
|
templates.parseTemplateVariables, added optional callback
|
12 years ago |
|
psychobunny
|
b9264dea76
|
ajaxify.loadScript
|
12 years ago |
|
Julian Lam
|
044347ebca
|
hotfix for vanilla missing socket.io lib
|
12 years ago |
|
Baris Soner Usakli
|
016642bc16
|
show 1 ip per line
|
12 years ago |
|
Baris Soner Usakli
|
98fa8c419d
|
closes #1152
|
12 years ago |
|
Baris Soner Usakli
|
55b5d0c209
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
e4b6d0e1ff
|
closes #1096
|
12 years ago |
|
psychobunny
|
ee5596fad5
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
12 years ago |
|
Julian Lam
|
14d7453a23
|
bundling socket.io client library into minfile, minfile always used from this point forward, even in development mode.
Development mode will not compress the scripts, but will just concatenate.
|
12 years ago |
|
Julian Lam
|
033c5d5726
|
es, fr, nb, sv, zh_CN translations
|
12 years ago |
|
Baris Soner Usakli
|
5732994097
|
reset_code click fix
|
12 years ago |
|
Baris Soner Usakli
|
1b7f8cc5cb
|
active users fix
|
12 years ago |
|
Julian Lam
|
77f5d6ff7d
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
1c324f45cf
|
tried fixing absentee detection in active users
|
12 years ago |
|
Baris Soner Usakli
|
c6ff8e1042
|
#1148
|
12 years ago |
|
Julian Lam
|
2b178ff76d
|
proper tracking of users' reply status when others enter the room
|
12 years ago |
|
Julian Lam
|
a9b78d2600
|
minimizing the composer should unregister it
|
12 years ago |
|
Julian Lam
|
68fb6ec09a
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
f2ffc2b533
|
properly referencing the tid of the composer instead of blindly checking templates.get('topic_id')
|
12 years ago |
|
Baris Soner Usakli
|
3c6e4ebda1
|
possible fix to #1148
|
12 years ago |
|
Julian Lam
|
7ef84e0daa
|
switched to 'ping active' system
|
12 years ago |
|
Julian Lam
|
b3d7ae1c86
|
showing who is replying in the active users block
|
12 years ago |
|
psychobunny
|
26853d024e
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
12 years ago |
|
Baris Soner Usakli
|
8eca195530
|
updateHeader once on load
|
12 years ago |
|
Baris Soner Usakli
|
84dc012198
|
closes #1142
|
12 years ago |
|
Baris Soner Usakli
|
e75c303b89
|
added unique visitor count to admin dashboard
|
12 years ago |
|
psychobunny
|
e73f8d6f37
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
12 years ago |
|
psychobunny
|
0211b4484b
|
on cold load, only display page after widgets are rendered
|
12 years ago |
|
psychobunny
|
6f21547a8d
|
ajaxify.fadeIn, ajaxify.fadeOut
|
12 years ago |
|
Baris Soner Usakli
|
6bf36a0468
|
if alert is closed dont fire clickfn
|
12 years ago |
|
psychobunny
|
6827dbc9c4
|
render widgets on cold load
|
12 years ago |
|
Baris Soner Usakli
|
eea677655f
|
minor clean up to categories.js
|
12 years ago |
|
psychobunny
|
23c283f06c
|
ajaxify.getTemplateMapping
|
12 years ago |
|
psychobunny
|
49997639e9
|
moved widget rendering code into ajaxify.renderWidgets
|
12 years ago |
|
psychobunny
|
584347848b
|
trigger action:ajaxify.start and action:ajaxify.end on cold load
|
12 years ago |
|
Baris Soner Usakli
|
eac201cae9
|
no need to do these on every ajaxify into categories
|
12 years ago |
|
Baris Soner Usakli
|
7eae79cee9
|
anons cant chat
|
12 years ago |
|
Baris Soner Usakli
|
ccd29bfd61
|
added callback to category update
|
12 years ago |
|
psychobunny
|
607bc8545b
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
12 years ago |
|
Baris Soner Usakli
|
8064f7f0db
|
scroll fix
|
12 years ago |
|
Baris Soner Usakli
|
9b4ca12dc1
|
fixed missing var, posts.js cleanup
|
12 years ago |
|
Baris Soner Usakli
|
091723a8c5
|
closes #1101
|
12 years ago |
|
Baris Soner Usakli
|
0682b5c5ea
|
fix admin users link
|
12 years ago |
|
Baris Soner Usakli
|
389fc787a3
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
c49c3e3550
|
fixed jquery ui package
|
12 years ago |
|
psychobunny
|
4435a20d90
|
fixed merge conflict
|
12 years ago |
|
psychobunny
|
4a33b41464
|
deprecating loadServer in favour of using res.render
|
12 years ago |
|
Julian Lam
|
e2fb3dacca
|
pushing new language fallbacks
|
12 years ago |
|
Julian Lam
|
dfd13fac0d
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
44ac7ec262
|
added new hooks for rendering help messages in composer, removed markdown text from translation
|
12 years ago |
|
Baris Soner Usakli
|
30eb85f96e
|
fixed conflicts
|
12 years ago |
|
Baris Soner Usakli
|
44d40fba35
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
0ca6c58ded
|
closes #1137
|
12 years ago |
|
Julian Lam
|
1a85d45567
|
portuguese and slovak translations
|
12 years ago |
|
Baris Soner Usakli
|
dcd3975933
|
closes #1135
|
12 years ago |
akhoury
|
2209a55afc
|
- changes per PR conversation
|
12 years ago |
|
akhoury
|
0070e1158e
|
removing a boolean left out from the addEventListener definition
|
12 years ago |
|
Baris Soner Usakli
|
72aa22d824
|
removed unused timestamp
|
12 years ago |
|
akhoury
|
3f1d5c6656
|
merge fork with upstream master
|
12 years ago |
|
Baris Soner Usakli
|
87ccfdf5eb
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
d87034b131
|
use alert for bookmark
|
12 years ago |
|
akhoury
|
1b207d8276
|
IE8 support, general cleanups, from native to $ objects ...
|
12 years ago |
|
akhoury
|
b59c10a1e9
|
took out some overrides out utils to a new overrides.js
|
12 years ago |
|
Julian Lam
|
ef2dbe8df6
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
04b2887d88
|
fixed it language code
|
12 years ago |
|
Baris Soner Usakli
|
d5268f5497
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
56bbeb9950
|
use disableSocialButtons from config
|
12 years ago |
|
psychobunny
|
2247a8b21f
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
psychobunny
|
aee2b2ecd0
|
allow express to serve parsed tpls via res.render
|
12 years ago |
|
Baris Soner Usakli
|
ea6cf3bbd5
|
more cleanup and changes to topics
|
12 years ago |
|
Julian Lam
|
74d6392bec
|
added Dutch language
|
12 years ago |
|
Julian Lam
|
c38e328377
|
language files for fi, it, zh_CN, pl, hu
|
12 years ago |