renaming folders to new naming convention Library-Technology-Technology-why
sqashing commits from dec - feb

commit f6d1b1877efca566bd3d837d4e11465cbffc4493
Author: cesine <cesine@yahoo.com>
Date:   Tue Feb 19 23:12:21 2013 -0500

    made the port which touchdb listens to configurable

 OPrime-Android-HTML5-Offline/src/ca/ilanguage/oprime/offline/activity/HTML5ReplicatingActivity.java      | 50 +++++++++++++++++++++++++++++++++++---------------
 OPrime-Android-HTML5-Offline/src/ca/ilanguage/oprime/offline/content/ReplicatingJavaScriptInterface.java |  9 +++++++--
 2 files changed, 42 insertions(+), 17 deletions(-)

commit dcde5af63edba6da0180edc68c17178ff46a31bf
Author: cesine <cesine@yahoo.com>
Date:   Tue Feb 19 23:11:34 2013 -0500

    formating

 OPrime-Android/src/ca/ilanguage/oprime/activity/HTML5Activity.java | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------
 1 file changed, 79 insertions(+), 52 deletions(-)

commit cacc1733e29076a4ed6ec66031a3525b4dbf24fd
Author: cesine <cesine@yahoo.com>
Date:   Tue Feb 19 23:09:59 2013 -0500

    formatting

 OPrime-HTML5/samples/index.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit 776e8533b17b0fb266014d6a58734b058d604c20
Author: cesine <cesine@yahoo.com>
Date:   Sun Feb 17 23:14:53 2013 -0500

    adding directives for stimuli and bringing info out of experimental design in window

 OPrime-HTML5/client/js/experiment/controllers/OPrimeExperimentController.js |  1 +
 OPrime-HTML5/client/js/experiment/directives/ExperimentDirectives.js        | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------------
 OPrime-HTML5/client/js/oprime_module_definition.js                          |  3 ++-
 OPrime-HTML5/client/js/stimulus/StimulusDirectives.js                       | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 102 insertions(+), 15 deletions(-)

Author: cesine <cesine@yahoo.com>
Date:   Sun Feb 17 16:58:43 2013 -0500

    moving files around and set up a build and minificaiton step for #11

 .gitignore                                                                           |     2 +
 OPrime-HTML5/build/css/oprime.css                                                    |   145 +
 OPrime-HTML5/build/css/spinner.css                                                   |     6 +
 OPrime-HTML5/build/images/loader.gif                                                 |   Bin 0 -> 3897 bytes
 OPrime-HTML5/build/js/oprime.js                                                      |   746 +++
 OPrime-HTML5/client/css/oprime.css                                                   |   166 +-
 OPrime-HTML5/client/css/spinner.css                                                  |     6 +
 OPrime-HTML5/client/images/loader.gif                                                |   Bin 0 -> 3897 bytes
 OPrime-HTML5/client/js/authentication/AuthenticationServices.js                      |   112 +
 OPrime-HTML5/client/js/authentication/UserServices.js                                |    65 +
 OPrime-HTML5/client/js/authentication/VisitorServices.js                             |   233 +
 OPrime-HTML5/client/js/dataviz/bubbles/menu.css                                      |    85 +
 OPrime-HTML5/client/js/dataviz/bubbles/menu.js                                       |   556 ++
 OPrime-HTML5/client/js/dataviz/touch/touch_response_visualizer.js                    |   748 +++
 OPrime-HTML5/client/js/experiment/README.md                                          |     2 +
 OPrime-HTML5/client/js/experiment/controllers/OPrimeController.js                    |    12 +
 OPrime-HTML5/client/js/experiment/controllers/OPrimeExperimentCompletedController.js |    12 +
 OPrime-HTML5/client/js/experiment/controllers/OPrimeExperimentController.js          |    12 +
 OPrime-HTML5/client/js/experiment/controllers/OPrimeMenuController.js                |    16 +
 OPrime-HTML5/client/js/experiment/controllers/OPrimeTutorialController.js            |    20 +
 OPrime-HTML5/client/js/experiment/directives/ExperimentDirectives.js                 |    79 +
 OPrime-HTML5/client/js/experiment/menu.css                                           |    85 -
 OPrime-HTML5/client/js/experiment/menu.js                                            |   556 --
 OPrime-HTML5/client/js/experiment/partials/main_menu.html                            |    10 +
 OPrime-HTML5/client/js/experiment/partials/session_report.html                       |   142 +
 OPrime-HTML5/client/js/experiment/services/ExperimenterServices.js                   |   103 +
 OPrime-HTML5/client/js/import/ImportFromCSV.js                                       |   185 +
 OPrime-HTML5/client/js/oprime.js                                                     |    46 +
 OPrime-HTML5/client/js/oprime/ImportFromCSV.js                                       |   185 -
 OPrime-HTML5/client/js/oprime/OPrime.js                                              |    15 -
 OPrime-HTML5/client/js/oprime/controllers/NotificationsController.js                 |    30 +
 OPrime-HTML5/client/js/oprime/controllers/SpinnerController.js                       |     5 +
 OPrime-HTML5/client/js/oprime/partials/loading.html                                  |     6 +
 OPrime-HTML5/client/js/oprime/partials/notifications.html                            |    14 +
 OPrime-HTML5/client/js/oprime/services/AuthenticationServices.js                     |    40 -
 OPrime-HTML5/client/js/oprime/services/CouchDB.js                                    |   198 +-
 OPrime-HTML5/client/js/oprime/services/EncryptionServices.js                         |    33 +
 OPrime-HTML5/client/js/oprime/services/HttpInterceptor.js                            |    38 +
 OPrime-HTML5/client/js/oprime/services/LocaleService.js                              |    77 +
 OPrime-HTML5/client/js/oprime_build_config.js                                        |    25 +
 OPrime-HTML5/client/js/oprime_module_definition.js                                   |    41 +
 OPrime-HTML5/client/js/participant/ParticipantFactory.js                             |    54 +
 OPrime-HTML5/client/js/participant/partials/child.html                               |    13 +
 OPrime-HTML5/client/js/participant/partials/register.html                            |   140 +
 OPrime-HTML5/client/js/report/ReportDirective.js                                     |    13 +
 OPrime-HTML5/client/js/report/partials/child_report.html                             |    73 +
 OPrime-HTML5/client/js/report/partials/norms.html                                    |     1 +
 OPrime-HTML5/client/js/report/partials/organization_report.html                      |    88 +
 OPrime-HTML5/client/js/report/partials/parents_report.html                           |    83 +
 OPrime-HTML5/client/js/report/partials/participant_report.html                       |   214 +
 OPrime-HTML5/client/js/report/partials/reports.html                                  |    88 +
 OPrime-HTML5/client/js/report/partials/results_main.html                             |    68 +
 OPrime-HTML5/client/js/report/partials/sails.html                                    |     7 +
 OPrime-HTML5/client/js/report/partials/search_results.html                           |    68 +
 OPrime-HTML5/client/js/touch/touch_response_visualizer.js                            |   748 ---
 OPrime-HTML5/client/libs/angular-ui/angular-ui.css                                   |    50 +
 OPrime-HTML5/client/libs/angular-ui/angular-ui.js                                    |  1461 +++++
 OPrime-HTML5/client/libs/angular-ui/bootstrap-responsive.css                         |  1091 ++++
 OPrime-HTML5/client/libs/angular-ui/bootstrap.css                                    |  5893 ++++++++++++++++++++
 OPrime-HTML5/client/libs/angular-ui/ui-bootstrap-templates.js                        |  1430 +++++
 OPrime-HTML5/client/libs/angular-ui/ui-bootstrap.js                                  |  1318 +++++
 OPrime-HTML5/client/libs/angular/angular-bootstrap-prettify.js                       |  1833 ++++++
 OPrime-HTML5/client/libs/angular/angular-bootstrap.js                                |   166 +
 OPrime-HTML5/client/libs/angular/angular-cookies.js                                  |   171 +
 OPrime-HTML5/client/libs/angular/angular-loader.js                                   |   276 +
 OPrime-HTML5/client/libs/angular/angular-mocks.js                                    |  1764 ++++++
 OPrime-HTML5/client/libs/angular/angular-resource.js                                 |   445 ++
 OPrime-HTML5/client/libs/angular/angular-sanitize.js                                 |   535 ++
 OPrime-HTML5/client/libs/angular/angular-scenario.js                                 | 26066 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 OPrime-HTML5/client/libs/angular/angular.js                                          | 14604 ++++++++++++++++++++++++++++++++++++++++++++++++
 OPrime-HTML5/client/libs/font_awesome/FontAwesome.ttf                                |   Bin 0 -> 23156 bytes
 OPrime-HTML5/client/libs/font_awesome/font-awesome.css                               |   471 ++
 OPrime-HTML5/client/libs/font_awesome/fontawesome-webfont.ttf                        |   Bin 0 -> 60296 bytes
 OPrime-HTML5/client/libs/jquery.js                                                   |  9597 ++++++++++++++++++++++++++++++++
 OPrime-HTML5/client/libs/require.js                                                  |  2000 +++++++
 OPrime-HTML5/client/libs/underscore.js                                               |  1226 ++++
77 files changed, 75160 insertions(+), 1771 deletions(-)

commit 1006fe220ec7d7b3156b06f0d66c0471eeaa98b1
Merge: daf4632 2838820
Author: cesine <cesine@yahoo.com>
Date:   Fri Feb 15 16:15:24 2013 -0500

    merging

