Skip to content

Commit

Permalink
1.1.0-beta1 version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
mtigas committed Mar 31, 2016
1 parent e4653d2 commit 6fe481d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<property name="build.dir" value="build"/>
<property name="mac.dir" value="${build.dir}/mac" />
<property name="windows.dir" value="${build.dir}/windows" />
<property name="full_version" value="1.0.999.0"/>
<property name="full_version" value="1.1.0.160330"/>
<property name="launch4j.dir" location="${build.dir}/../launch4j" />
<property name="launch4j.bindir" location="${build.dir}/../launch4j/bin" />

Expand All @@ -17,7 +17,7 @@
<mkdir dir="${mac.dir}"/>

<!-- this must be a real JDK -->
<property name="java_home" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_60.jdk/Contents/Home"/>
<property name="java_home" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_77.jdk/Contents/Home"/>

<taskdef
name="bundleapp"
Expand Down Expand Up @@ -55,12 +55,12 @@
[3]: https://developer.apple.com/account/mac/certificate/certificateList.action
-->
<exec executable="codesign" os="Mac OS X">
<!-- <arg line="-f -s 'Developer ID Application: Mike Tigas (68QUP6KP2C)' ${build.dir}/mac/Tabula.app/Contents/PlugIns/jdk1.8.0_60.jdk" /> -->
<arg line="-f -s 'Tabula' ${build.dir}/mac/Tabula.app/Contents/PlugIns/jdk1.8.0_60.jdk" />
<!-- <arg line="-f -s 'Developer ID Application: Mike Tigas (68QUP6KP2C)' ${build.dir}/mac/Tabula.app/Contents/PlugIns/jdk1.8.0_77.jdk" /> -->
<arg line="-f -s 'Tabula' ${build.dir}/mac/Tabula.app/Contents/PlugIns/jdk1.8.0_77.jdk" />
</exec>
<exec executable="codesign" os="Mac OS X">
<!-- <arg line="-f -s 'Developer ID Application: Mike Tigas (68QUP6KP2C)' ${build.dir}/mac/Tabula.app" /> -->
<arg line="-f -s 'Tabula' ${build.dir}/mac/Tabula.app" />
<arg line="-f -s 'Tabula' ${build.dir}/mac/Tabula.app" />
</exec>
</target>

Expand Down
8 changes: 4 additions & 4 deletions webapp/static/js/tabula.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var Tabula;
window.Tabula = Tabula || {};
$.ajaxSetup({ cache: false }); // fixes a dumb issue where Internet Explorer caches Ajax requests. See https://github.com/tabulapdf/tabula/issues/408

Tabula.UI_VERSION = "1.0.0-2015-08-05" // when we make releases, we should remember to up this.
Tabula.UI_VERSION = "1.1.0-2016-03-30" // when we make releases, we should remember to up this.
// Add '-pre' to the end of this for a prerelease version; this will let
// our "new version" check give you that channel.

Expand Down Expand Up @@ -123,7 +123,7 @@ Tabula.getNotifications = function(){
}
);
$.ajax({
url: 'http://tabula.jeremybmerrill.com/tabula/notifications.jsonp',
url: 'http://tabula.jeremybmerrill.com/tabula/notifications.jsonp',
dataType: "jsonp",
jsonpCallback: 'notifications',
success: function(data){
Expand All @@ -132,10 +132,10 @@ Tabula.getNotifications = function(){
// find the first listed notification where today is between its `live_date` and `expires_date`
// and within the `versions` list.
// we might use this for, say, notifying users if a version urgently needs an update or something
//
//
var notifications = $.grep(data, function(d){
var today = new Date();
if ( (d.expires_date && (new Date(d.expires_date) < today)) || (d.live_date && (new Date(d.live_date) > today)) ){
if ( (d.expires_date && (new Date(d.expires_date) < today)) || (d.live_date && (new Date(d.live_date) > today)) ){
return false;
}
if( d.versions && d.versions.length > 0){
Expand Down

0 comments on commit 6fe481d

Please sign in to comment.