Julian Lam
|
d33253bc3a
|
Merge remote-tracking branch 'origin/master'
|
11 years ago |
|
Julian Lam
|
0e44eb8629
|
final refactoring pass for groups -- #1252
|
11 years ago |
barisusakli
|
fa98da6978
|
related to #1250
|
11 years ago |
|
Julian Lam
|
d6b6e39f2a
|
Sardinian (sc) and Thai (th)
|
11 years ago |
|
barisusakli
|
c070808209
|
store postcontainer
|
11 years ago |
|
barisusakli
|
cabc3e5e3d
|
more cleanup
|
11 years ago |
|
barisusakli
|
9b63facf6f
|
more postTools refactor
|
11 years ago |
|
barisusakli
|
9dd0f3c9b9
|
some more
|
11 years ago |
|
barisusakli
|
363e7c23bd
|
postTools cleanup
|
11 years ago |
|
barisusakli
|
8ffaecaa4c
|
fixed paginator on entry, moved out postTools to a new file
|
11 years ago |
|
Julian Lam
|
4239c376c8
|
truncating user list in Groups ACP page, resolved #1132. Refactored system groups handling
|
11 years ago |
|
Julian Lam
|
ab5ec68f2f
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
da1a1d5930
|
adding callback to settings.load, and omitting password validation check on user creation if no password is entered (e.g. SSO login)
|
11 years ago |
|
barisusakli
|
f61ca4327d
|
fixed profile
|
11 years ago |
|
barisusakli
|
d2af4a6b69
|
user images wont be responsive in widgets
|
11 years ago |
|
barisusakli
|
0f66e80a5a
|
added setting to disable notification sounds
|
11 years ago |
|
Julian Lam
|
36e949acea
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
3308da64cb
|
updating language strings for it and nb
|
11 years ago |
|
barisusakli
|
45f0021503
|
moved follow to thread tools
|
11 years ago |
|
Julian Lam
|
2badb76fc2
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
61afee98c3
|
updates to new settings mechanism, updating markdown minver, minor linting for upgrades.js, and upgrade stmt for markdown migration
|
11 years ago |
|
barisusakli
|
e67e9aee42
|
moved user creation to new file
|
11 years ago |
|
barisusakli
|
3f23821580
|
moved topic moving and thread tools out of topic.js
|
11 years ago |
psychobunny
|
ef97f627f4
|
closes #1237
|
11 years ago |
|
barisusakli
|
10d8eed7b9
|
closes #1229
|
11 years ago |
|
psychobunny
|
da7d6a3137
|
closes #1175
|
11 years ago |
|
psychobunny
|
653007b72e
|
closes #1231
|
11 years ago |
|
psychobunny
|
99108c750a
|
don't refresh widgets on every new post
|
11 years ago |
|
psychobunny
|
e60b2f7716
|
closes #1174
|
11 years ago |
|
psychobunny
|
0627734fc0
|
trim leading whitespace/#/? in search closes #1195
|
11 years ago |
|
Julian Lam
|
16f1db4f5d
|
fireEvent reflection socket call, tweaks to Sounds page in ACP
|
11 years ago |
|
Julian Lam
|
14a0b45ae8
|
securing settings.save socket listeners behind admin namespace
|
11 years ago |
|
Julian Lam
|
c1ccc81400
|
ACP integration for Sounds
|
11 years ago |
|
Julian Lam
|
eeb3bdc7f7
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
barisusakli
|
4cadd8da7a
|
missing radix
|
11 years ago |
|
barisusakli
|
367a9aa022
|
composer jshint
|
11 years ago |
|
Julian Lam
|
17903adace
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
barisusakli
|
b4af4c72cc
|
alertSuccess can take language strings
|
11 years ago |
|
barisusakli
|
da8c2896d7
|
moved to showForkModal
|
11 years ago |
|
barisusakli
|
38d4fd1a59
|
took out forking to its own file
|
11 years ago |
|
Julian Lam
|
f942c03a58
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
barisusakli
|
1354739d19
|
user deletion #746
user deletion NOT SKALABLE
|
11 years ago |
|
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 |
|
Julian Lam
|
97a64122b4
|
updates to language files
|
11 years ago |
|
Julian Lam
|
66fd13be97
|
Merge branch 'master' of github.com:qk168899/NodeBB into qk168899-master
|
11 years ago |
sam
|
9c3c536ae8
|
fine tune zh-TW
|
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 |
|
Julian Lam
|
738ada9b16
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
816d9e5d12
|
minifying xregext lib
|
11 years ago |
|
psychobunny
|
fdb9b889ec
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
psychobunny
|
fb1ddc3d9b
|
minifying colorpicker.js
|
11 years ago |
|
Julian Lam
|
b525d95915
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
6aa8df1d24
|
removed unminified buzz library, keeping minified version
|
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 |
|
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 |