commit daf4632d0fc90c250c80034c09c68e1ee06c7d9d
Author: cesine <cesine@yahoo.com>
Date:   Fri Feb 15 16:13:42 2013 -0500

    moving around the files

 OPrime-HTML5/client/fonts/WaitingfortheSunrise.ttf                                                                 |   Bin 59240 -> 0 bytes
 OPrime-HTML5/client/index.html                                                                                     |   236 -
 OPrime-HTML5/client/js/experiment/menu.css                                                                         |    85 +
 OPrime-HTML5/client/js/experiment/menu.js                                                                          |   556 +++
 OPrime-HTML5/client/js/oprime/ImportFromCSV.js                                                                     |   185 +
 OPrime-HTML5/client/js/oprime/OPrime.js                                                                            |   509 +++
 OPrime-HTML5/client/js/oprime/Scorer.js                                                                            |  1420 ++++++
 OPrime-HTML5/client/js/oprime/filters/OPrimeFilters.js                                                             |    11 +
 OPrime-HTML5/client/js/oprime/services/AuthenticationServices.js                                                   |    40 +
 OPrime-HTML5/client/js/oprime/services/CouchDB.js                                                                  |    78 +
 OPrime-HTML5/client/js/oprime/services/EncryptionServices.js                                                       |    40 +
 OPrime-HTML5/client/js/oprime/services/PubSub.js                                                                   |    34 +
 OPrime-HTML5/client/js/touch/touch_response_visualizer.js                                                          |   748 ++++
 OPrime-HTML5/client/libs/bootstrap/css/bootstrap-responsive.css                                                    |  1088 -----
 OPrime-HTML5/client/libs/bootstrap/css/bootstrap-responsive.min.css                                                |     9 -
 OPrime-HTML5/client/libs/bootstrap/css/bootstrap.css                                                               |  5893 -------------------------
 OPrime-HTML5/client/libs/bootstrap/css/bootstrap.min.css                                                           |     9 -
 OPrime-HTML5/client/libs/bootstrap/img/glyphicons-halflings-white.png                                              |   Bin 8777 -> 0 bytes
 OPrime-HTML5/client/libs/bootstrap/img/glyphicons-halflings.png                                                    |   Bin 12799 -> 0 bytes
 OPrime-HTML5/client/libs/bootstrap/js/bootstrap.js                                                                 |  2025 ---------
 OPrime-HTML5/client/libs/bootstrap/js/bootstrap.min.js                                                             |     6 -
 OPrime-HTML5/client/libs/hack.js                                                                                   |    55 -
 OPrime-HTML5/client/libs/imagegallery/MooFlow.css                                                                  |   106 -
 OPrime-HTML5/client/libs/imagegallery/MooFlow.js                                                                   |   433 --
 OPrime-HTML5/client/libs/imagegallery/mootools-1.2-core.js                                                         |   341 --
 OPrime-HTML5/client/libs/imagegallery/mootools-1.2-more.js                                                         |   153 -
 OPrime-HTML5/client/libs/imagegallery/mootools-more-1.4.0.1.js                                                     |    37 -
 OPrime-HTML5/client/libs/imagegallery/mootools-more.js                                                             | 13373 --------------------------------------------------------
 OPrime-HTML5/client/libs/imagegallery/mootools.js                                                                  |  6447 ---------------------------
 OPrime-HTML5/client/libs/imagegallery/skin/ajax_loader.gif                                                         |   Bin 1989 -> 0 bytes
 OPrime-HTML5/client/libs/imagegallery/skin/left-slider.gif                                                         |   Bin 302 -> 0 bytes
 OPrime-HTML5/client/libs/imagegallery/skin/left.gif                                                                |   Bin 644 -> 0 bytes
 OPrime-HTML5/client/libs/imagegallery/skin/middle-slider.gif                                                       |   Bin 684 -> 0 bytes
 OPrime-HTML5/client/libs/imagegallery/skin/middle.gif                                                              |   Bin 60 -> 0 bytes
 OPrime-HTML5/client/libs/imagegallery/skin/play.gif                                                                |   Bin 1219 -> 0 bytes
 OPrime-HTML5/client/libs/imagegallery/skin/resize.gif                                                              |   Bin 936 -> 0 bytes
 OPrime-HTML5/client/libs/imagegallery/skin/right.gif                                                               |   Bin 639 -> 0 bytes
 OPrime-HTML5/client/libs/imagegallery/skin/stop.gif                                                                |   Bin 731 -> 0 bytes
 OPrime-HTML5/client/libs/imagegallery/styles.css                                                                   |    79 -
 OPrime-HTML5/client/libs/jquery.js                                                                                 |     2 -
 OPrime-HTML5/client/manifest.json                                                                                  |    20 -
 OPrime-HTML5/client/modules/experiment/menu.css                                                                    |    85 -
 OPrime-HTML5/client/modules/experiment/menu.js                                                                     |   556 ---
 OPrime-HTML5/client/modules/oprime/ImportFromCSV.js                                                                |   185 -
 OPrime-HTML5/client/modules/oprime/OPrime.js                                                                       |   509 ---
 OPrime-HTML5/client/modules/oprime/Scorer.js                                                                       |  1420 ------
 OPrime-HTML5/client/modules/oprime/filters/OPrimeFilters.js                                                        |    11 -
 OPrime-HTML5/client/modules/oprime/services/AuthenticationServices.js                                              |    40 -
 OPrime-HTML5/client/modules/oprime/services/CouchDB.js                                                             |    78 -
 OPrime-HTML5/client/modules/oprime/services/EncryptionServices.js                                                  |    40 -
 OPrime-HTML5/client/modules/oprime/services/PubSub.js                                                              |    34 -
 OPrime-HTML5/client/modules/touch/touch_response_visualizer.js                                                     |   748 ----
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/all.json                                             |   251 --
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/bash.sh                                              |    88 -
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/bashimages.sh                                        |    88 -
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/en06_Verbal_Auditory_Discrimination.json             |    10 -
OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/index.html                                           |    82 -
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/sample-touch-responses.json                          |  3304 --------------
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/stimuliimages.json                                   |    78 -
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/touch-responses.json                                 |  3304 --------------
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/touch_response_visualizer.html                       |    63 -
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/touch_response_visualizer.js                         |   748 ----
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/touch_visualizer.css                                 |    17 -
 .../results_samples/bilingualaphasiatest_v2.0/1NN1AA_en_US28_Reading_Comprehension_for_Words-2012-12-05_09_53.json |     1 -
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v2.0/json2csv.html                                        |    40 -
 OPrime-HTML5/client/touch_response_visualizer.html                                                                 |    59 -
 OPrime-HTML5/client/upload.html                                                                                    |    21 -
 OPrime-HTML5/samples/DragAndDropDataCrunching/upload.html                                                          |    21 +
 OPrime-HTML5/samples/TouchVisualizer/touch_response_visualizer.html                                                |    59 +
 OPrime-HTML5/samples/bilingualaphasiatest_v1.0/all.json                                                            |   251 ++
 OPrime-HTML5/samples/bilingualaphasiatest_v1.0/bash.sh                                                             |    88 +
 OPrime-HTML5/samples/bilingualaphasiatest_v1.0/bashimages.sh                                                       |    88 +
 OPrime-HTML5/samples/bilingualaphasiatest_v1.0/en06_Verbal_Auditory_Discrimination.json                            |    10 +
OPrime-HTML5/samples/bilingualaphasiatest_v1.0/index.html                                                          |    82 +
 OPrime-HTML5/samples/bilingualaphasiatest_v1.0/sample-touch-responses.json                                         |  3304 ++++++++++++++
 OPrime-HTML5/samples/bilingualaphasiatest_v1.0/stimuliimages.json                                                  |    78 +
 OPrime-HTML5/samples/bilingualaphasiatest_v1.0/touch-responses.json                                                |  3304 ++++++++++++++
 OPrime-HTML5/samples/bilingualaphasiatest_v1.0/touch_response_visualizer.html                                      |    63 +
 OPrime-HTML5/samples/bilingualaphasiatest_v1.0/touch_response_visualizer.js                                        |   748 ++++
 OPrime-HTML5/samples/bilingualaphasiatest_v1.0/touch_visualizer.css                                                |    17 +
 .../samples/bilingualaphasiatest_v2.0/1NN1AA_en_US28_Reading_Comprehension_for_Words-2012-12-05_09_53.json         |     1 +
 OPrime-HTML5/samples/bilingualaphasiatest_v2.0/json2csv.html                                                       |    40 +
 OPrime-HTML5/samples/fonts/WaitingfortheSunrise.ttf                                                                |   Bin 0 -> 59240 bytes
 OPrime-HTML5/samples/index.html                                                                                    |   236 +
 OPrime-HTML5/samples/libs/bootstrap/css/bootstrap-responsive.css                                                   |  1088 +++++
 OPrime-HTML5/samples/libs/bootstrap/css/bootstrap-responsive.min.css                                               |     9 +
 OPrime-HTML5/samples/libs/bootstrap/css/bootstrap.css                                                              |  5893 +++++++++++++++++++++++++
 OPrime-HTML5/samples/libs/bootstrap/css/bootstrap.min.css                                                          |     9 +
 OPrime-HTML5/samples/libs/bootstrap/img/glyphicons-halflings-white.png                                             |   Bin 0 -> 8777 bytes
 OPrime-HTML5/samples/libs/bootstrap/img/glyphicons-halflings.png                                                   |   Bin 0 -> 12799 bytes
 OPrime-HTML5/samples/libs/bootstrap/js/bootstrap.js                                                                |  2025 +++++++++
 OPrime-HTML5/samples/libs/bootstrap/js/bootstrap.min.js                                                            |     6 +
 OPrime-HTML5/samples/libs/hack.js                                                                                  |    55 +
 OPrime-HTML5/samples/libs/imagegallery/MooFlow.css                                                                 |   106 +
 OPrime-HTML5/samples/libs/imagegallery/MooFlow.js                                                                  |   433 ++
 OPrime-HTML5/samples/libs/imagegallery/mootools-1.2-core.js                                                        |   341 ++
 OPrime-HTML5/samples/libs/imagegallery/mootools-1.2-more.js                                                        |   153 +
 OPrime-HTML5/samples/libs/imagegallery/mootools-more-1.4.0.1.js                                                    |    37 +
 OPrime-HTML5/samples/libs/imagegallery/mootools-more.js                                                            | 13373 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 OPrime-HTML5/samples/libs/imagegallery/mootools.js                                                                 |  6447 +++++++++++++++++++++++++++
 OPrime-HTML5/samples/libs/imagegallery/skin/ajax_loader.gif                                                        |   Bin 0 -> 1989 bytes
 OPrime-HTML5/samples/libs/imagegallery/skin/left-slider.gif                                                        |   Bin 0 -> 302 bytes
 OPrime-HTML5/samples/libs/imagegallery/skin/left.gif                                                               |   Bin 0 -> 644 bytes
 OPrime-HTML5/samples/libs/imagegallery/skin/middle-slider.gif                                                      |   Bin 0 -> 684 bytes
 OPrime-HTML5/samples/libs/imagegallery/skin/middle.gif                                                             |   Bin 0 -> 60 bytes
 OPrime-HTML5/samples/libs/imagegallery/skin/play.gif                                                               |   Bin 0 -> 1219 bytes
 OPrime-HTML5/samples/libs/imagegallery/skin/resize.gif                                                             |   Bin 0 -> 936 bytes
 OPrime-HTML5/samples/libs/imagegallery/skin/right.gif                                                              |   Bin 0 -> 639 bytes
 OPrime-HTML5/samples/libs/imagegallery/skin/stop.gif                                                               |   Bin 0 -> 731 bytes
 OPrime-HTML5/samples/libs/imagegallery/styles.css                                                                  |    79 +
 OPrime-HTML5/samples/libs/jquery.js                                                                                |     2 +
 OPrime-HTML5/samples/manifest.json                                                                                 |    20 +
 OPrime-HTML5/samples/oprime.css                                                                                    |   125 +
 563 files changed, 42297 insertions(+), 42172 deletions(-)

