psychobunny
|
68b41083ad
|
removing re-added templates from core
|
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
|
b4b9ed1841
|
optimized getTopicsByTids, single db call to get topicData, added cache for privilege/category/user data
|
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
|
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 |
|
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 |
|
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 |
|
Baris Soner Usakli
|
976744480f
|
post summary change
|
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
|
8c11299197
|
template language fix
|
11 years ago |
|
psychobunny
|
48df0cf889
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
src/routes/admin.js
|
11 years ago |
|
Baris Soner Usakli
|
3c97ef6829
|
closes #1156
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
psychobunny
|
26853d024e
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
11 years ago |
|
Baris Soner Usakli
|
e75c303b89
|
added unique visitor count to admin dashboard
|
11 years ago |
|
psychobunny
|
0211b4484b
|
on cold load, only display page after widgets are rendered
|
11 years ago |
|
Baris Soner Usakli
|
091723a8c5
|
closes #1101
|
11 years ago |
|
Baris Soner Usakli
|
0682b5c5ea
|
fix admin users link
|
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
|
dcd3975933
|
closes #1135
|
11 years ago |
akhoury
|
3f1d5c6656
|
merge fork with upstream master
|
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 |
|
Baris Soner Usakli
|
56bbeb9950
|
use disableSocialButtons from config
|
11 years ago |
|
Baris Soner Usakli
|
ea6cf3bbd5
|
more cleanup and changes to topics
|
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 |
|
Baris Soner Usakli
|
8913de4ea8
|
dont add post-bar to each post
|
11 years ago |
|
Julian Lam
|
7f11d78b82
|
Merge branch 'master' into less-is-moar
|
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 |