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

Merge branch 'develop'

Browse source
This commit is contained in:
Devin Howard 2016-04-13 10:53:46 +08:00
parent bd1e1ffe81 d2d67d5d6c
commit 031e35e50c
4 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,7 @@ Metamaps.panningInt = null;
Metamaps.tempNode = null;
Metamaps.tempInit = false;
Metamaps.tempNode2 = null;
Metamaps.VERSION = '<%= VERSION %>'
Metamaps.VERSION = '<%= METAMAPS_VERSION %>'
Metamaps.Settings = {
embed: false, // indicates that the app is on a page that is optimized for embedding in iFrames on other web pages

2
app/views/layouts/_lightboxes.html.erb
View file

@ -18,7 +18,7 @@
<div id="rightAboutParms">
<p>PRIVATE BETA</p>
<p><%= VERSION %></p>
<p><%= METAMAPS_VERSION %></p>
<p>Mar 26, 2016</p>
</div>
<div class="clearfloat">

2
app/views/layouts/_upperelements.html.erb
View file

@ -9,7 +9,7 @@
<!-- search box -->
<div class="sidebarSearch">
<input type="text" class="sidebarSearchField" placeholder="Search for topics, maps, and mappers..."></input>
<input type="text" class="sidebarSearchField" placeholder="Search for topics, maps, and mappers..." />
<div id="searchLoading"></div>
<div class="sidebarSearchIcon"></div>
<div class="clearfloat"></div>

2
config/initializers/version.rb
View file

@ -1 +1 @@
VERSION = '2.8.4'
METAMAPS_VERSION = '2.8.5'