commit 283882009a65067f6f7472dd4db4a0b9c9b93063
Author: trisapeace <trisapeace@gmail.com>
Date:   Fri Feb 15 10:30:18 2013 -0500

    The TakePicture activity now takes an extra to specify max picture size (in KB).

    Code taken from http://stackoverflow.com/questions/477572/android-strange-out-of-memory-issue-while-loading-an-image-to-a-bitmap-object/823966#answer-3549021

    If they do not specify a max picture size, then it just does what it was
    doing before.

 OPrime-Android/src/ca/ilanguage/oprime/content/OPrime.java             |  1 +
 OPrime-Android/src/ca/ilanguage/oprime/datacollection/TakePicture.java | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 64 insertions(+), 14 deletions(-)

commit 56ffb41681cb0604b1dc0c0713c64fd11152ca4e
Author: trisapeace <trisapeace@gmail.com>
Date:   Thu Feb 14 12:06:47 2013 -0500

    DatePickerDialog now uses the message parameter as its title.

 OPrime-Android/src/ca/ilanguage/oprime/activity/HTML5Activity.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 2dec5c5ad846ecef84fd42c82898664886170dd5
Author: trisapeace <trisapeace@gmail.com>
Date:   Thu Feb 14 10:30:51 2013 -0500

    Reverted back to simplier structure #10

    Hopefully retained all the changes that we want to keep. Namely:
    *** Previous values are now being displayed when the pop-up opens.
    This works now for New Inspection Date as well as all the other window.prompt
    calls.

    Officially calls the result.cancel() when the user hits the cancel button
    of the DatePickerDialog. Without this, the Javascript side can freeze.

    To determine whether a window.prompt call is going to be a DatePickerDialog,
    I'm now searching just if the message contains the string "date" rather than
    if it ends with it.

    Made button labels into proper R.string strings.

    ** Next Inspection Date dialog is now a date picker on the Android #945.

 OPrime-Android/res/values/strings.xml                              |   2 ++
 OPrime-Android/src/ca/ilanguage/oprime/activity/HTML5Activity.java | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
 2 files changed, 89 insertions(+), 39 deletions(-)

commit 541cc9ed332e695da0e24a75162afe80a2246680
Author: trisapeace <trisapeace@gmail.com>
Date:   Mon Feb 11 15:12:43 2013 -0500

    Should have been included in previous commit.

 OPrime-Android/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

commit 0ea0218d2e0e7edda75e60f3beb0ee348f42950e
Author: trisapeace <trisapeace@gmail.com>
Date:   Mon Feb 11 14:46:28 2013 -0500

    Previous values are now being displayed when the pop-up opens.

    This works now for New Inspection Date as well as all the other window.prompt
    calls.

    Officially calls the result.cancel() when the user hits the cancel button
    of the DatePickerDialog. Without this, the Javascript side can freeze.

    To determine whether a window.prompt call is going to be a DatePickerDialog,
    I'm now searching just if the message contains the string "date" rather than
    if it ends with it.

    Made button labels into proper R.string strings.

 OPrime-Android/res/values/strings.xml                              |  1 +
 OPrime-Android/src/ca/ilanguage/oprime/activity/HTML5Activity.java | 38 +++++++++++++++++++++++++++++++++-----
 2 files changed, 34 insertions(+), 5 deletions(-)

commit 73d075c58080988e855682621ab0345b33a56221
Author: trisapeace <trisapeace@gmail.com>
Date:   Mon Feb 11 12:58:47 2013 -0500

    Next Inspection Date dialog is now a date picker on the Android #945.

 OPrime-Android/src/ca/ilanguage/oprime/activity/HTML5Activity.java | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------
 1 file changed, 60 insertions(+), 40 deletions(-)

commit 1d67d88392c95f21e114f1b00643497ccc36a2c9
Merge: f8ed2fd 67f11f3
Author: trisapeace <trisapeace@gmail.com>
Date:   Tue Jan 29 11:32:04 2013 -0500

    Merge branch 'master' of github.com:iLanguage/OPrime

commit 67f11f33c0dbd99249da3b6a55539241190c14f6
Author: cesine <cesine@yahoo.com>
Date:   Tue Jan 29 11:31:13 2013 -0500

    upgrading to android 4.2 and/or other change from a while ago

 OPrime-Android-HTML5-Offline/AndroidManifest.xml                                                         |    2 +-
 OPrime-Android-HTML5-Offline/res/drawable/splash.png                                                     |  Bin 78590 -> 0 bytes
 OPrime-Android-HTML5-Offline/res/layout/splashscreen.xml                                                 |   48 ---
 OPrime-Android-HTML5-Offline/res/values/styles.xml                                                       |   15 -
 OPrime-Android-HTML5-Offline/src/ca/ilanguage/oprime/activity/HTML5ReplicatingActivity.java              |  268 -------------
 OPrime-Android-HTML5-Offline/src/ca/ilanguage/oprime/offline/activity/HTML5ReplicatingActivity.java      |  398 +++++++++++++++++++
 OPrime-Android-HTML5-Offline/src/ca/ilanguage/oprime/offline/content/OPrimeOffineApp.java                |   74 ++++
 OPrime-Android-HTML5-Offline/src/ca/ilanguage/oprime/offline/content/ReplicatingJavaScriptInterface.java |   70 ++++
 OPrime-Android-HTML5-Offline/src/ca/ilanguage/oprime/offline/provider/OPrimeEktorpAsyncTask.java         |   16 +
 OPrime-Android-HTML5-Offline/src/ca/ilanguage/oprime/offline/provider/TouchDBItemUtils.java              |   50 +++
 OPrime-Android-HTML5-Offline/src/ca/ilanguage/oprime/offline/service/AuthenticateUserOffline.java        |  163 ++++++++
 OPrime-Android-HTML5-Offline/src/ca/ilanguage/oprime/provider/OPrimeEktorpAsyncTask.java                 |   16 -
 OPrime-Android-HTML5-Offline/src/ca/ilanguage/oprime/provider/TouchDBItemUtils.java                      |   50 ---
 OPrime-Android-HTML5-Offline/src/ca/ilanguage/oprime/service/AuthenticateUserOffline.java                |  163 --------
OPrime-Android/src/ca/ilanguage/oprime/activity/HTML5Activity.java                                       |    6 +-
 OPrime-HTML5/client/modules/oprime/ImportFromCSV.js                                                      |  185 +++++++++
 OPrime-HTML5/client/modules/oprime/OPrime.js                                                             |  509 ++++++++++++++++++++++++
 OPrime-HTML5/client/modules/oprime/Scorer.js                                                             | 1420 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 OPrime-HTML5/client/modules/oprime/filters/OPrimeFilters.js                                              |   11 +
 OPrime-HTML5/client/modules/oprime/services/AuthenticationServices.js                                    |   40 ++
 OPrime-HTML5/client/modules/oprime/services/CouchDB.js                                                   |   78 ++++
 OPrime-HTML5/client/modules/oprime/services/EncryptionServices.js                                        |   40 ++
 OPrime-HTML5/client/modules/oprime/services/PubSub.js                                                    |   34 ++
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v2.0/json2csv.html                              |   83 +---
 24 files changed, 3097 insertions(+), 642 deletions(-)

commit f8ed2fd09246cb3c4ee7858ee2ed403657b13270
Merge: f1052f7 7763b23
Author: trisapeace <trisapeace@gmail.com>
Date:   Tue Jan 29 10:38:30 2013 -0500

    Merge branch 'master' of github.com:iLanguage/OPrime

    Accepted the github version of all the conflicting files

    Conflicts:
        .gitignore
        README

commit 7763b23d81ac156c63285b42268de81b32dfd49e
Author: cesine <cesine@yahoo.com>
Date:   Wed Jan 2 17:08:05 2013 -0500

    for #9 updating project properties ot a generated properties from android sdk17

 OPrime-Android/project.properties | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 61c205a2c6c2dfbf774cb09017b103d429c509a4
Author: cesine <cesine@yahoo.com>
Date:   Wed Jan 2 17:06:32 2013 -0500

    for #9 another potential loss of javascript interface functions can come when methods are obfiscated using proguard source https://groups.google.com/forum/?fromgroups=#!topic/a

 OPrime-Android/proguard-project.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit b0ff2deda7ae26e8790a5ac2802c517ae804b718
Author: cesine <cesine@yahoo.com>
Date:   Wed Jan 2 16:58:01 2013 -0500

    removing old proguard config, adding a new that was generated by android project for #9

 OPrime-Android/proguard-project.txt | 20 ++++++++++++++++++++
 OPrime-Android/proguard.cfg         | 40 ----------------------------------------
 2 files changed, 20 insertions(+), 40 deletions(-)

commit 57f3a52b9f206f6dc980b2ea35c8b3d770856bd3
Author: cesine <cesine@yahoo.com>
Date:   Wed Jan 2 16:53:39 2013 -0500

    Android 4.2 requires the annotation  @JavascriptInterface before each method which is intented to be accessible from the javascript in the webview, this reduces security holes

 OPrime-Android/src/ca/ilanguage/oprime/content/ExperimentJavaScriptInterface.java | 10 +++++++++-
 OPrime-Android/src/ca/ilanguage/oprime/content/JavaScriptInterface.java           | 39 +++++++++++++++++++++++++++++----------
 OPrime-Android/src/ca/ilanguage/oprime/content/NonObfuscateable.java              |  5 +++++
 3 files changed, 43 insertions(+), 11 deletions(-)

commit 673f5a50b182521f723b523bd64e906655c15a47
Author: cesine <cesine@yahoo.com>
Date:   Wed Jan 2 16:44:09 2013 -0500

    tweeking status of getApp method

 OPrime-Android/src/ca/ilanguage/oprime/activity/HTML5Activity.java                | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------
 OPrime-Android/src/ca/ilanguage/oprime/activity/HTML5GameActivity.java            | 15 +++++++++------
 OPrime-Android/src/ca/ilanguage/oprime/activity/ParticipantDetails.java           | 10 ++++++----
 OPrime-Android/src/ca/ilanguage/oprime/content/ExperimentJavaScriptInterface.java |  1 -
 OPrime-Android/src/ca/ilanguage/oprime/content/JavaScriptInterface.java           | 39 +++++----------------------------------
 OPrime-Android/src/ca/ilanguage/oprime/content/OPrimeApp.java                     | 30 +++++++++++++++---------------
 6 files changed, 85 insertions(+), 85 deletions(-)

commit 5b813e38eea28ed577532775e8e10ff1db1baf8b
Author: cesine <cesine@yahoo.com>
Date:   Wed Jan 2 16:40:49 2013 -0500
    turning off url debugging, the workaround for 17535 seems to be working

 OPrime-Android/src/ca/ilanguage/oprime/content/AssetIncludeWorkaround.java | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

commit eac35ed5d50bcdae523253c61115379fd1751938
Author: cesine <cesine@yahoo.com>
Date:   Fri Dec 14 15:15:50 2012 -0500

    making the replicating activity to be abstract

 OPrime-Android-HTML5-Offline/project.properties                                             |   8 ++--
 OPrime-Android-HTML5-Offline/src/ca/ilanguage/oprime/activity/HTML5ReplicatingActivity.java | 178 +++++++++------------------------------------------------------------------------
 2 files changed, 24 insertions(+), 162 deletions(-)

commit 77d5bb101f75713b2aa3865c2cfbe981ae96a843
Author: cesine <cesine@yahoo.com>
Date:   Fri Dec 14 14:24:20 2012 -0500

    fixes #7 changed the workaround we are usign for http://code.google.com/p/android/issues/detail?id=17535 to use an shouldInterceptRequest which results in the parameters and an

 OPrime-Android/AndroidManifest.xml                                                |   2 +-
 OPrime-Android/src/ca/ilanguage/oprime/activity/ExperimentActivity.java           |   4 +-
 OPrime-Android/src/ca/ilanguage/oprime/activity/HTML5Activity.java                | 244 +++++++++++++++++++++++++++++++++++++++++--------------------------------------------------
 OPrime-Android/src/ca/ilanguage/oprime/activity/HTML5GameActivity.java            |  63 +++++++++++++++---------
 OPrime-Android/src/ca/ilanguage/oprime/content/AssetIncludeWorkaround.java        |  67 +++++++++++++++++++++++++
 OPrime-Android/src/ca/ilanguage/oprime/content/ExperimentJavaScriptInterface.java |  55 +++++++++++++--------
 OPrime-Android/src/ca/ilanguage/oprime/content/JavaScriptInterface.java           |  38 +++++++--------
 OPrime-Android/src/ca/ilanguage/oprime/content/OPrimeApp.java                     |   2 +-
 OPrime-Android/src/ca/ilanguage/oprime/content/OPrimeSampleApp.java               |   5 ++
 9 files changed, 277 insertions(+), 203 deletions(-)

commit 85f2417d473940fba6907f4aa4e16ae4a89994e8
Author: cesine <cesine@yahoo.com>
Date:   Sun Dec 9 14:57:39 2012 -0500

    reverting to a formated version of  https://github.com/iLanguage/OPrime/blob/51cae8797165e08876ed859a647bfc8c0549724a/AndroidOPrimeLib/src/ca/ilanguage/oprime/activity/HTML5Act

 OPrime-Android/src/ca/ilanguage/oprime/activity/HTML5Activity.java | 820 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------
 1 file changed, 434 insertions(+), 386 deletions(-)

commit 0a81c738370b3352d1bcce4cb11ee9c7f3035b91
Merge: b2e1146 f4db2ae
Author: cesine <cesine@yahoo.com>
Date:   Sun Dec 9 10:23:31 2012 -0500

    Merge branch 'master' of github.com:iLanguage/OPrime

commit b2e1146b8bc14eb45e38ba55df5e47aff47b7de6
Author: cesine <cesine@yahoo.com>
Date:   Sun Dec 9 10:23:14 2012 -0500

    adding a TouchDB listener when the activity starts

 OPrime-Android-HTML5-Offline/project.properties                                             |  9 +++++----
 OPrime-Android-HTML5-Offline/src/ca/ilanguage/oprime/activity/HTML5ReplicatingActivity.java | 33 +++++++++++++++++++++++++++++----
 2 files changed, 34 insertions(+), 8 deletions(-)

commit 72bfb4fea6d7ba540710559a88e749314ced973f
Author: cesine <cesine@yahoo.com>
Date:   Sun Dec 9 10:21:41 2012 -0500

    fixign typo in langauges

 OPrime-Android/src/ca/ilanguage/oprime/activity/SubExperiment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 25882f22944f2914e221ca6bdb6e56355c6e294b
Author: cesine <cesine@yahoo.com>
Date:   Sun Dec 9 10:20:38 2012 -0500

    not using intents anymore to run services, it was causeing all apps whcih used oprime to listen and trigger eachothers services

 OPrime-Android/src/ca/ilanguage/oprime/content/JavaScriptInterface.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit f4db2aeafb40ac69b02e63f7ca4d9bc80fe86fa9
Merge: 8e745a7 092d615
Author: cesine <gina.c.cook@gmail.com>
Date:   Sun Dec 9 07:18:09 2012 -0800

    Merge pull request #6 from senhorzinho/master

    bringin in url router fix

commit 092d6152a1eb680c930e7e98eb77752a301ec0c8
Author: Tobin Skinner <tobin.skinner@gmail.com>
Date:   Thu Dec 6 10:28:40 2012 -0500

    Fixed workaround for AngularJS route problem on Android.

 OPrime-Android-HTML5-Offline/project.properties                    |   2 +-
 OPrime-Android/index.html                                          |  10 ++
 OPrime-Android/lint.xml                                            |   6 +
 OPrime-Android/project.properties                                  |   2 +-
 OPrime-Android/src/ca/ilanguage/oprime/activity/HTML5Activity.java | 821 ++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------
 5 files changed, 404 insertions(+), 437 deletions(-)

commit 8e745a73c1177de720e8b9876e0a0dcc426fbbc8
Author: cesine <cesine@yahoo.com>
Date:   Wed Dec 5 10:04:41 2012 -0500

    bringing in sample data.

 .../results_samples/bilingualaphasiatest_v2.0/1NN1AA_en_US28_Reading_Comprehension_for_Words-2012-12-05_09_53.json |   1 +
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v2.0/json2csv.html                                        | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+)

commit b9acdbc7fa6e97871fa6a1835c8d269db1175c4b
Author: cesine <cesine@yahoo.com>
Date:   Wed Dec 5 09:58:57 2012 -0500

    moving bat 1.0 to another folder since the data schema changed in verison 2.0

 OPrime-HTML5/client/results_samples/bilingualaphasiatest/all.json                                             |  251 -----
 OPrime-HTML5/client/results_samples/bilingualaphasiatest/bash.sh                                              |   88 --
 OPrime-HTML5/client/results_samples/bilingualaphasiatest/bashimages.sh                                        |   88 --
 OPrime-HTML5/client/results_samples/bilingualaphasiatest/en06_Verbal_Auditory_Discrimination.json             |   10 -
OPrime-HTML5/client/results_samples/bilingualaphasiatest/index.html                                           |   82 --
 OPrime-HTML5/client/results_samples/bilingualaphasiatest/sample-touch-responses.json                          | 3304 --------------------------------------------------------------
 OPrime-HTML5/client/results_samples/bilingualaphasiatest/stimuliimages.json                                   |   78 --
 OPrime-HTML5/client/results_samples/bilingualaphasiatest/touch-responses.json                                 | 3304 --------------------------------------------------------------
 OPrime-HTML5/client/results_samples/bilingualaphasiatest/touch_response_visualizer.html                       |   63 --
 OPrime-HTML5/client/results_samples/bilingualaphasiatest/touch_response_visualizer.js                         |  748 --------------
 OPrime-HTML5/client/results_samples/bilingualaphasiatest/touch_visualizer.css                                 |   17 -
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/all.json                                        |  251 +++++
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/bash.sh                                         |   88 ++
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/bashimages.sh                                   |   88 ++
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/en06_Verbal_Auditory_Discrimination.json        |   10 +
OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/index.html                                      |   82 ++
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/sample-touch-responses.json                     | 3304 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/stimuliimages.json                              |   78 ++
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/touch-responses.json                            | 3304 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/touch_response_visualizer.html                  |   63 ++
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/touch_response_visualizer.js                    |  748 ++++++++++++++
 OPrime-HTML5/client/results_samples/bilingualaphasiatest_v1.0/touch_visualizer.css                            |   17 +
 472 files changed, 8033 insertions(+), 8033 deletions(-)

commit 46a1a08a8bf884fd1b72913d7e6acbc4988c6c5f
Author: cesine <cesine@yahoo.com>
Date:   Tue Dec 4 14:20:20 2012 -0500

    updating moo tools to try to get rid of eval errors in chrome, and added a link to a new file which extracts reaction time from the curent json output so that it can be anlalyz

 OPrime-HTML5/client/index.html                                                                           |     3 +-
 OPrime-HTML5/client/libs/imagegallery/mootools-more-1.4.0.1.js                                           |    37 +
 OPrime-HTML5/client/libs/imagegallery/mootools-more.js                                                   | 13373 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 OPrime-HTML5/client/libs/imagegallery/mootools.js                                                        |  6447 ++++++++++++++++++++++++++++++++
 OPrime-HTML5/client/manifest.json                                                                        |     2 +-
OPrime-HTML5/client/results_samples/bilingualaphasiatest/touch_response_visualizer.html                  |    26 +-
 OPrime-HTML5/client/results_samples/bilingualaphasiatest/touch_visualizer.css                            |    17 +
 OPrime-HTML5/client/touch_response_visualizer.html                                                       |    12 +-
 233 files changed, 19896 insertions(+), 21 deletions(-)

