Julian Lam
|
0ea14324ac
|
adding missing files
|
11 years ago |
|
Julian Lam
|
6d03f713c5
|
"Sounds" tab in Settings page... WIP, needs fixing.
|
11 years ago |
barisusakli
|
a0e784a612
|
closes #1138
|
11 years ago |
|
barisusakli
|
d2bef79888
|
closes #1194
|
11 years ago |
|
barisusakli
|
ccc717b339
|
account posts jshint
|
11 years ago |
|
Julian Lam
|
401bd02748
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
553cabdcfa
|
refactored sound system so that they can be specified in ACP, updated soundfile to work in FF, which fixes #1209
|
11 years ago |
|
barisusakli
|
9685cb7fe0
|
removed broken post update
|
11 years ago |
|
barisusakli
|
161c7f1875
|
closes #1201
|
11 years ago |
|
barisusakli
|
2bb5918b6c
|
closes #1208
|
11 years ago |
|
barisusakli
|
7668b95c66
|
register.js cleanup
|
11 years ago |
|
barisusakli
|
970639274e
|
fixes image uploads
if images had special regex characters in them upload text was failing
|
11 years ago |
|
barisusakli
|
90e398e5c9
|
user js refactor, category fix
if a category that didn't exist was request with category/1231 or
api/category/1231 it was crashing.
|
11 years ago |
psychobunny
|
b2986f2a4e
|
removing use strict from forum/topic.js until its refactored properly
|
11 years ago |
|
psychobunny
|
35ac0bb793
|
linted app.js
|
11 years ago |
|
psychobunny
|
dd7433bab6
|
fixed active users icon in thread
|
11 years ago |
|
psychobunny
|
01077cb35b
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
psychobunny
|
0d625761be
|
fixing bug introduced @ da0355ef79 (multiple widget areas defined = explosion)
|
11 years ago |
|
barisusakli
|
0f19578523
|
removed dupe body
|
11 years ago |
|
psychobunny
|
bdc7a19bd7
|
don't attempt to parse a non-existing widget area
|
11 years ago |
|
psychobunny
|
58fe16e15c
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
psychobunny
|
7fc2e627c5
|
linting templates.js; got rid of some unused server-side code
|
11 years ago |
|
Julian Lam
|
e611a8174e
|
linting setting.js again and abstracting out saveField
|
11 years ago |
|
psychobunny
|
0a293be823
|
linting categories.js and footer.js
|
11 years ago |
|
psychobunny
|
d183e58771
|
linting admin/groups
|
11 years ago |
|
psychobunny
|
6ea760d636
|
linting admin/index; admin/languages
|
11 years ago |
|
psychobunny
|
2d65a746e4
|
linting admin/settings
|
11 years ago |
|
psychobunny
|
b515995432
|
removed unnecessary switch case
|
11 years ago |
|
psychobunny
|
e9fb2f4135
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
psychobunny
|
44a91fe9ea
|
linting admin/themes
|
11 years ago |
|
Julian Lam
|
ca2e9d7d9e
|
linting and moving xregexp back to .js
|
11 years ago |
|
psychobunny
|
da0355ef79
|
remove async dep for widgets (30kb was overkill for one use of async.each); linting
|
11 years ago |
|
Julian Lam
|
2826381b20
|
draft saving in composer -- resolved #1197
|
11 years ago |
|
barisusakli
|
c320051a1e
|
chat jshint
|
11 years ago |
|
Julian Lam
|
e757183cec
|
linting
|
11 years ago |
|
Julian Lam
|
89ba0840e6
|
minor reordering of jslint comment
|
11 years ago |
|
Julian Lam
|
0668556d4f
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
c000a8c5ba
|
linting
|
11 years ago |
|
barisusakli
|
e9ab9dcce2
|
search cleanup
|
11 years ago |
|
barisusakli
|
67f1251ba3
|
pagination cleanup
|
11 years ago |
|
Julian Lam
|
392075eb27
|
fixing theme previews in subfolder installs
|
11 years ago |
|
Julian Lam
|
4343f240d0
|
moving async back to proper vendor folder
|
11 years ago |
|
Julian Lam
|
2f1707e772
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
barisusakli
|
813b3d6fcc
|
changes for live streaming of posts
|
11 years ago |
|
psychobunny
|
1e9850b6b9
|
vendor*
|
11 years ago |
|
psychobunny
|
df29410c08
|
moving async back to require.js modules/vendor folder
|
11 years ago |
|
Julian Lam
|
3dc4fd9fd9
|
added sounds for incoming and outgoing chat, and new notification
|
11 years ago |
|
Julian Lam
|
f65a7f96ff
|
moving async to proper vendor folder
|
11 years ago |
|
Julian Lam
|
cb304d7d54
|
fixed #1188
|
11 years ago |
|
barisusakli
|
a5f4135c62
|
added socket listeners to home
|
11 years ago |
|
psychobunny
|
29ad8d2582
|
closes #1192
|
11 years ago |
|
barisusakli
|
3d68c7c6b6
|
added getObjectsFields methods to db class, changed getUsers methods to use the new method, refactor to user.js and mongo.js
|
11 years ago |
|
psychobunny
|
a68ba044c3
|
fixed missing topic_name and viewcount when reverse infinite scrolling
|
11 years ago |
|
psychobunny
|
857df86726
|
fixed pagination, and loading of template blocks on cold load (temp solution)
|
11 years ago |
|
psychobunny
|
875c8ed66c
|
console.log
|
11 years ago |
|
psychobunny
|
62afe65ccf
|
bugfix + deprecated templates.getTemplateNameFromUrl
|
11 years ago |
|
psychobunny
|
712c382a28
|
optimizing ajaxify (still needs work though)
|
11 years ago |
|
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
|
11 years ago |
|
barisusakli
|
73c89010cb
|
closes #1182
|
11 years ago |
|
barisusakli
|
57f9f8bc57
|
closes #1176
|
11 years ago |
|
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
|
11 years ago |
|
barisusakli
|
6496b91c29
|
closes #1180
|
11 years ago |
|
Julian Lam
|
6fb393de78
|
fixing #1177
|
11 years ago |
|
Julian Lam
|
5a8a3627d2
|
bringing subfolder installations to v0.4.0 - JUST FOR @PLANNER
|
11 years ago |
|
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
|
11 years ago |
|
Baris Soner Usakli
|
30130b2d62
|
set back to false when loading indicator fades out
|
11 years ago |
|
Baris Soner Usakli
|
6a824a2e10
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
7dfdab0a2d
|
search page change
|
11 years ago |
|
psychobunny
|
7183fda2eb
|
console.log
|
11 years ago |
|
psychobunny
|
bcd8137d0e
|
console.log
|
11 years ago |
|
psychobunny
|
55a7838725
|
temporary templateMapping fix for admin side; will come back to this after merging this branch
|
11 years ago |
|
Julian Lam
|
1f23642ab4
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
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)
|
11 years ago |
|
Baris Soner Usakli
|
7135e9424c
|
closes #1167
|
11 years ago |
|
Baris Soner Usakli
|
3fe9bdc24c
|
removed the postbar selector from activeusers
|
11 years ago |
|
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 |
|
psychobunny
|
6f21547a8d
|
ajaxify.fadeIn, ajaxify.fadeOut
|
11 years ago |
|
Baris Soner Usakli
|
6bf36a0468
|
if alert is closed dont fire clickfn
|
11 years ago |
|
psychobunny
|
6827dbc9c4
|
render widgets on cold load
|
11 years ago |
|
Baris Soner Usakli
|
eea677655f
|
minor clean up to categories.js
|
11 years ago |
|
psychobunny
|
23c283f06c
|
ajaxify.getTemplateMapping
|
11 years ago |
|
psychobunny
|
49997639e9
|
moved widget rendering code into ajaxify.renderWidgets
|
11 years ago |
|
psychobunny
|
584347848b
|
trigger action:ajaxify.start and action:ajaxify.end on cold load
|
11 years ago |
|
Baris Soner Usakli
|
eac201cae9
|
no need to do these on every ajaxify into categories
|
11 years ago |
|
Baris Soner Usakli
|
7eae79cee9
|
anons cant chat
|
11 years ago |
|
Baris Soner Usakli
|
ccd29bfd61
|
added callback to category update
|
11 years ago |
|
psychobunny
|
607bc8545b
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
11 years ago |
|
Baris Soner Usakli
|
8064f7f0db
|
scroll fix
|
11 years ago |
|
Baris Soner Usakli
|
9b4ca12dc1
|
fixed missing var, posts.js cleanup
|
11 years ago |
|
Baris Soner Usakli
|
091723a8c5
|
closes #1101
|
11 years ago |
|
Baris Soner Usakli
|
389fc787a3
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
c49c3e3550
|
fixed jquery ui package
|
11 years ago |
|
psychobunny
|
4435a20d90
|
fixed merge conflict
|
11 years ago |
|
psychobunny
|
4a33b41464
|
deprecating loadServer in favour of using res.render
|
11 years ago |
|
Julian Lam
|
dfd13fac0d
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
44ac7ec262
|
added new hooks for rendering help messages in composer, removed markdown text from translation
|
11 years ago |
|
Baris Soner Usakli
|
30eb85f96e
|
fixed conflicts
|
11 years ago |
|
Baris Soner Usakli
|
0ca6c58ded
|
closes #1137
|
11 years ago |
akhoury
|
2209a55afc
|
- changes per PR conversation
|
11 years ago |
|
akhoury
|
0070e1158e
|
removing a boolean left out from the addEventListener definition
|
11 years ago |
|
Baris Soner Usakli
|
72aa22d824
|
removed unused timestamp
|
11 years ago |
|
akhoury
|
3f1d5c6656
|
merge fork with upstream master
|
11 years ago |
|
Baris Soner Usakli
|
d87034b131
|
use alert for bookmark
|
11 years ago |
|
akhoury
|
1b207d8276
|
IE8 support, general cleanups, from native to $ objects ...
|
11 years ago |
|
akhoury
|
b59c10a1e9
|
took out some overrides out utils to a new overrides.js
|
11 years ago |
|
psychobunny
|
aee2b2ecd0
|
allow express to serve parsed tpls via res.render
|
11 years ago |
|
Baris Soner Usakli
|
36bc2967c2
|
fix highlight on vanilla, dont replaceState if url didnt change
|
11 years ago |
|
Julian Lam
|
f5d1ba4231
|
closed #1113
|
11 years ago |
|
Baris Soner Usakli
|
8913de4ea8
|
dont add post-bar to each post
|
11 years ago |
|
Baris Soner Usakli
|
3c53ebb02e
|
better scrolling
|
11 years ago |
|
Baris Soner Usakli
|
b658c68736
|
back doesnt work
|
11 years ago |
|
Baris Soner Usakli
|
a3855a47e5
|
check replaceState
|
11 years ago |
|
Baris Soner Usakli
|
5567378234
|
change hash take 2
|
11 years ago |
|
Baris Soner Usakli
|
4b1c8150d3
|
update post has in address bar, #1126
|
11 years ago |
|
Baris Soner Usakli
|
14b298eda8
|
cleaned updateHeader
|
11 years ago |
|
Baris Soner Usakli
|
f39248c83b
|
closes #1123
|
11 years ago |
|
psychobunny
|
156c0302c9
|
properly namespacing objects in templates
|
11 years ago |
|
Baris Soner Usakli
|
0777c96a55
|
dont highlight reverse infinite loaded posts
|
11 years ago |
|
Baris Soner Usakli
|
0da2839943
|
added the class for topic delete
|
11 years ago |
|
Baris Soner Usakli
|
3ed2d21eb6
|
fixed flag post, added highlight to scroll post
|
11 years ago |
|
Baris Soner Usakli
|
7c49c32ad3
|
scroll fix
|
11 years ago |
|
Baris Soner Usakli
|
cd9bd91ab2
|
fixes double hashes in share links
|
11 years ago |
|
psychobunny
|
a79ca2b135
|
clean up ENDIF conditional if object.value is undefined and is used in an ELSE block
|
11 years ago |
|
Julian Lam
|
1052165373
|
updated messages when toggling themes or plugins
|
11 years ago |
|
Julian Lam
|
2baa381917
|
plugins and themes now trigger a restart
|
11 years ago |
|
Julian Lam
|
4ef1d83acd
|
Merge branch 'master' into nodebb-loader
|
11 years ago |
|
Baris Soner Usakli
|
e3d01df6a2
|
closes #980
|
11 years ago |
|
Baris Soner Usakli
|
b8b83c2ec2
|
share buttons
|
11 years ago |
|
Baris Soner Usakli
|
f967407805
|
follow state clean up
|
11 years ago |
|
Baris Soner Usakli
|
649bcf49b4
|
one liner
|
11 years ago |
|
Baris Soner Usakli
|
b5c8158ad5
|
more cleanup
|
11 years ago |
|
Baris Soner Usakli
|
403de08d60
|
cleaned more
|
11 years ago |
|
Baris Soner Usakli
|
122d1ad82a
|
less is more
|
11 years ago |
|
Baris Soner Usakli
|
6c6c57f45f
|
closes #1108
|
11 years ago |
|
Baris Soner Usakli
|
6e5a6b8784
|
upgraded categories to sorted set, score is the order set from acp, check if category topic exists before posting
|
11 years ago |
|
Baris Soner Usakli
|
d6d9776cde
|
added toPid to posts
|
11 years ago |
|
Julian Lam
|
7760a6b207
|
added restart button to ACP (!!)
|
11 years ago |
|
Baris Soner Usakli
|
3f43ca0925
|
change on click
|
11 years ago |
|
Baris Soner Usakli
|
cfe5b6aa4a
|
check if thumEl exists before trim
|
11 years ago |
|
Baris Soner Usakli
|
bae76ebd70
|
fixed the redis error when going to unread/recent if nextStart is missing
|
11 years ago |
|
Baris Soner Usakli
|
29ba015d69
|
fixed topic thumbs
|
11 years ago |
|
psychobunny
|
f862d856fc
|
alright clearly, regex on fridays just don't happen for me. - fixed
|
11 years ago |
|
psychobunny
|
027398f5ba
|
unreverting change
|
11 years ago |
|
psychobunny
|
0c54afe576
|
reverting previous template fix
|
11 years ago |
|
psychobunny
|
6f7243f42f
|
fixed a bug running multiple blocks in one template on an empty array
|
11 years ago |
|
psychobunny
|
c7fb34c23f
|
new client-side hooks: filter:categories.new_topic, action:categories.new_topic.loaded
|
11 years ago |
|
psychobunny
|
15f19653c5
|
action:categories.loading and action.categories.loaded
|
11 years ago |
|
psychobunny
|
7e767da73e
|
closes #1086 and #1085
|
11 years ago |
|
psychobunny
|
a3191227de
|
closes #1080
|
11 years ago |
|
psychobunny
|
86dd01154e
|
closes #1079
|
11 years ago |
|
Baris Soner Usakli
|
74b0da78f4
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |