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 |