commit 1d9569730a4f79240f62e1ebe2e6cb4311b0e060
Author: cesine <cesine@yahoo.com>
Date:   Sun Dec 2 16:25:52 2012 -0500

    created a landing page to be clicked on to find out more info about components, and to run the sample data for https://github.com/iLanguage/AndroidBilingualAphasiaTest/issues/1

 OPrime-HTML5/client/css/oprime.css                                                                |  125 ++
 OPrime-HTML5/client/fonts/WaitingfortheSunrise.ttf                                                |  Bin 0 -> 59240 bytes
 OPrime-HTML5/client/index.html                                                                    |  887 +++--------
 OPrime-HTML5/client/libs/bootstrap/css/bootstrap-responsive.css                                   | 1088 ++++++++++++++
 OPrime-HTML5/client/libs/bootstrap/css/bootstrap-responsive.min.css                               |    9 +
 OPrime-HTML5/client/libs/bootstrap/css/bootstrap.css                                              | 5893 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 OPrime-HTML5/client/libs/bootstrap/css/bootstrap.min.css                                          |    9 +
 OPrime-HTML5/client/libs/bootstrap/img/glyphicons-halflings-white.png                             |  Bin 0 -> 8777 bytes
 OPrime-HTML5/client/libs/bootstrap/img/glyphicons-halflings.png                                   |  Bin 0 -> 12799 bytes
 OPrime-HTML5/client/libs/bootstrap/js/bootstrap.js                                                | 2025 ++++++++++++++++++++++++++
 OPrime-HTML5/client/libs/bootstrap/js/bootstrap.min.js                                            |    6 +
 OPrime-HTML5/client/libs/jquery.js                                                                |  156 +-
 OPrime-HTML5/client/manifest.json                                                                 |   11 +-
 OPrime-HTML5/client/modules/experiment/menu.css                                                   |   85 ++
 OPrime-HTML5/client/modules/experiment/menu.js                                                    |  556 +++++++
 OPrime-HTML5/client/modules/touch/touch_response_visualizer.js                                    |   86 +-
 OPrime-HTML5/client/results/bilingualaphasiatest/all.json                                         |  251 ----
 OPrime-HTML5/client/results/bilingualaphasiatest/bash.sh                                          |   88 --
 OPrime-HTML5/client/results/bilingualaphasiatest/bashimages.sh                                    |   88 --
 OPrime-HTML5/client/results/bilingualaphasiatest/en06_Verbal_Auditory_Discrimination.json         |   10 -
 OPrime-HTML5/client/results/bilingualaphasiatest/sample-touch-responses.json                      | 3304 -----------------------------------------
 OPrime-HTML5/client/results/bilingualaphasiatest/stimuliimages.json                               |   78 -
 OPrime-HTML5/client/results/bilingualaphasiatest/touch-responses.json                             | 3304 -----------------------------------------
 OPrime-HTML5/client/results_samples/bilingualaphasiatest/all.json                                 |  251 ++++
 OPrime-HTML5/client/results_samples/bilingualaphasiatest/bash.sh                                  |   88 ++
 OPrime-HTML5/client/results_samples/bilingualaphasiatest/bashimages.sh                            |   88 ++
OPrime-HTML5/client/results_samples/bilingualaphasiatest/en06_Verbal_Auditory_Discrimination.json |   10 +
 OPrime-HTML5/client/results_samples/bilingualaphasiatest/index.html                               |   82 ++
 OPrime-HTML5/client/results_samples/bilingualaphasiatest/sample-touch-responses.json              | 3304 +++++++++++++++++++++++++++++++++++++++++
 OPrime-HTML5/client/results_samples/bilingualaphasiatest/stimuliimages.json                       |   78 +
 OPrime-HTML5/client/results_samples/bilingualaphasiatest/touch-responses.json                     | 3304 +++++++++++++++++++++++++++++++++++++++++
 OPrime-HTML5/client/results_samples/bilingualaphasiatest/touch_response_visualizer.html           |   61 +
 OPrime-HTML5/client/results_samples/bilingualaphasiatest/touch_response_visualizer.js             |  748 ++++++++++
 OPrime-HTML5/client/touch_response_visualizer.html                                                |   61 +
 34 files changed, 18112 insertions(+), 8022 deletions(-)

commit 74c6f101573344a752e6237c3572ef5aab0b008f
Author: cesine <cesine@yahoo.com>
Date:   Sun Dec 2 14:26:28 2012 -0500

    moving touch visualizer files into a more modulare architecture for #4

 OPrime-HTML5/client/index.html                                                                  |  660 +++++++++++++++
 OPrime-HTML5/client/libs/hack.js                                                                |   55 ++
 OPrime-HTML5/client/libs/imagegallery/MooFlow.css                                               |  106 +++
 OPrime-HTML5/client/libs/imagegallery/MooFlow.js                                                |  433 ++++++++++
 OPrime-HTML5/client/libs/imagegallery/mootools-1.2-core.js                                      |  341 ++++++++
 OPrime-HTML5/client/libs/imagegallery/mootools-1.2-more.js                                      |  153 ++++
 OPrime-HTML5/client/libs/imagegallery/skin/ajax_loader.gif                                      |  Bin 0 -> 1989 bytes
 OPrime-HTML5/client/libs/imagegallery/skin/left-slider.gif                                      |  Bin 0 -> 302 bytes
 OPrime-HTML5/client/libs/imagegallery/skin/left.gif                                             |  Bin 0 -> 644 bytes
 OPrime-HTML5/client/libs/imagegallery/skin/middle-slider.gif                                    |  Bin 0 -> 684 bytes
 OPrime-HTML5/client/libs/imagegallery/skin/middle.gif                                           |  Bin 0 -> 60 bytes
 OPrime-HTML5/client/libs/imagegallery/skin/play.gif                                             |  Bin 0 -> 1219 bytes
 OPrime-HTML5/client/libs/imagegallery/skin/resize.gif                                           |  Bin 0 -> 936 bytes
 OPrime-HTML5/client/libs/imagegallery/skin/right.gif                                            |  Bin 0 -> 639 bytes
 OPrime-HTML5/client/libs/imagegallery/skin/stop.gif                                             |  Bin 0 -> 731 bytes
 OPrime-HTML5/client/libs/imagegallery/styles.css                                                |   79 ++
 OPrime-HTML5/client/libs/jquery.js                                                              |  154 ++++
 OPrime-HTML5/client/modules/touch/bilingualaphasiatest/all.json                                 |  251 ------
 OPrime-HTML5/client/modules/touch/bilingualaphasiatest/bash.sh                                  |   88 --
 OPrime-HTML5/client/modules/touch/bilingualaphasiatest/bashimages.sh                            |   88 --
 OPrime-HTML5/client/modules/touch/bilingualaphasiatest/en06_Verbal_Auditory_Discrimination.json |   10 -
 OPrime-HTML5/client/modules/touch/bilingualaphasiatest/sample-touch-responses.json              | 3304 ----------------------------------------------------------------------------
 OPrime-HTML5/client/modules/touch/bilingualaphasiatest/stimuliimages.json                       |   78 --
 OPrime-HTML5/client/modules/touch/bilingualaphasiatest/touch-responses.json                     | 3304 ----------------------------------------------------------------------------
 OPrime-HTML5/client/modules/touch/hack.js                                                       |   55 --
OPrime-HTML5/client/modules/touch/imagegallery/MooFlow.css                                      |  106 ---
 OPrime-HTML5/client/modules/touch/imagegallery/MooFlow.js                                       |  433 ----------
 OPrime-HTML5/client/modules/touch/imagegallery/mootools-1.2-core.js                             |  341 --------
 OPrime-HTML5/client/modules/touch/imagegallery/mootools-1.2-more.js                             |  153 ----
 OPrime-HTML5/client/modules/touch/imagegallery/skin/ajax_loader.gif                             |  Bin 1989 -> 0 bytes
 OPrime-HTML5/client/modules/touch/imagegallery/skin/left-slider.gif                             |  Bin 302 -> 0 bytes
 OPrime-HTML5/client/modules/touch/imagegallery/skin/left.gif                                    |  Bin 644 -> 0 bytes
 OPrime-HTML5/client/modules/touch/imagegallery/skin/middle-slider.gif                           |  Bin 684 -> 0 bytes
 OPrime-HTML5/client/modules/touch/imagegallery/skin/middle.gif                                  |  Bin 60 -> 0 bytes
 OPrime-HTML5/client/modules/touch/imagegallery/skin/play.gif                                    |  Bin 1219 -> 0 bytes
 OPrime-HTML5/client/modules/touch/imagegallery/skin/resize.gif                                  |  Bin 936 -> 0 bytes
 OPrime-HTML5/client/modules/touch/imagegallery/skin/right.gif                                   |  Bin 639 -> 0 bytes
 OPrime-HTML5/client/modules/touch/imagegallery/skin/stop.gif                                    |  Bin 731 -> 0 bytes
 OPrime-HTML5/client/modules/touch/imagegallery/styles.css                                       |   79 --
 OPrime-HTML5/client/modules/touch/index.html                                                    |  660 ---------------
 OPrime-HTML5/client/modules/touch/jquery.js                                                     |  154 ----
 OPrime-HTML5/client/modules/touch/moo-images.json                                               |    7 -
 OPrime-HTML5/client/modules/touch/touch_response_visualizer.html                                |  830 -------------------
 OPrime-HTML5/client/modules/touch/touch_response_visualizer.js                                  |  830 +++++++++++++++++++
 OPrime-HTML5/client/modules/touch/upload.html                                                   |   21 -
 OPrime-HTML5/client/results/bilingualaphasiatest/all.json                                       |  251 ++++++
 OPrime-HTML5/client/results/bilingualaphasiatest/bash.sh                                        |   88 ++
 OPrime-HTML5/client/results/bilingualaphasiatest/bashimages.sh                                  |   88 ++
 OPrime-HTML5/client/results/bilingualaphasiatest/en06_Verbal_Auditory_Discrimination.json       |   10 +
 OPrime-HTML5/client/results/bilingualaphasiatest/sample-touch-responses.json                    | 3304 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 OPrime-HTML5/client/results/bilingualaphasiatest/stimuliimages.json                             |   78 ++
 OPrime-HTML5/client/results/bilingualaphasiatest/touch-responses.json                           | 3304 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 OPrime-HTML5/client/upload.html                                                                 |   21 +
 53 files changed, 9955 insertions(+), 9962 deletions(-)

commit d5773fc33b158de57cdb46da77185031b55e1dbd
Author: cesine <cesine@yahoo.com>
Date:   Sun Dec 2 11:39:40 2012 -0500

    fixes #4 importing https://github.com/iLanguage/OPrimeAdministrator touch visualizer

    There is more in https://github.com/iLanguage/OPrimeAdministrator or https://github.com/iLanguage/WebAppBilingualAphasiaTest to be imported later...
      checking in the Touch Visualizer hack that was built for the Bilingual Aphasia Test in October 2011 to visualze the touch results of the android prototype. This code is out o

 OPrime-HTML5/client/manifest.json                                                               |   19 +
 OPrime-HTML5/client/modules/touch/bilingualaphasiatest/all.json                                 |  251 ++++++
