glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #586 from metamaps/merge/master-into-develop

Browse source 
merge master into develop
This commit is contained in:
Devin Howard 2016-08-04 10:53:00 +08:00 committed by GitHub
parent 17a9a2d23a 6df8da16bc
commit 52cbd57367
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/src/Metamaps.js.erb
View file

@ -20,6 +20,7 @@ Metamaps.Erb['icons/wildcard.png'] = '<%= asset_path('icons/wildcard.png') %>'
Metamaps.Erb['topic_description_signifier.png'] = '<%= asset_path('topic_description_signifier.png') %>'
Metamaps.Erb['topic_link_signifier.png'] = '<%= asset_path('topic_link_signifier.png') %>'
Metamaps.Erb['synapse16.png'] = '<%= asset_path('synapse16.png') %>'
Metamaps.Metacodes = <%= Metacode.all.to_json.gsub(%r[(icon.*?)(\"},)], '\1?purple=stupid\2').html_safe %>
Metamaps.Settings = {
embed: false, // indicates that the app is on a page that is optimized for embedding in iFrames on other web pages

1
app/views/layouts/_foot.html.erb
View file

@ -7,7 +7,6 @@
<% else %>
Metamaps.Active.Mapper = null;
<% end %>
Metamaps.Metacodes = <%= Metacode.all.to_json.html_safe %>;
Metamaps.Loading = {
loader: new CanvasLoader('loading'),

3
doc/production/first-deploy.md
View file

@ -69,8 +69,7 @@ Run this in the metamaps directory, still as metamaps:
#### Nginx and SSL
Now set up nginx - config stored on Linode, including relevant
environment variables.
Now set up nginx - config stored on Linode, including relevant environment variables.
Get an SSL certificate and encrypt it for the realtime video.