Skip to content

Commit

Permalink
Merge commit '43e7ac9' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
chrqls committed Apr 17, 2014
2 parents ec15591 + 43e7ac9 commit ef11ae4
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"Fish - RIP",
"Benny - RIP",
"[email protected]"],
"version": "1.0.5",
"version": "1.0.6",
"private": false,
"dependencies": {
"request": "2.2.5",
Expand Down
Binary file removed static/apps/SMILETeacher-0.9.9b2-jamsj.apk
Binary file not shown.
Binary file removed static/apps/SMILETeacher-0.9.9b3-jamsj.apk
Binary file not shown.
Binary file added static/apps/SMILETeacher-0.9.9b4-jamsj.apk
Binary file not shown.
6 changes: 3 additions & 3 deletions static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<!-- Set the viewport width to device width for mobile -->
<meta name="viewport" content="width=device-width"/>

<title>Welcome to The SMILE Plug (server v1.0.5)</title>
<title>Welcome to The SMILE Plug (server v1.0.6)</title>

<!-- Included CSS Files -->
<!-- Combine and Compress These CSS Files -->
Expand Down Expand Up @@ -55,8 +55,8 @@ <h3>Downloads</h3>
<div class="panel">
<h3>SMILE Teacher Apps</h3>

<p><a class="success button" href="/apps/SMILETeacher-0.9.9b3-jamsj.apk">SMILE Teacher for Android -
0.9.9b3-jamsj (OUTDATED)</a></p>
<p><a class="success button" href="/apps/SMILETeacher-0.9.9b4-jamsj.apk">SMILE Teacher for Android -
0.9.9b4-jamsj </a></p>
<p><a class="success button" href="/smile-iqmanager.html">IQManager Web App 1.0.4 - Manage inquiry session data</a></p>
</div>
<div class="panel">
Expand Down
6 changes: 3 additions & 3 deletions static/js/smilestudent.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ var SMILEROUTES = {
"getresults": "/smile/student/%s/result"
};

var VERSION = '1.0.4';
var VERSION = '1.0.5';

//
// 1 - login screen
Expand Down Expand Up @@ -648,10 +648,10 @@ function doSMSG() {

// console.log(data); // XXX Remove debug
if (msg === "START_MAKE") {

if (SMILESTATE == 5) {
statechange(5, 3);
}
}
else if (SMILESTATE !== 3) {
statechange(2, 3);
}
Expand Down

0 comments on commit ef11ae4

Please sign in to comment.