OPrime-HTML5/client/modules/touch/bilingualaphasiatest/bash.sh                                  |   88 ++
 OPrime-HTML5/client/modules/touch/bilingualaphasiatest/bashimages.sh                            |   88 ++
 OPrime-HTML5/client/modules/touch/bilingualaphasiatest/en06_Verbal_Auditory_Discrimination.json |   10 +
 OPrime-HTML5/client/modules/touch/bilingualaphasiatest/sample-touch-responses.json              | 3304 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 OPrime-HTML5/client/modules/touch/bilingualaphasiatest/stimuliimages.json                       |   78 ++
 OPrime-HTML5/client/modules/touch/bilingualaphasiatest/touch-responses.json                     | 3304 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 OPrime-HTML5/client/modules/touch/hack.js                                                       |   55 ++
 OPrime-HTML5/client/modules/touch/imagegallery/MooFlow.css                                      |  106 +++
 OPrime-HTML5/client/modules/touch/imagegallery/MooFlow.js                                       |  433 ++++++++++
 OPrime-HTML5/client/modules/touch/imagegallery/mootools-1.2-core.js                             |  341 ++++++++
 OPrime-HTML5/client/modules/touch/imagegallery/mootools-1.2-more.js                             |  153 ++++
 OPrime-HTML5/client/modules/touch/imagegallery/skin/ajax_loader.gif                             |  Bin 0 -> 1989 bytes
 OPrime-HTML5/client/modules/touch/imagegallery/skin/left-slider.gif                             |  Bin 0 -> 302 bytes
 OPrime-HTML5/client/modules/touch/imagegallery/skin/left.gif                                    |  Bin 0 -> 644 bytes
 OPrime-HTML5/client/modules/touch/imagegallery/skin/middle-slider.gif                           |  Bin 0 -> 684 bytes
 OPrime-HTML5/client/modules/touch/imagegallery/skin/middle.gif                                  |  Bin 0 -> 60 bytes
 OPrime-HTML5/client/modules/touch/imagegallery/skin/play.gif                                    |  Bin 0 -> 1219 bytes
 OPrime-HTML5/client/modules/touch/imagegallery/skin/resize.gif                                  |  Bin 0 -> 936 bytes
 OPrime-HTML5/client/modules/touch/imagegallery/skin/right.gif                                   |  Bin 0 -> 639 bytes
 OPrime-HTML5/client/modules/touch/imagegallery/skin/stop.gif                                    |  Bin 0 -> 731 bytes
 OPrime-HTML5/client/modules/touch/imagegallery/styles.css                                       |   79 ++
 OPrime-HTML5/client/modules/touch/index.html                                                    |  660 +++++++++++++++
 OPrime-HTML5/client/modules/touch/jquery.js                                                     |  154 ++++
 OPrime-HTML5/client/modules/touch/moo-images.json                                               |    7 +
 OPrime-HTML5/client/modules/touch/touch_response_visualizer.html                                |  830 +++++++++++++++++++
 OPrime-HTML5/client/modules/touch/upload.html                                                   |   21 +
 28 files changed, 9981 insertions(+)

commit cfd63db5cfb840bb555782918e6d683af8d48d9a
Author: cesine <cesine@yahoo.com>
Date:   Sun Dec 2 11:34:25 2012 -0500

    renaming folders to new naming convention Library-Technology-Technology-why

 AndroidHTML5OfflineLib/AndroidManifest.xml                                                  |   35 -
 AndroidHTML5OfflineLib/LICENSE                                                              |  202 --
 AndroidHTML5OfflineLib/proguard.cfg                                                         |   40 -
 AndroidHTML5OfflineLib/project.properties                                                   |   15 -
 AndroidHTML5OfflineLib/res/anim/slide_in_right.xml                                          |   26 -
 AndroidHTML5OfflineLib/res/drawable-hdpi/androids_experimenter_kids.png                     |  Bin 78590 -> 0 bytes
 AndroidHTML5OfflineLib/res/drawable-hdpi/ic_back.png                                        |  Bin 3112 -> 0 bytes
AndroidHTML5OfflineLib/res/drawable-hdpi/ic_oprime.png                                      |  Bin 10548 -> 0 bytes
 AndroidHTML5OfflineLib/res/drawable-hdpi/ic_play.png                                        |  Bin 3118 -> 0 bytes
 AndroidHTML5OfflineLib/res/drawable-ldpi/androids_experimenter_kids.png                     |  Bin 78590 -> 0 bytes
 AndroidHTML5OfflineLib/res/drawable-ldpi/ic_back.png                                        |  Bin 3112 -> 0 bytes
 AndroidHTML5OfflineLib/res/drawable-ldpi/ic_oprime.png                                      |  Bin 5009 -> 0 bytes
 AndroidHTML5OfflineLib/res/drawable-ldpi/ic_play.png                                        |  Bin 3118 -> 0 bytes
 AndroidHTML5OfflineLib/res/drawable-mdpi/androids_experimenter_kids.png                     |  Bin 78590 -> 0 bytes
 AndroidHTML5OfflineLib/res/drawable-mdpi/ic_back.png                                        |  Bin 3112 -> 0 bytes
 AndroidHTML5OfflineLib/res/drawable-mdpi/ic_oprime.png                                      |  Bin 7059 -> 0 bytes
 AndroidHTML5OfflineLib/res/drawable-mdpi/ic_play.png                                        |  Bin 3118 -> 0 bytes
 AndroidHTML5OfflineLib/res/drawable/ic_stop.png                                             |  Bin 3580 -> 0 bytes
 AndroidHTML5OfflineLib/res/values/strings.xml                                               |    6 -
 AndroidHTML5OfflineLib/src/ca/ilanguage/oprime/activity/HTML5ReplicatingActivity.java       |  195 --
 AndroidOPrimeLib/AndroidManifest.xml                                                        |  165 --
 AndroidOPrimeLib/LICENSE                                                                    |  202 --
 AndroidOPrimeLib/assets/OPrime.js                                                           |  422 ----
 AndroidOPrimeLib/assets/OPrimeTest.html                                                     |   84 -
 AndroidOPrimeLib/assets/OPrimeTest.js                                                       |  104 -
 AndroidOPrimeLib/assets/androids_experimenter_kids.png                                      |  Bin 83081 -> 0 bytes
 AndroidOPrimeLib/assets/chime.mp3                                                           |  Bin 38069 -> 0 bytes
 AndroidOPrimeLib/assets/flower_beats_loop.mp3                                               |  Bin 314398 -> 0 bytes
 AndroidOPrimeLib/assets/libs/bootstrap/css/bootstrap-responsive.css                         |  815 -------
 AndroidOPrimeLib/assets/libs/bootstrap/css/bootstrap.css                                    | 4984 ------------------------------------------
 AndroidOPrimeLib/assets/libs/bootstrap/css/bootstrap.min.css                                |  585 -----
 AndroidOPrimeLib/assets/libs/bootstrap/img/glyphicons-halflings-white.png                   |  Bin 8777 -> 0 bytes
 AndroidOPrimeLib/assets/libs/bootstrap/img/glyphicons-halflings.png                         |  Bin 13826 -> 0 bytes
 AndroidOPrimeLib/assets/libs/bootstrap/js/bootstrap-alert.js                                |   90 -
 AndroidOPrimeLib/assets/libs/bootstrap/js/bootstrap-button.js                               |   96 -
 AndroidOPrimeLib/assets/libs/bootstrap/js/bootstrap-carousel.js                             |  169 --
 AndroidOPrimeLib/assets/libs/bootstrap/js/bootstrap-collapse.js                             |  157 --
 AndroidOPrimeLib/assets/libs/bootstrap/js/bootstrap-dropdown.js                             |  100 -
 AndroidOPrimeLib/assets/libs/bootstrap/js/bootstrap-modal.js                                |  218 --
 AndroidOPrimeLib/assets/libs/bootstrap/js/bootstrap-popover.js                              |   98 -
 AndroidOPrimeLib/assets/libs/bootstrap/js/bootstrap-scrollspy.js                            |  151 --
 AndroidOPrimeLib/assets/libs/bootstrap/js/bootstrap-tab.js                                  |  135 --
 AndroidOPrimeLib/assets/libs/bootstrap/js/bootstrap-tooltip.js                              |  275 ---
 AndroidOPrimeLib/assets/libs/bootstrap/js/bootstrap-transition.js                           |   61 -
 AndroidOPrimeLib/assets/libs/bootstrap/js/bootstrap-typeahead.js                            |  285 ---
 AndroidOPrimeLib/assets/libs/bootstrap/js/bootstrap.js                                      | 1836 ----------------
 AndroidOPrimeLib/assets/libs/bootstrap/js/bootstrap.min.js                                  |    7 -
 AndroidOPrimeLib/assets/libs/jquery.js                                                      | 9404 -------------------------------------------------------------------------------
AndroidOPrimeLib/assets/manifest.json                                                       |   20 -
 AndroidOPrimeLib/assets/noqata_tusunayawami.TextGrid                                        |   70 -
 AndroidOPrimeLib/assets/noqata_tusunayawami.wav                                             |  Bin 98886 -> 0 bytes
 AndroidOPrimeLib/assets/oprime128.png                                                       |  Bin 18919 -> 0 bytes
 AndroidOPrimeLib/assets/oprime16.png                                                        |  Bin 3544 -> 0 bytes
 AndroidOPrimeLib/assets/oprime48.png                                                        |  Bin 7009 -> 0 bytes
 AndroidOPrimeLib/assets/ploep.wav                                                           |  Bin 169388 -> 0 bytes
 AndroidOPrimeLib/assets/sample_menu.html                                                    |   22 -
 AndroidOPrimeLib/proguard.cfg                                                               |   40 -
 AndroidOPrimeLib/project.properties                                                         |   12 -
 AndroidOPrimeLib/res/anim/slide_in_right.xml                                                |   26 -
 AndroidOPrimeLib/res/drawable-hdpi/androids_experimenter_kids.png                           |  Bin 78590 -> 0 bytes
 AndroidOPrimeLib/res/drawable-hdpi/ic_back.png                                              |  Bin 3112 -> 0 bytes
 AndroidOPrimeLib/res/drawable-hdpi/ic_oprime.png                                            |  Bin 10548 -> 0 bytes
 AndroidOPrimeLib/res/drawable-hdpi/ic_play.png                                              |  Bin 3118 -> 0 bytes
 AndroidOPrimeLib/res/drawable-ldpi/androids_experimenter_kids.png                           |  Bin 78590 -> 0 bytes
 AndroidOPrimeLib/res/drawable-ldpi/ic_back.png                                              |  Bin 3112 -> 0 bytes
 AndroidOPrimeLib/res/drawable-ldpi/ic_oprime.png                                            |  Bin 5009 -> 0 bytes
 AndroidOPrimeLib/res/drawable-ldpi/ic_play.png                                              |  Bin 3118 -> 0 bytes
 AndroidOPrimeLib/res/drawable-mdpi/androids_experimenter_kids.png                           |  Bin 78590 -> 0 bytes
 AndroidOPrimeLib/res/drawable-mdpi/ic_back.png                                              |  Bin 3112 -> 0 bytes
 AndroidOPrimeLib/res/drawable-mdpi/ic_oprime.png                                            |  Bin 7059 -> 0 bytes
 AndroidOPrimeLib/res/drawable-mdpi/ic_play.png                                              |  Bin 3118 -> 0 bytes
 AndroidOPrimeLib/res/drawable/ic_stop.png                                                   |  Bin 3580 -> 0 bytes
 AndroidOPrimeLib/res/layout/dialog_edit_text.xml                                            |   25 -
 AndroidOPrimeLib/res/layout/html5webview.xml                                                |   10 -
 AndroidOPrimeLib/res/layout/main.xml                                                        |   22 -
 AndroidOPrimeLib/res/layout/one_image.xml                                                   |   86 -
 AndroidOPrimeLib/res/layout/page_curl.xml                                                   |    6 -
 AndroidOPrimeLib/res/layout/stop_watch.xml                                                  |  103 -
 AndroidOPrimeLib/res/layout/take_picture.xml                                                |   15 -
 AndroidOPrimeLib/res/layout/two_images.xml                                                  |   93 -
 AndroidOPrimeLib/res/layout/video_recorder.xml                                              |   10 -
 AndroidOPrimeLib/res/menu/home_menu.xml                                                     |   28 -
 AndroidOPrimeLib/res/raw/chime.mp3                                                          |  Bin 38069 -> 0 bytes
 AndroidOPrimeLib/res/raw/gammatone.wav                                                      |  Bin 8864 -> 0 bytes
 AndroidOPrimeLib/res/raw/pageflip2.mp3                                                      |  Bin 30039 -> 0 bytes
 AndroidOPrimeLib/res/raw/ploep.wav                                                          |  Bin 169388 -> 0 bytes
 AndroidOPrimeLib/res/values-fr/arrays.xml                                                   |    8 -
 AndroidOPrimeLib/res/values-fr/strings.xml                                                  |    9 -
 AndroidOPrimeLib/res/values/arrays.xml                                                      |  142 --

