Julian Lam
|
392075eb27
|
fixing theme previews in subfolder installs
|
11 years ago |
barisusakli
|
d4556d4da3
|
added minifed js files
replace jquery form and timeago with minified versions
|
11 years ago |
|
Julian Lam
|
a500899fdf
|
removing unused bootstrap js file
|
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
|
4cb9f34253
|
adding buzz and sound assets
|
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 |
|
barisusakli
|
661dff2f9b
|
added jquery css
|
11 years ago |
|
Julian Lam
|
19c9f1bb19
|
backwards compatibility with plugins that are assuming no callback
|
11 years ago |
|
barisusakli
|
656ec227e9
|
merge
|
11 years ago |
|
barisusakli
|
78f9c25c9c
|
added autocomplete to jquery fixed search results
|
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 |
|
psychobunny
|
68b41083ad
|
removing re-added templates from core
|
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 |
|
barisusakli
|
b4b9ed1841
|
optimized getTopicsByTids, single db call to get topicData, added cache for privilege/category/user data
|
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 |
|
Julian Lam
|
5880590425
|
removing "pluginCSS", "css" in plugins is now included directly into stylesheet.css. This is a breaking change.
fixes #1168
|
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
|
542f937589
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
src/routes/api.js
|
11 years ago |
|
Baris Soner Usakli
|
c028761857
|
new route to get recent posts
|
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 |
|
Julian Lam
|
6192af18ab
|
Merge pull request #1159 from BitBangersCode/settings-callback
Send the callback to the retry
|
11 years ago |
MrWaffle
|
33a5a2177e
|
Send the callback to the retry
|
11 years ago |
|
Baris Soner Usakli
|
976744480f
|
post summary change
|
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 |
|
psychobunny
|
d4f453cde3
|
added gitignore to public/templates dir
|
11 years ago |
|
psychobunny
|
66ef8c8284
|
removed vanilla templates from core into nodebb-theme-vanilla :shipit:
|
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 |
|
Barış Soner Uşaklı
|
81378e071b
|
Merge pull request #1157 from MakerStudios/alertclose_nofire_click
Don't fire click when closing an alert
|
11 years ago |
|
Julian Lam
|
9b53dd1014
|
english fallback for 'reset_password' translations
|
11 years ago |
medwards20x6
|
76b53478ce
|
Don't fire click when closing an alert
|
11 years ago |
|
Baris Soner Usakli
|
3c97ef6829
|
closes #1156
|
11 years ago |
|
Baris Soner Usakli
|
dbb814fe4e
|
category permission page fixes
|
11 years ago |
|
Baris Soner Usakli
|
7bb3766ebd
|
2 column layout for admin index
|
11 years ago |
|
Baris Soner Usakli
|
814db2e1d8
|
icon first
|
11 years ago |
|
Baris Soner Usakli
|
4b64b9dcdc
|
closes #951
|
11 years ago |
|
Julian Lam
|
57d0273c13
|
dutch translations
|
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
|
8ad24818df
|
fixed FOUS in category sidebar
|
11 years ago |
|
psychobunny
|
71675d0aa0
|
removed required "ajaxifying" class for #content - breaks browsers with noscript turned on.
|
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 |
|
Julian Lam
|
044347ebca
|
hotfix for vanilla missing socket.io lib
|
11 years ago |
|
Baris Soner Usakli
|
016642bc16
|
show 1 ip per line
|
11 years ago |
|
Baris Soner Usakli
|
98fa8c419d
|
closes #1152
|
11 years ago |
|
Baris Soner Usakli
|
55b5d0c209
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
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 |
|
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.
|
11 years ago |
|
Julian Lam
|
033c5d5726
|
es, fr, nb, sv, zh_CN translations
|
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
|
0682b5c5ea
|
fix admin users link
|
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
|
e2fb3dacca
|
pushing new language fallbacks
|
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
|
44d40fba35
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
0ca6c58ded
|
closes #1137
|
11 years ago |
|
Julian Lam
|
1a85d45567
|
portuguese and slovak translations
|
11 years ago |
|
Baris Soner Usakli
|
dcd3975933
|
closes #1135
|
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
|
87ccfdf5eb
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
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 |
|
Julian Lam
|
ef2dbe8df6
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
04b2887d88
|
fixed it language code
|
11 years ago |
|
Baris Soner Usakli
|
d5268f5497
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
56bbeb9950
|
use disableSocialButtons from config
|
11 years ago |
|
psychobunny
|
2247a8b21f
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
psychobunny
|
aee2b2ecd0
|
allow express to serve parsed tpls via res.render
|
11 years ago |
|
Baris Soner Usakli
|
ea6cf3bbd5
|
more cleanup and changes to topics
|
11 years ago |
|
Julian Lam
|
74d6392bec
|
added Dutch language
|
11 years ago |
|
Julian Lam
|
c38e328377
|
language files for fi, it, zh_CN, pl, hu
|
11 years ago |
|
Baris Soner Usakli
|
8a2266816d
|
make plugin names strong
|
11 years ago |
|
Baris Soner Usakli
|
36bc2967c2
|
fix highlight on vanilla, dont replaceState if url didnt change
|
11 years ago |
|
Baris Soner Usakli
|
1ba3acfd03
|
display ips to admins/users on profile
|
11 years ago |
|
Julian Lam
|
6545357969
|
fixing admin stylesheet + lavender minver
|
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
|
23c20a2821
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
b658c68736
|
back doesnt work
|
11 years ago |
|
Julian Lam
|
4c21b23ea2
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
a3855a47e5
|
check replaceState
|
11 years ago |
|
Baris Soner Usakli
|
5567378234
|
change hash take 2
|
11 years ago |
|
Julian Lam
|
7f11d78b82
|
Merge branch 'master' into less-is-moar
|
11 years ago |
|
Julian Lam
|
e3ec4e938a
|
Revert "update post has in address bar, #1126"
This reverts commit 4b1c8150d3.
|
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 |
|
Julian Lam
|
53f1e4d3d4
|
dedicated stylesheet.css route for LESS compilation, no longer usin less-middleware for base theme...
|
11 years ago |
|
Baris Soner Usakli
|
7e5a7c53bd
|
changes to templates
|
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
|
0f8ee3a671
|
added instructions class
|
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
|
acafa9095f
|
added footer widget area to topic.tpl
|
11 years ago |
|
psychobunny
|
71ea01edb7
|
switching topics.thumb conditional back
|
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
|
fd41d93bdb
|
took out if from the src
|
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
|
e35a54bea4
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |