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 |
Julian Lam
|
820cdf8a47
|
temporarily removing cronjob until upstream bugs are fixed -- resolved #1178
|
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
|
1dc63caf77
|
using views_dir config
|
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
|
50f83abf75
|
closes 1150
|
11 years ago |
|
psychobunny
|
6820e9e662
|
random jshinting expedition
|
11 years ago |
|
psychobunny
|
936e52a43f
|
require db
|
11 years ago |
|
psychobunny
|
4d598dcd63
|
moved process events out of webserver.js and into app.js
|
11 years ago |
|
Baris Soner Usakli
|
fb1313ec90
|
load config change
|
11 years ago |
|
Julian Lam
|
2088903358
|
added check to upgrade.upgrade
|
11 years ago |
|
psychobunny
|
e912ce038b
|
closes #1035
|
11 years ago |
Micheil Smith
|
74049dccb1
|
Added log message about where configuration is being loaded from
|
11 years ago |
|
Micheil Smith
|
0672c7276d
|
Fix nconf.file not really using config file
|
11 years ago |
|
Micheil Smith
|
ee0f9d2bbe
|
Rename themes_dir to themes_path for consistency with other configuration options
|
11 years ago |
|
Julian Lam
|
d933e81b37
|
fixed #1025
|
11 years ago |
|
Micheil Smith
|
a857d4cab0
|
Added logging on start up detailing where themes are being loaded from.
|
11 years ago |
|
Micheil Smith
|
8866de8b30
|
Improved logging at startup
|
11 years ago |
|
Micheil Smith
|
ceffd2e1e0
|
Remove warnings about themes being out of date
|
11 years ago |
|
Micheil Smith
|
691fde0a27
|
Added ability to change where themes are stored via themes_dir configuration option
themes_dir is resolved to be relative to the root of the NodeBB install.
|
11 years ago |
|
Micheil Smith
|
8cd1005a03
|
Reworked startup sequence to respect server.listen() failures and timings.
|
11 years ago |
|
Baris Soner Usakli
|
0afd4ffdda
|
app.js cleanup
|
11 years ago |
|
Baris Soner Usakli
|
2e786cc4d1
|
closes #873, removed global translator, templates and server objects
|
11 years ago |
akhoury
|
dcc6ec797e
|
removed use_proxy config, cleaned-up some comments and sneaked in a time log print on initialization, also, related to pull#820
|
11 years ago |
|
Baris Soner Usakli
|
b945dfc71d
|
closes #843
|
11 years ago |
|
Julian Lam
|
0c0ae6560a
|
re: #808 -- removed upgrade directives for v0.2.x branch, and added minSchemaDate check so that if you try to upgrade without doing all upgrades in a previous branch, it will abort.
|
11 years ago |
|
psychobunny
|
df53d836e5
|
fixed dependency check for cerulean
|
11 years ago |
|
Baris Soner Usakli
|
8bc0096b00
|
dont closed composer if callback isn't called
|
11 years ago |
|
Julian Lam
|
adb8f80b86
|
interim commit - removed calls to websockets.js, beginning porting to namespaced files
|
11 years ago |
|
psychobunny
|
b21a202142
|
my data went on a date and found out we have out of date data
|
11 years ago |
|
psychobunny
|
032d46465d
|
closes #551
|
11 years ago |
|
Baris Soner Usakli
|
dfc8aacbae
|
closes #735, removed create collection calls
|
11 years ago |
|
Julian Lam
|
71681b936f
|
fixed #731
|
11 years ago |
|
psychobunny
|
fda68bc5dd
|
added templates.setGlobal - allows you to add default template vars that are sent to all tpls upon parsing; added relative_path as global
|
11 years ago |
|
Baris Soner Usakli
|
d43f3cebc6
|
closes #707, closes #686
|
11 years ago |
|
Baris Soner Usakli
|
204913c63d
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
6c30437c47
|
closes #706, refactor admin image uploads, fixed gif uploads
|
11 years ago |
|
psychobunny
|
69e0aa338d
|
resolved some todo that's been in there for many months
|
11 years ago |
|
psychobunny
|
ccef51095a
|
fix typo
|
11 years ago |
|
psychobunny
|
4459d9d4e0
|
closes #551
|
11 years ago |
|
Baris Soner Usakli
|
bc8bb352a8
|
added stdout check to exec
|
11 years ago |
|
Baris Soner Usakli
|
d1d6605dcf
|
closes #501
|
11 years ago |
|
Baris Usakli
|
f861d44d55
|
updated upgrade script to use mongo or redis
|
11 years ago |
|
Baris Soner Usakli
|
6c70d37f1c
|
removed reds from app.js
|
11 years ago |
|
Baris Usakli
|
e862a1c4cc
|
added init method to database, progress made
|
11 years ago |
|
Baris Usakli
|
91d6f83de4
|
more mongo work
|
11 years ago |
|
Baris Usakli
|
c9308efbec
|
more work
|
11 years ago |
Dan Rowe
|
aed4e2792d
|
Minify socket.io js
potential solution for issues/569
|
11 years ago |
|
psychobunny
|
529c8acf6c
|
app.js: added --install alias for --setup
|
11 years ago |