AndroidOPrimeLib/res/values/strings.xml                                                     |   52 -
 AndroidOPrimeLib/res/xml/preferences.xml                                                    |  148 --
 AndroidOPrimeLib/src/ca/ilanguage/oprime/activity/ExperimentActivity.java                   |    6 -
 AndroidOPrimeLib/src/ca/ilanguage/oprime/activity/HTML5Activity.java                        |  478 -----
 AndroidOPrimeLib/src/ca/ilanguage/oprime/activity/HTML5GameActivity.java                    |  278 ---
 AndroidOPrimeLib/src/ca/ilanguage/oprime/activity/OPrimeLib.java                            |   14 -
 AndroidOPrimeLib/src/ca/ilanguage/oprime/activity/ParticipantDetails.java                   |   64 -
 AndroidOPrimeLib/src/ca/ilanguage/oprime/activity/StopWatchSubExperiment.java               |  233 --
 AndroidOPrimeLib/src/ca/ilanguage/oprime/activity/SubExperiment.java                        |  443 ----
 AndroidOPrimeLib/src/ca/ilanguage/oprime/activity/TwoImageSubExperiment.java                |  133 --
 AndroidOPrimeLib/src/ca/ilanguage/oprime/content/Experiment.java                            |   56 -
 AndroidOPrimeLib/src/ca/ilanguage/oprime/content/ExperimentJavaScriptInterface.java         |  108 -
 AndroidOPrimeLib/src/ca/ilanguage/oprime/content/JavaScriptInterface.java                   |  625 ------
 AndroidOPrimeLib/src/ca/ilanguage/oprime/content/OPrime.java                                |   63 -
 AndroidOPrimeLib/src/ca/ilanguage/oprime/content/OPrimeApp.java                             |  404 ----
 AndroidOPrimeLib/src/ca/ilanguage/oprime/content/PageUrlGetPair.java                        |   42 -
 AndroidOPrimeLib/src/ca/ilanguage/oprime/content/Participant.java                           |  366 ----
 AndroidOPrimeLib/src/ca/ilanguage/oprime/content/Stimulus.java                              |  157 --
 AndroidOPrimeLib/src/ca/ilanguage/oprime/content/SubExperimentBlock.java                    |  196 --
 AndroidOPrimeLib/src/ca/ilanguage/oprime/content/Touch.java                                 |   64 -
 AndroidOPrimeLib/src/ca/ilanguage/oprime/content/TwoImageStimulus.java                      |   86 -
 AndroidOPrimeLib/src/ca/ilanguage/oprime/datacollection/AudioRecorder.java                  |  202 --
 AndroidOPrimeLib/src/ca/ilanguage/oprime/datacollection/SubExperimentToJson.java            |   53 -
 AndroidOPrimeLib/src/ca/ilanguage/oprime/datacollection/TakePicture.java                    |  164 --
 AndroidOPrimeLib/src/ca/ilanguage/oprime/datacollection/VideoRecorder.java                  |  480 -----
 AndroidOPrimeLib/src/ca/ilanguage/oprime/datacollection/VideoRecorderAsyncTask.java         |  278 ---
 AndroidOPrimeLib/src/ca/ilanguage/oprime/storybook/CurlMesh.java                            |  976 ---------
 AndroidOPrimeLib/src/ca/ilanguage/oprime/storybook/CurlRenderer.java                        |  277 ---
 AndroidOPrimeLib/src/ca/ilanguage/oprime/storybook/CurlView.java                            |  841 --------
 AndroidOPrimeLib/src/ca/ilanguage/oprime/storybook/StoryBookSubExperiment.java              |  254 ---
 OPrime-Android-HTML5-Offline/AndroidManifest.xml                                            |   37 +
 OPrime-Android-HTML5-Offline/LICENSE                                                        |  202 ++
 OPrime-Android-HTML5-Offline/proguard.cfg                                                   |   40 +
 OPrime-Android-HTML5-Offline/project.properties                                             |   16 +
 OPrime-Android-HTML5-Offline/res/anim/slide_in_right.xml                                    |   26 +
 OPrime-Android-HTML5-Offline/res/drawable-hdpi/androids_experimenter_kids.png               |  Bin 0 -> 78590 bytes
 OPrime-Android-HTML5-Offline/res/drawable-hdpi/ic_back.png                                  |  Bin 0 -> 3112 bytes
 OPrime-Android-HTML5-Offline/res/drawable-hdpi/ic_oprime.png                                |  Bin 0 -> 10548 bytes
 OPrime-Android-HTML5-Offline/res/drawable-hdpi/ic_play.png                                  |  Bin 0 -> 3118 bytes
 OPrime-Android-HTML5-Offline/res/drawable-hdpi/splash.png                                   |  Bin 0 -> 78590 bytes
 OPrime-Android-HTML5-Offline/res/drawable-ldpi/androids_experimenter_kids.png               |  Bin 0 -> 78590 bytes
