Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Version 3.31 build 859 #75

Merged
merged 4 commits into from Sep 20, 2017
Merged

Version 3.31 build 859 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51f3bf6
Resetting to prerelease for 3.31+
wmaddisn Sep 20, 2017
96ba8e0
Build 859: Fix bug in install package
wmaddisn Sep 20, 2017
bb505bd
Merge branch 'development' of https://github.com/MesquiteProject/Mesq…
wmaddisn Sep 20, 2017
4aef83d
Build 859 - updating notices file
wmaddisn Sep 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/mesquite/Mesquite.java
View file
Open in desktop
Expand Up @@ -1774,7 +1774,7 @@ else if (checker.compare(this.getClass(), "Crashes with a NullPointerException",
logln("This will crash: " +mi.getValue());
}
else if (checker.compare(this.getClass(), "Checks for notices or installs at the location specified", null, commandName, "checkNotices")) {
noticeLocation = MesquiteString.queryString(containerOfModule(), "Notices Location", "Indicate URL to notices file to be checked. (For instance, for Mesquite the default notices file is at " + getHomePhoneNumber() + ")", noticeLocation);
noticeLocation = MesquiteString.queryString(containerOfModule(), "Notices Location", "Indicate URL to notices file to be checked. (For instance, for Mesquite the default notices file is at " + getHomePhoneNumber() + ")\n\nNote: There may be a delay as Mesquite waits for the response from the server.", noticeLocation);
PhoneHomeUtil.checkForNotices(noticeLocation);
PhoneHomeUtil.adHocRecord = null;
resetAllMenuBars();
Expand Down
2 changes: 1 addition & 1 deletion Source/mesquite/lib/MesquiteModule.java
View file
Open in desktop
Expand Up @@ -86,7 +86,7 @@ public final static String getBuildLetter() {
public final static int getBuildNumber() {
//as of 26 Dec 08, build naming changed from letter + number to just number. Accordingly j105 became 473, based on
// highest build numbers of d51+e81+g97+h66+i69+j105 + 3 for a, b, c
return 858;
return 859;
}
//0.95.80 14 Mar 01 - first beta release
//0.96 2 April 01 beta - second beta release
Expand Down
2 changes: 1 addition & 1 deletion Source/mesquite/lib/PhoneHomeUtil.java
View file
Open in desktop
Expand Up @@ -499,7 +499,7 @@ private static String handleMessages(boolean adHoc, String noticesFromHome, Mesq
int lastNotice = phoneHomeRecord.getLastNotice();
int lastVersionNoticed = phoneHomeRecord.getLastVersionNoticed();

String name = mmi.getName();
//String name = mmi.getName();

Element root = XMLUtil.getRootXMLElementFromString("mesquite",noticesFromHome);
if (root==null)
Expand Down
38 changes: 23 additions & 15 deletions noticesAndUpdates/notices.xml
View file
Open in desktop
@@ -1,101 +1,109 @@
<?xml version="1.0"?>
<mesquite>
<lastnoticeNumber>19</lastnoticeNumber>
<lastnoticeNumber>20</lastnoticeNumber>
<MessagesFromHome>
<version>1</version>
<currentReleaseVersion>
<versionString>3.31</versionString>
<build>858</build>
<build>859</build>
<version>331</version>
<downloadURL>http://mesquiteproject.wikispaces.com/Installation</downloadURL>
</currentReleaseVersion>
<notice>
<forVersion>331</forVersion>
<forBuildNumberExactly>858</forBuildNumberExactly>
<noticeNumber>21</noticeNumber>
<messageType>alert</messageType>
<message><![CDATA[A new build of this version Mesquite is available, to fix a bug in installing separate packages. You can download it
<a href = "http://github.com/MesquiteProject/MesquiteCore/releases">here</a>]]></message>
</notice>
<notice>
<forVersion>330</forVersion>
<noticeNumber>20</noticeNumber>
<noticeNumber>21</noticeNumber>
<messageType>alert</messageType>
<message><![CDATA[A new version of Mesquite is available, version 3.31, with various bug fixes. We urge that you update to the new version by downloading it from
<a href = "http://github.com/MesquiteProject/MesquiteCore/releases">here</a>]]></message>
</notice>
<notice>
<forVersion>320</forVersion>
<noticeNumber>20</noticeNumber>
<noticeNumber>21</noticeNumber>
<messageType>alert</messageType>
<message><![CDATA[A new version of Mesquite is available, version 3.31, with various bug fixes, performance improvements, and new features. We strongly urge that you update to the new version by downloading it from
<a href = "http://github.com/MesquiteProject/MesquiteCore/releases">here</a>]]></message>
</notice>
<notice>
<forVersion>311</forVersion>
<noticeNumber>20</noticeNumber>
<noticeNumber>21</noticeNumber>
<messageType>alert</messageType>
<message><![CDATA[A new version of Mesquite is available, version 3.31, with various bug fixes, performance improvements, and new features. We strongly urge that you update to the new version by downloading it from
<a href = "http://github.com/MesquiteProject/MesquiteCore/releases">here</a>]]></message>
</notice>
<notice>
<forVersion>310</forVersion>
<noticeNumber>20</noticeNumber>
<noticeNumber>21</noticeNumber>
<messageType>alert</messageType>
<message><![CDATA[Your version of Mesquite has bugs in how it writes codon positions of sequence matrices. There is an update available to solve this, version 3.31. We strongly urge that you update to a new version by downloading it from
<a href = "http://github.com/MesquiteProject/MesquiteCore/releases">here</a>]]></message>
</notice>
<notice>
<forVersion>304</forVersion>
<noticeNumber>20</noticeNumber>
<noticeNumber>21</noticeNumber>
<messageType>alert</messageType>
<message><![CDATA[You are using an old version of Mesquite. The current version is 3.31. We strongly urge that you update to a new version by downloading it from
<a href = "http://github.com/MesquiteProject/MesquiteCore/releases">here</a>]]></message>
</notice>
<notice>
<forVersion>303</forVersion>
<noticeNumber>20</noticeNumber>
<noticeNumber>21</noticeNumber>
<messageType>alert</messageType>
<message><![CDATA[You are using an old version of Mesquite. The current version is 3.31. We strongly urge that you update to a new version by downloading it from
<a href = "http://github.com/MesquiteProject/MesquiteCore/releases">here</a>]]></message>
</notice>
<notice>
<forVersion>302</forVersion>
<noticeNumber>20</noticeNumber>
<noticeNumber>21</noticeNumber>
<messageType>alert</messageType>
<message><![CDATA[You are using an old version of Mesquite. The current version is 3.31. We strongly urge that you update to a new version by downloading it from
<a href = "http://github.com/MesquiteProject/MesquiteCore/releases">here</a>]]></message>
</notice>
<notice>
<forVersion>301</forVersion>
<noticeNumber>20</noticeNumber>
<noticeNumber>21</noticeNumber>
<messageType>alert</messageType>
<message><![CDATA[You are using an old version of Mesquite. The current version is 3.31. We strongly urge that you update to a new version by downloading it from
<a href = "http://github.com/MesquiteProject/MesquiteCore/releases">here</a>]]></message>
</notice>
<notice>
<forVersion>300</forVersion>
<noticeNumber>20</noticeNumber>
<noticeNumber>21</noticeNumber>
<messageType>alert</messageType>
<message><![CDATA[You are using an <b>OLD</b> version of Mesquite. The current version is 3.31. We strongly urge that you update to a new version by downloading it from
<a href = "http://github.com/MesquiteProject/MesquiteCore/releases">here</a>]]></message>
</notice>
<notice>
<forVersion>273</forVersion>
<noticeNumber>20</noticeNumber>
<noticeNumber>21</noticeNumber>
<messageType>alert</messageType>
<message><![CDATA[You are using a <b>VERY OLD</b> version of Mesquite. The current version is 3.31. We strongly urge that you update to a new version by downloading it from
<a href = "http://github.com/MesquiteProject/MesquiteCore/releases">here</a>]]></message>
</notice>
<notice>
<forVersion>274</forVersion>
<noticeNumber>20</noticeNumber>
<noticeNumber>21</noticeNumber>
<messageType>alert</messageType>
<message><![CDATA[You are using a <b>VERY OLD</b> version of Mesquite. The current version is 3.31. We strongly urge that you update to a new version by downloading it from
<a href = "http://github.com/MesquiteProject/MesquiteCore/releases">here</a>]]></message>
</notice>
<notice>
<forVersion>275</forVersion>
<noticeNumber>20</noticeNumber>
<noticeNumber>21</noticeNumber>
<messageType>alert</messageType>
<message><![CDATA[You are using a <b>VERY VERY OLD</b> version of Mesquite. The current version is 3.31. We strongly urge that you update to a new version by downloading it from
<a href = "http://github.com/MesquiteProject/MesquiteCore/releases">here</a>]]></message>
</notice>
<notice>
<forVersion>201</forVersion>
<noticeNumber>20</noticeNumber>
<noticeNumber>21</noticeNumber>
<messageType>alert</messageType>
<message>This notice is to inform you that Mesquite now checks its web site for notices to users (such as this one) when it starts up. This should not cause a delay (if it does, please inform us). We anticipate notices will be given rarely, when there is an update available or an important bug to tell you about.</message>
</notice>
Expand Down