6a824a2e10
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
7dfdab0a2d
search page change
11 years ago
5880590425
removing "pluginCSS", "css" in plugins is now included directly into stylesheet.css. This is a breaking change.
...
fixes #1168
11 years ago
7183fda2eb
console.log
11 years ago
bcd8137d0e
console.log
11 years ago
55a7838725
temporary templateMapping fix for admin side; will come back to this after merging this branch
11 years ago
1f23642ab4
Merge branch 'master' of github.com:designcreateplay/NodeBB
11 years ago
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
7135e9424c
closes #1167
11 years ago
3fe9bdc24c
removed the postbar selector from activeusers
11 years ago
542f937589
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
...
Conflicts:
src/routes/api.js
11 years ago
c028761857
new route to get recent posts
11 years ago
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
6192af18ab
Merge pull request #1159 from BitBangersCode/settings-callback
...
Send the callback to the retry
11 years ago
33a5a2177e
Send the callback to the retry
11 years ago
976744480f
post summary change
11 years ago
3614211f0e
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
...
Conflicts:
public/templates/accountposts.tpl
public/templates/header.tpl
11 years ago
552eb78db8
template compiling init; changing themes now finally works on this branch
11 years ago
88e5ddac76
deprecating hook events on body
11 years ago
c67182204f
clean-up + bugfixes
11 years ago
444956d517
deprecated loadTemplates client-side as well
11 years ago
68d526b762
deprecated templates.ready, templates.init, templates.loadServer; start webserver immediately without having to wait for templates.js
11 years ago
f73fd1eeae
removed an unused hack in utils.js
11 years ago
76d8d09f9b
closes #1141
11 years ago
d4f453cde3
added gitignore to public/templates dir
11 years ago
66ef8c8284
removed vanilla templates from core into nodebb-theme-vanilla :shipit:
11 years ago
d100a41ce7
fixes topic follow
11 years ago
6e8c618fb1
prevent translator crash if data is undefined; linted/cleanup
11 years ago
cd336006fc
optimized cold loading
11 years ago
8c11299197
template language fix
11 years ago
10f4fa004e
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
11 years ago
48df0cf889
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
...
Conflicts:
src/routes/admin.js
11 years ago
81378e071b
Merge pull request #1157 from MakerStudios/alertclose_nofire_click
...
Don't fire click when closing an alert
11 years ago
9b53dd1014
english fallback for 'reset_password' translations
11 years ago
76b53478ce
Don't fire click when closing an alert
11 years ago
3c97ef6829
closes #1156
11 years ago
dbb814fe4e
category permission page fixes
11 years ago
7bb3766ebd
2 column layout for admin index
11 years ago
814db2e1d8
icon first
11 years ago
4b64b9dcdc
closes #951
11 years ago
57d0273c13
dutch translations
11 years ago
be70b3de57
closes #1090
11 years ago
529cd60dd2
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
70299ea5c2
better search result page
11 years ago
c26af77a24
fixing cold load of admin/index
11 years ago
64ee792013
fixed #1154
11 years ago
5a8fa9b1f7
fixed regression in groups management modal
11 years ago
5b25e21606
console.log
11 years ago
8ad24818df
fixed FOUS in category sidebar
11 years ago
71675d0aa0
removed required "ajaxifying" class for #content - breaks browsers with noscript turned on.
11 years ago
d20501b29d
meta.js merge conflict
11 years ago
c44934cc0d
all JS files properly required on cold load
11 years ago
52a50a80ba
templates.parseTemplateVariables, added optional callback
11 years ago
b9264dea76
ajaxify.loadScript
11 years ago
044347ebca
hotfix for vanilla missing socket.io lib
11 years ago
016642bc16
show 1 ip per line
11 years ago
98fa8c419d
closes #1152
11 years ago
55b5d0c209
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
e4b6d0e1ff
closes #1096
11 years ago
ee5596fad5
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
11 years ago
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
033c5d5726
es, fr, nb, sv, zh_CN translations
11 years ago
5732994097
reset_code click fix
11 years ago
1b7f8cc5cb
active users fix
11 years ago
77f5d6ff7d
Merge branch 'master' of github.com:designcreateplay/NodeBB
11 years ago
1c324f45cf
tried fixing absentee detection in active users
11 years ago
c6ff8e1042
#1148
11 years ago
2b178ff76d
proper tracking of users' reply status when others enter the room
11 years ago
a9b78d2600
minimizing the composer should unregister it
11 years ago
68fb6ec09a
Merge branch 'master' of github.com:designcreateplay/NodeBB
11 years ago
f2ffc2b533
properly referencing the tid of the composer instead of blindly checking templates.get('topic_id')
11 years ago
3c6e4ebda1
possible fix to #1148
11 years ago
7ef84e0daa
switched to 'ping active' system
11 years ago
b3d7ae1c86
showing who is replying in the active users block
11 years ago
26853d024e
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
11 years ago
8eca195530
updateHeader once on load
11 years ago
84dc012198
closes #1142
11 years ago
e75c303b89
added unique visitor count to admin dashboard
11 years ago
e73f8d6f37
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
11 years ago
0211b4484b
on cold load, only display page after widgets are rendered
11 years ago
6f21547a8d
ajaxify.fadeIn, ajaxify.fadeOut
11 years ago
6bf36a0468
if alert is closed dont fire clickfn
11 years ago
6827dbc9c4
render widgets on cold load
11 years ago
eea677655f
minor clean up to categories.js
11 years ago
23c283f06c
ajaxify.getTemplateMapping
11 years ago
49997639e9
moved widget rendering code into ajaxify.renderWidgets
11 years ago
584347848b
trigger action:ajaxify.start and action:ajaxify.end on cold load
11 years ago
eac201cae9
no need to do these on every ajaxify into categories
11 years ago
7eae79cee9
anons cant chat
11 years ago
ccd29bfd61
added callback to category update
11 years ago
607bc8545b
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
11 years ago
8064f7f0db
scroll fix
11 years ago
9b4ca12dc1
fixed missing var, posts.js cleanup
11 years ago
091723a8c5
closes #1101
11 years ago
0682b5c5ea
fix admin users link
11 years ago
389fc787a3
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
c49c3e3550
fixed jquery ui package
11 years ago
4435a20d90
fixed merge conflict
11 years ago
4a33b41464
deprecating loadServer in favour of using res.render
11 years ago
e2fb3dacca
pushing new language fallbacks
11 years ago
dfd13fac0d
Merge branch 'master' of github.com:designcreateplay/NodeBB
11 years ago
44ac7ec262
added new hooks for rendering help messages in composer, removed markdown text from translation
11 years ago
30eb85f96e
fixed conflicts
11 years ago
44d40fba35
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
0ca6c58ded
closes #1137
11 years ago
1a85d45567
portuguese and slovak translations
11 years ago
dcd3975933
closes #1135
11 years ago
2209a55afc
- changes per PR conversation
11 years ago
0070e1158e
removing a boolean left out from the addEventListener definition
11 years ago
72aa22d824
removed unused timestamp
11 years ago
3f1d5c6656
merge fork with upstream master
11 years ago
87ccfdf5eb
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
d87034b131
use alert for bookmark
11 years ago
1b207d8276
IE8 support, general cleanups, from native to $ objects ...
11 years ago
b59c10a1e9
took out some overrides out utils to a new overrides.js
11 years ago
ef2dbe8df6
Merge branch 'master' of github.com:designcreateplay/NodeBB
11 years ago
04b2887d88
fixed it language code
11 years ago
d5268f5497
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
56bbeb9950
use disableSocialButtons from config
11 years ago
2247a8b21f
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
aee2b2ecd0
allow express to serve parsed tpls via res.render
11 years ago
ea6cf3bbd5
more cleanup and changes to topics
11 years ago
74d6392bec
added Dutch language
11 years ago
c38e328377
language files for fi, it, zh_CN, pl, hu
11 years ago
8a2266816d
make plugin names strong
11 years ago
36bc2967c2
fix highlight on vanilla, dont replaceState if url didnt change
11 years ago
1ba3acfd03
display ips to admins/users on profile
11 years ago
6545357969
fixing admin stylesheet + lavender minver
11 years ago
f5d1ba4231
closed #1113
11 years ago
8913de4ea8
dont add post-bar to each post
11 years ago
3c53ebb02e
better scrolling
11 years ago
23c20a2821
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
b658c68736
back doesnt work
11 years ago
4c21b23ea2
Merge branch 'master' of github.com:designcreateplay/NodeBB
11 years ago
a3855a47e5
check replaceState
11 years ago
5567378234
change hash take 2
11 years ago
7f11d78b82
Merge branch 'master' into less-is-moar
11 years ago
e3ec4e938a
Revert "update post has in address bar, #1126"
...
This reverts commit 4b1c8150d3
11 years ago
4b1c8150d3
update post has in address bar, #1126
11 years ago
14b298eda8
cleaned updateHeader
11 years ago
f39248c83b
closes #1123
11 years ago
53f1e4d3d4
dedicated stylesheet.css route for LESS compilation, no longer usin less-middleware for base theme...
11 years ago
7e5a7c53bd
changes to templates
11 years ago
156c0302c9
properly namespacing objects in templates
11 years ago
0777c96a55
dont highlight reverse infinite loaded posts
11 years ago
0da2839943
added the class for topic delete
11 years ago
3ed2d21eb6
fixed flag post, added highlight to scroll post
11 years ago
0f8ee3a671
added instructions class
11 years ago
7c49c32ad3
scroll fix
11 years ago
cd9bd91ab2
fixes double hashes in share links
11 years ago
acafa9095f
added footer widget area to topic.tpl
11 years ago
71ea01edb7
switching topics.thumb conditional back
11 years ago
a79ca2b135
clean up ENDIF conditional if object.value is undefined and is used in an ELSE block
11 years ago
1052165373
updated messages when toggling themes or plugins
11 years ago
2baa381917
plugins and themes now trigger a restart
11 years ago
4ef1d83acd
Merge branch 'master' into nodebb-loader
11 years ago
fd41d93bdb
took out if from the src
11 years ago
e3d01df6a2
closes #980
11 years ago
b8b83c2ec2
share buttons
11 years ago
f967407805
follow state clean up
11 years ago
649bcf49b4
one liner
11 years ago
b5c8158ad5
more cleanup
11 years ago
403de08d60
cleaned more
11 years ago
122d1ad82a
less is more
11 years ago
e35a54bea4
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
6c6c57f45f
closes #1108
11 years ago
a9f20a7791
More translation
11 years ago
8111b9e91f
Finally reviewed spanish transalation
...
I revised the spanish translation to something more serious and complete. There was a lot of wrong spelled words and some untranslated/bad translated words
11 years ago
8ef59adb4a
Actualización lenguaje español
...
The translation was very faulty with a lack of accents and some words untranslated
11 years ago
6e5a6b8784
upgraded categories to sorted set, score is the order set from acp, check if category topic exists before posting
11 years ago
d6d9776cde
added toPid to posts
11 years ago
7760a6b207
added restart button to ACP (!!)
11 years ago
a8c7b32a04
moved plugin alert to top
11 years ago
3f43ca0925
change on click
11 years ago
f57e293abb
plugin buttons indicate active state
11 years ago
cfe5b6aa4a
check if thumEl exists before trim
11 years ago
bae76ebd70
fixed the redis error when going to unread/recent if nextStart is missing
11 years ago
29ba015d69
fixed topic thumbs
11 years ago
f862d856fc
alright clearly, regex on fridays just don't happen for me. - fixed
11 years ago
027398f5ba
unreverting change
11 years ago
0c54afe576
reverting previous template fix
11 years ago
2ec6dd1d14
added filter:topic.thread_tools for creating custom admin functionality in topics view
11 years ago
6f7243f42f
fixed a bug running multiple blocks in one template on an empty array
11 years ago
32ac3d94d2
moved pin and lock out of .topic-title in popular/recent/unread
11 years ago
e9c7de951b
moved pin and lock out of .topic-title
11 years ago
c7fb34c23f
new client-side hooks: filter:categories.new_topic, action:categories.new_topic.loaded
11 years ago
15f19653c5
action:categories.loading and action.categories.loaded
11 years ago
7e767da73e
closes #1086 and #1085
11 years ago
5179fec986
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
a3191227de
closes #1080
11 years ago
f10bda49dc
Merge remote-tracking branch 'origin/master' into search_hooks
11 years ago
8cfa6e9d83
added panel container without header, closes #1081
11 years ago
86dd01154e
closes #1079
11 years ago
2ba11dce15
hiding search buttons and route when search is not configured
11 years ago
74b0da78f4
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
a92fb07f02
fixes multiple click handlers in admin users
11 years ago
d140fa33dd
fixing tab default + removing two calls to code.jquery.com
11 years ago
52781bb539
Merge remote-tracking branch 'origin/master' into Widgets
11 years ago
e28589bea8
added jumbotron, alert widgets + color picker for alert and panel
11 years ago
2131506d59
widgets - user friendly instructions
11 years ago
Baris Soner Usakli
Julian Lam
psychobunny
MrWaffle
medwards20x6
akhoury
Alejandro Del Rincón