OPrime-Android-HTML5-Offline/res/drawable-ldpi/ic_back.png                                  |  Bin 0 -> 3112 bytes
 OPrime-Android-HTML5-Offline/res/drawable-ldpi/ic_oprime.png                                |  Bin 0 -> 5009 bytes
 OPrime-Android-HTML5-Offline/res/drawable-ldpi/ic_play.png                                  |  Bin 0 -> 3118 bytes
 OPrime-Android-HTML5-Offline/res/drawable-ldpi/splash.png                                   |  Bin 0 -> 78590 bytes
 OPrime-Android-HTML5-Offline/res/drawable-mdpi/androids_experimenter_kids.png               |  Bin 0 -> 78590 bytes
 OPrime-Android-HTML5-Offline/res/drawable-mdpi/ic_back.png                                  |  Bin 0 -> 3112 bytes
 OPrime-Android-HTML5-Offline/res/drawable-mdpi/ic_oprime.png                                |  Bin 0 -> 7059 bytes
 OPrime-Android-HTML5-Offline/res/drawable-mdpi/ic_play.png                                  |  Bin 0 -> 3118 bytes
 OPrime-Android-HTML5-Offline/res/drawable-mdpi/splash.png                                   |  Bin 0 -> 78590 bytes
 OPrime-Android-HTML5-Offline/res/drawable-xhdpi/splash.png                                  |  Bin 0 -> 78590 bytes
 OPrime-Android-HTML5-Offline/res/drawable/ic_stop.png                                       |  Bin 0 -> 3580 bytes
 OPrime-Android-HTML5-Offline/res/drawable/splash.png                                        |  Bin 0 -> 78590 bytes
 OPrime-Android-HTML5-Offline/res/layout/splashscreen.xml                                    |   48 +
 OPrime-Android-HTML5-Offline/res/values/strings.xml                                         |    6 +
 OPrime-Android-HTML5-Offline/res/values/styles.xml                                          |   15 +
 OPrime-Android-HTML5-Offline/src/ca/ilanguage/oprime/activity/HTML5ReplicatingActivity.java |  381 ++++
 OPrime-Android-HTML5-Offline/src/ca/ilanguage/oprime/provider/OPrimeEktorpAsyncTask.java    |   16 +
 OPrime-Android-HTML5-Offline/src/ca/ilanguage/oprime/provider/TouchDBItemUtils.java         |   50 +
 OPrime-Android-HTML5-Offline/src/ca/ilanguage/oprime/service/AuthenticateUserOffline.java   |  163 ++
 OPrime-Android/AndroidManifest.xml                                                          |  165 ++
 OPrime-Android/LICENSE                                                                      |  202 ++
 OPrime-Android/assets/OPrime.js                                                             |  422 ++++
 OPrime-Android/assets/OPrimeTest.html                                                       |   84 +
 OPrime-Android/assets/OPrimeTest.js                                                         |  104 +
 OPrime-Android/assets/androids_experimenter_kids.png                                        |  Bin 0 -> 83081 bytes
 OPrime-Android/assets/chime.mp3                                                             |  Bin 0 -> 38069 bytes
 OPrime-Android/assets/flower_beats_loop.mp3                                                 |  Bin 0 -> 314398 bytes
 OPrime-Android/assets/libs/bootstrap/css/bootstrap-responsive.css                           |  815 +++++++
 OPrime-Android/assets/libs/bootstrap/css/bootstrap.css                                      | 4984 ++++++++++++++++++++++++++++++++++++++++++
 OPrime-Android/assets/libs/bootstrap/css/bootstrap.min.css                                  |  585 +++++
 OPrime-Android/assets/libs/bootstrap/img/glyphicons-halflings-white.png                     |  Bin 0 -> 8777 bytes
 OPrime-Android/assets/libs/bootstrap/img/glyphicons-halflings.png                           |  Bin 0 -> 13826 bytes
 OPrime-Android/assets/libs/bootstrap/js/bootstrap-alert.js                                  |   90 +
 OPrime-Android/assets/libs/bootstrap/js/bootstrap-button.js                                 |   96 +
 OPrime-Android/assets/libs/bootstrap/js/bootstrap-carousel.js                               |  169 ++
 OPrime-Android/assets/libs/bootstrap/js/bootstrap-collapse.js                               |  157 ++
 OPrime-Android/assets/libs/bootstrap/js/bootstrap-dropdown.js                               |  100 +
 OPrime-Android/assets/libs/bootstrap/js/bootstrap-modal.js                                  |  218 ++
 OPrime-Android/assets/libs/bootstrap/js/bootstrap-popover.js                                |   98 +
 OPrime-Android/assets/libs/bootstrap/js/bootstrap-scrollspy.js                              |  151 ++
 OPrime-Android/assets/libs/bootstrap/js/bootstrap-tab.js                                    |  135 ++
 OPrime-Android/assets/libs/bootstrap/js/bootstrap-tooltip.js                                |  275 +++
 OPrime-Android/assets/libs/bootstrap/js/bootstrap-transition.js                             |   61 +
 OPrime-Android/assets/libs/bootstrap/js/bootstrap-typeahead.js                              |  285 +++
 OPrime-Android/assets/libs/bootstrap/js/bootstrap.js                                        | 1836 ++++++++++++++++
 OPrime-Android/assets/libs/bootstrap/js/bootstrap.min.js                                    |    7 +
 OPrime-Android/assets/libs/jquery.js                                                        | 9404 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 OPrime-Android/assets/manifest.json                                                         |   20 +
 OPrime-Android/assets/noqata_tusunayawami.TextGrid                                          |   70 +
 OPrime-Android/assets/noqata_tusunayawami.wav                                               |  Bin 0 -> 98886 bytes
 OPrime-Android/assets/oprime128.png                                                         |  Bin 0 -> 18919 bytes
 OPrime-Android/assets/oprime16.png                                                          |  Bin 0 -> 3544 bytes
 OPrime-Android/assets/oprime48.png                                                          |  Bin 0 -> 7009 bytes
 OPrime-Android/assets/ploep.wav                                                             |  Bin 0 -> 169388 bytes
 OPrime-Android/assets/sample_menu.html                                                      |   22 +
 OPrime-Android/proguard.cfg                                                                 |   40 +
 OPrime-Android/project.properties                                                           |   12 +
 OPrime-Android/res/anim/slide_in_right.xml                                                  |   26 +
 OPrime-Android/res/drawable-hdpi/androids_experimenter_kids.png                             |  Bin 0 -> 78590 bytes
 OPrime-Android/res/drawable-hdpi/ic_back.png                                                |  Bin 0 -> 3112 bytes
 OPrime-Android/res/drawable-hdpi/ic_oprime.png                                              |  Bin 0 -> 10548 bytes
 OPrime-Android/res/drawable-hdpi/ic_play.png                                                |  Bin 0 -> 3118 bytes
 OPrime-Android/res/drawable-ldpi/androids_experimenter_kids.png                             |  Bin 0 -> 78590 bytes
 OPrime-Android/res/drawable-ldpi/ic_back.png                                                |  Bin 0 -> 3112 bytes
 OPrime-Android/res/drawable-ldpi/ic_oprime.png                                              |  Bin 0 -> 5009 bytes
 OPrime-Android/res/drawable-ldpi/ic_play.png                                                |  Bin 0 -> 3118 bytes
 OPrime-Android/res/drawable-mdpi/androids_experimenter_kids.png                             |  Bin 0 -> 78590 bytes
 OPrime-Android/res/drawable-mdpi/ic_back.png                                                |  Bin 0 -> 3112 bytes
 OPrime-Android/res/drawable-mdpi/ic_oprime.png                                              |  Bin 0 -> 7059 bytes
 OPrime-Android/res/drawable-mdpi/ic_play.png                                                |  Bin 0 -> 3118 bytes
 OPrime-Android/res/drawable/ic_stop.png                                                     |  Bin 0 -> 3580 bytes
 OPrime-Android/res/layout/dialog_edit_text.xml                                              |   25 +
 OPrime-Android/res/layout/html5webview.xml                                                  |   10 +
 OPrime-Android/res/layout/main.xml                                                          |   22 +
 OPrime-Android/res/layout/one_image.xml                                                     |   86 +
 OPrime-Android/res/layout/page_curl.xml                                                     |    6 +
 OPrime-Android/res/layout/stop_watch.xml                                                    |  103 +
 OPrime-Android/res/layout/take_picture.xml                                                  |   15 +
 OPrime-Android/res/layout/two_images.xml                                                    |   93 +
 OPrime-Android/res/layout/video_recorder.xml                                                |   10 +
 OPrime-Android/res/menu/home_menu.xml                                                       |   28 +
 OPrime-Android/res/raw/chime.mp3                                                            |  Bin 0 -> 38069 bytes
 OPrime-Android/res/raw/gammatone.wav                                                        |  Bin 0 -> 8864 bytes
 OPrime-Android/res/raw/pageflip2.mp3                                                        |  Bin 0 -> 30039 bytes
 OPrime-Android/res/raw/ploep.wav                                                            |  Bin 0 -> 169388 bytes
 OPrime-Android/res/values-fr/arrays.xml                                                     |    8 +
 OPrime-Android/res/values-fr/strings.xml                                                    |    9 +
 OPrime-Android/res/values/arrays.xml                                                        |  142 ++
 OPrime-Android/res/values/strings.xml                                                       |   52 +
 OPrime-Android/res/xml/preferences.xml                                                      |  148 ++
 OPrime-Android/src/ca/ilanguage/oprime/activity/ExperimentActivity.java                     |    6 +
 OPrime-Android/src/ca/ilanguage/oprime/activity/HTML5Activity.java                          |  478 +++++
 OPrime-Android/src/ca/ilanguage/oprime/activity/HTML5GameActivity.java                      |  278 +++
 OPrime-Android/src/ca/ilanguage/oprime/activity/OPrimeLib.java                              |   14 +
 OPrime-Android/src/ca/ilanguage/oprime/activity/ParticipantDetails.java                     |   64 +
 OPrime-Android/src/ca/ilanguage/oprime/activity/StopWatchSubExperiment.java                 |  233 ++
 OPrime-Android/src/ca/ilanguage/oprime/activity/SubExperiment.java                          |  443 ++++
 OPrime-Android/src/ca/ilanguage/oprime/activity/TwoImageSubExperiment.java                  |  133 ++
 OPrime-Android/src/ca/ilanguage/oprime/content/Experiment.java                              |   56 +
 OPrime-Android/src/ca/ilanguage/oprime/content/ExperimentJavaScriptInterface.java           |  108 +
 OPrime-Android/src/ca/ilanguage/oprime/content/JavaScriptInterface.java                     |  641 ++++++
 OPrime-Android/src/ca/ilanguage/oprime/content/OPrime.java                                  |   63 +
 OPrime-Android/src/ca/ilanguage/oprime/content/OPrimeApp.java                               |  404 ++++
 OPrime-Android/src/ca/ilanguage/oprime/content/PageUrlGetPair.java                          |   42 +
 OPrime-Android/src/ca/ilanguage/oprime/content/Participant.java                             |  366 ++++
 OPrime-Android/src/ca/ilanguage/oprime/content/Stimulus.java                                |  157 ++
 OPrime-Android/src/ca/ilanguage/oprime/content/SubExperimentBlock.java                      |  196 ++
 OPrime-Android/src/ca/ilanguage/oprime/content/Touch.java                                   |   64 +
 OPrime-Android/src/ca/ilanguage/oprime/content/TwoImageStimulus.java                        |   86 +
 OPrime-Android/src/ca/ilanguage/oprime/datacollection/AudioRecorder.java                    |  202 ++
 OPrime-Android/src/ca/ilanguage/oprime/datacollection/SubExperimentToJson.java              |   53 +
 OPrime-Android/src/ca/ilanguage/oprime/datacollection/TakePicture.java                      |  164 ++
 OPrime-Android/src/ca/ilanguage/oprime/datacollection/VideoRecorder.java                    |  480 +++++
 OPrime-Android/src/ca/ilanguage/oprime/datacollection/VideoRecorderAsyncTask.java           |  278 +++
 OPrime-Android/src/ca/ilanguage/oprime/storybook/CurlMesh.java                              |  976 +++++++++
 OPrime-Android/src/ca/ilanguage/oprime/storybook/CurlRenderer.java                          |  277 +++
 OPrime-Android/src/ca/ilanguage/oprime/storybook/CurlView.java                              |  841 ++++++++
 OPrime-Android/src/ca/ilanguage/oprime/storybook/StoryBookSubExperiment.java                |  254 +++
 248 files changed, 29747 insertions(+), 29250 deletions(-)

commit 51cae8797165e08876ed859a647bfc8c0549724a
Author: cesine <cesine@yahoo.com>
Date:   Sat Dec 1 09:53:28 2012 -0500
making offline replicaiton more robust and adding more data colleciton for device details and gps
added a new method getOfflineDBs which checks to see what dbs might be availible on the Android, also simplifiying and cleaning up the code to add a users.html default starting page, and no ability to start replicating with the previous user... although that might come back in a new function.
spacing and comments
can turn off the server iff  we turn the listener off first
updated OPrime for new couchbase branding
Merge branch 'master' of git://github.com/jdhorner/OPrime into jdhorner-master

Resolved merge conflicts which were basically due to comments

Conflicts:
	OPrime-Android-HTML5-Offline/src/ca/ilanguage/oprime/offline/activity/HTML5ReplicatingActivity.java
here is a sample story book experiment
taking user to the market if they dont have oprime installed
Updated storybook to use xml string-array from stimuli.xml.
added audio playing, currently set to 1 second post image onset
Formatting and using stimuli array rather htan individual arrays of images and audio so we can gather touch points
removed duplicates, now using the story book from the oprime library direclty, requires importing oprime to run the app
not turning on replication if replication is already running
updated story book tutorial to use a library project
fixes #35
we were missing a result file so the video wasn'T being created.
Merge branch 'master' of github.com:MarquisAlx/OPrime into MarquisAlx-master

Conflicts:
	OPrime-Android-Tutorial/src/ca/ilanguage/oprime/tutorial/OPrimeStorybookExperimentTutorial.java
using CODE to differentiate constatns for on activity finished
extracting oprime replicating source