Unverified Commit 256d2b8c authored by mntmn's avatar mntmn Committed by GitHub
Browse files

Merge pull request #10 from spacedeck/importer

WIP Importer for spacedeck.com exports
Alternative (to S3) local file storage
Alternative mocked redis (run without redis for single process instances)
Experimental Docker support
parents 98779777 6d2d2310
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<p> <p>
<div class="col-xs-6"> <div class="col-xs-6">
<a href="/contact">[[ __("contact") ]]</a> <a href="/contact">[[ __("contact") ]]</a>
<span style="color:#888">&copy; 2011–2017 The Spacedeck Open Developers</span> <span style="color:#888">&copy; 2011–2018 The Spacedeck Open Developers <a href="https://github.com/spacedeck/spacedeck-open">https://github.com/spacedeck/spacedeck-open</a></span>
</div> </div>
</p> </p>
</div> </div>
......
...@@ -23,10 +23,18 @@ ...@@ -23,10 +23,18 @@
{% if process.env.NODE_ENV != "production" %} {% if process.env.NODE_ENV != "production" %}
var ENV = { var ENV = {
name: 'development', name: 'development',
webHost: "localhost:9000", webHost: "localhost:9666",
webEndpoint:"http://localhost:9000", webEndpoint:"http://localhost:9666",
apiEndpoint: "http://localhost:9000", apiEndpoint: "http://localhost:9666",
websocketsEndpoint: "ws://localhost:9000" websocketsEndpoint: "ws://localhost:9666"
};
{% else %}
var ENV = {
name: 'production',
webHost: location.host,
webEndpoint: location.origin,
apiEndpoint: location.origin,
websocketsEndpoint: location.origin.replace("https:","wss:").replace("http:","ws:")
}; };
{% endif %} {% endif %}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment