Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dev
Browse files Browse the repository at this point in the history
* origin/master:
  refs #47 Clean up the main readme.md
  refs #47 Bump release version to 0.3.2 and tag release.
  refs #26, #39 Fix the question layout, use <p> instead of <h4> which is block visibility.  I may change this later because it looks nicer, but need to deal with the case where lines wrap past the end.  Shouldn't happen in practice.
  refs #26, #39 Fix a number of new foundation 4 and general layout problems.  Add reveal.js as this actually handles semi-normal layout. I'm a bit confused at how we are treating the data in #iq-area, but can work it out later.
  refs #26, #39 Was missing a div needed to display the "waiting to start making questions".  Clean up some harmless js.
  refs #26, #39, #38 Undo the lint fixes ....
  refs #26, #39, #38 Take care of the majority of the lint errors, we'll leave the redefs and comma errors.
  refs #26, #39 Fix login state transition, all a result of foundation 4 getting rid of "tabs" in favor of html5 flavored sections.
  refs #26 #39 Add updated blockui version, add section.js from foundation, and fixed smilestudent.js issues with the tab handling.  Also, get tabs working.
  refs #26 Fix the columns, use <size>-# .  Not <# spelled out>.
  refs #26 Initial upgrade to foundation 4.3.2.
  • Loading branch information
truedat101 committed Oct 23, 2013
2 parents 6805671 + a23a361 commit fdcb197
Show file tree
Hide file tree
Showing 36 changed files with 23,149 additions and 12,321 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ lint:
$(JSLINT) lib/smile/question.js
$(JSLINT) lib/smile/student.js
$(JSLINT) tests/functional/csv.test.js
$(JSLINT) static/js/smilestudent.js

test:
@echo "\n == Run All tests minus nada tests=="
Expand Down
11 changes: 7 additions & 4 deletions README.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
== Application ==
Application
===========

* Pre-requisites:
- NodeJS >= 0.8.16
- NPM >= 1.0

* Run application
$ node smileplug.js
$ sudo node smileplug.js (sudo only if you run on port 80)

== Bundled Client Applications ==
Bundled Client Applications
===========================

* SMILE Student for Android 2.1.9
* SMILE Teacher for Android 0.2.9
* SMILE Teacher for Java 0.5
* Plugmin 0.5.1 for Android

== Tests =
Tests
=====

* Install test dependencies:
$ npm install -d
Expand Down
3 changes: 2 additions & 1 deletion routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -403,9 +403,10 @@ exports.handlePushMessage = function(req, res) {
var message = req.body;
game.registerMessage(message);
var type = message.TYPE || null;
if (type.indexOf("RE_TAKE") != -1) {
if (type.indexOf("RE_TAKE") != -1) { // XXX What the heck is this?
type = 'RE_TAKE';
}
// console.log(message);
var error = null;
switch (type) {
case null:
Expand Down
2 changes: 1 addition & 1 deletion smileplug.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ var starttime = (new Date()).getTime();
js.CONFIG = {
'PORT' : process.env.PORT || 80,
'HOST' : '0.0.0.0',
'VERSION_TAG' : '0.3.1',
'VERSION_TAG' : '0.3.2',
'VERSION_DESCRIPTION' : 'SMILE Server',
};

Expand Down
2 changes: 0 additions & 2 deletions static/css/app.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* Artfully masterminded by ZURB */

/* --------------------------------------------------
Table of Contents
-----------------------------------------------------
Expand Down
Loading

0 comments on commit fdcb197

Please sign in to comment.