incubator-flagon-stout.git
2 years agoBump django from 1.7 to 1.11.23 dependabot/pip/django-1.11.23 2/head
dependabot[bot] [Fri, 18 Oct 2019 13:05:20 +0000 (13:05 +0000)] 
Bump django from 1.7 to 1.11.23

Bumps [django](https://github.com/django/django) from 1.7 to 1.11.23.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/1.7...1.11.23)

Signed-off-by: dependabot[bot] <support@github.com>
6 years agoCreate XDATA-software.json
Stephen York [Fri, 24 Jun 2016 22:24:05 +0000 (18:24 -0400)] 
Create XDATA-software.json

6 years agoMoving scotchArgs.R to STOUT REPO scotchStout
poorejc [Sun, 5 Jun 2016 19:31:35 +0000 (15:31 -0400)] 
Moving scotchArgs.R to STOUT REPO

Merged SCO+CH-STOUT branch with Master, in SCO+CH Repo. Then I added scotchArgs.R into STOUT repo

6 years agoImproved D3 task selection
Ubuntu [Wed, 1 Jun 2016 03:24:04 +0000 (03:24 +0000)] 
Improved D3 task selection

6 years agoAdded D3 Histogram
Ubuntu [Wed, 25 May 2016 19:18:35 +0000 (19:18 +0000)] 
Added D3 Histogram

6 years agochanging "status" URLs so they don't conflict with Kibana
Ubuntu [Fri, 20 May 2016 18:19:31 +0000 (18:19 +0000)] 
changing "status" URLs so they don't conflict with Kibana

6 years agoadding intake surveys to user JSON response
Ubuntu [Fri, 20 May 2016 18:19:01 +0000 (18:19 +0000)] 
adding intake surveys to user JSON response

6 years agoText update for Mechanical Turk
Ubuntu [Mon, 16 May 2016 16:42:28 +0000 (16:42 +0000)] 
Text update for Mechanical Turk

6 years agochanging Elastic search field to must
Ubuntu [Fri, 6 May 2016 18:49:12 +0000 (18:49 +0000)] 
changing Elastic search field to must

6 years agomoving ALE_URL to secret.py
Ubuntu [Thu, 5 May 2016 22:33:31 +0000 (22:33 +0000)] 
moving ALE_URL to secret.py

6 years agoChanging to Apache 2.0
Ubuntu [Tue, 3 May 2016 21:36:54 +0000 (21:36 +0000)] 
Changing to Apache 2.0

6 years agochanging to Apache 2.0 license
Ubuntu [Tue, 3 May 2016 21:36:32 +0000 (21:36 +0000)] 
changing to Apache 2.0 license

6 years agoadding SurveyMongo security libraries
Ubuntu [Tue, 3 May 2016 21:24:23 +0000 (21:24 +0000)] 
adding SurveyMongo security libraries

6 years agoremoving path printout
Ubuntu [Tue, 26 Apr 2016 16:53:34 +0000 (16:53 +0000)] 
removing path printout

6 years agofixing dev/prod settings split
Ubuntu [Tue, 26 Apr 2016 16:52:37 +0000 (16:52 +0000)] 
fixing dev/prod settings split

6 years agoseparating dev and prod settings
Ubuntu [Mon, 25 Apr 2016 22:56:10 +0000 (22:56 +0000)] 
separating dev and prod settings

6 years agoseparating production and development settings
Ubuntu [Mon, 25 Apr 2016 22:55:05 +0000 (22:55 +0000)] 
separating production and development settings

6 years agoadding a list of current python library requirements
Ubuntu [Mon, 25 Apr 2016 22:30:32 +0000 (22:30 +0000)] 
adding a list of current python library requirements

6 years agoswitching to correct virtual environment
Ubuntu [Mon, 25 Apr 2016 22:10:15 +0000 (22:10 +0000)] 
switching to correct virtual environment

6 years agoadding more sm update requests
Ubuntu [Thu, 21 Apr 2016 23:09:16 +0000 (23:09 +0000)] 
adding more sm update requests

6 years agomTurk file
Ubuntu [Thu, 21 Apr 2016 22:29:56 +0000 (22:29 +0000)] 
mTurk file

6 years agoadding mechanical turk, stout metadata
Ubuntu [Thu, 21 Apr 2016 22:29:33 +0000 (22:29 +0000)] 
adding mechanical turk, stout metadata

6 years agomissed in last commit
Ubuntu [Wed, 20 Apr 2016 00:28:35 +0000 (00:28 +0000)] 
missed in last commit

6 years agosurvey mongo integration
Ubuntu [Wed, 20 Apr 2016 00:26:07 +0000 (00:26 +0000)] 
survey mongo integration

6 years agofixing copyright notice to reference CSDL
York [Fri, 22 Jan 2016 23:42:36 +0000 (18:42 -0500)] 
fixing copyright notice to reference CSDL

6 years agoXDATA-455: adding default achievements into populate_db
York [Wed, 20 Jan 2016 20:14:01 +0000 (15:14 -0500)] 
XDATA-455: adding default achievements into populate_db

6 years agoXDATA-457 populate_db now reports duplicate data instead of throwing an exception
York [Wed, 20 Jan 2016 20:01:19 +0000 (15:01 -0500)] 
XDATA-457 populate_db now reports duplicate data instead of throwing an exception

6 years agoWe need the STOUT "Session ID" to be passed to User ALE, so adding a quick fix to...
Alex Ford [Mon, 28 Dec 2015 21:03:54 +0000 (16:03 -0500)] 
We need the STOUT "Session ID" to be passed to User ALE, so adding a quick fix to make this happen for the "Begin Task" event.

6 years agoXDATA-452: removed deprecated activity logging code that is incompatible with latest...
Alex Ford [Wed, 23 Dec 2015 19:39:29 +0000 (14:39 -0500)] 
XDATA-452: removed deprecated activity logging code that is incompatible with latest version of User ALE (v3). Also fixed a bug where the User ALE singleton was falling out of scope when the iframe page was switched to the product. (task_launch.html is loaded into an iframe and is switched out, so code that must persist cannot be there.)

6 years agoXDATA-452: fixed a bug where we were trying to send the User ALE message before the...
Alex Ford [Wed, 23 Dec 2015 19:13:03 +0000 (14:13 -0500)] 
XDATA-452: fixed a bug where we were trying to send the User ALE message before the User ALE singleton was ready. (Race condition.)

6 years agoXDATA-452: fixed a bug where the User ALE URL wasn't being passed through to the...
Alex Ford [Wed, 23 Dec 2015 18:56:05 +0000 (13:56 -0500)] 
XDATA-452: fixed a bug where the User ALE URL wasn't being passed through to the template.

6 years agoXDATA-452: removed stale references to logging.js file to reduce confusion. Fixed...
Alex Ford [Wed, 23 Dec 2015 18:03:41 +0000 (13:03 -0500)] 
XDATA-452: removed stale references to logging.js file to reduce confusion. Fixed a bug where the User ALE worker JS file wasn't being referenced correctly.

6 years agoXDATA-452: added the libraries for User ALE connectivity, and instrumented the "begin...
Alex Ford [Wed, 23 Dec 2015 17:32:49 +0000 (12:32 -0500)] 
XDATA-452: added the libraries for User ALE connectivity, and instrumented the "begin task" button so that it would send that event to User ALE.

6 years agoUpdated the text shown to users when they've completed all tasking.
Alex Ford [Fri, 18 Dec 2015 13:42:47 +0000 (08:42 -0500)] 
Updated the text shown to users when they've completed all tasking.

6 years agoFixed a bug where if the total tasks was computed as 0, a DivideByZero exception...
Alex Ford [Thu, 17 Dec 2015 13:36:05 +0000 (08:36 -0500)] 
Fixed a bug where if the total tasks was computed as 0, a DivideByZero exception would be thrown.

6 years agoFixed a bug where if the user didn't have achievements and the code to process them...
Alex Ford [Thu, 17 Dec 2015 13:13:35 +0000 (08:13 -0500)] 
Fixed a bug where if the user didn't have achievements and the code to process them was called, but they didn't have a first or second task, an exception would throw.

6 years agoFixed a bug where the first task wasn't closing correctly.
Alex Ford [Thu, 17 Dec 2015 12:35:08 +0000 (07:35 -0500)] 
Fixed a bug where the first task wasn't closing correctly.

6 years agoSwitched the hardcoded default experiment from fandf to 2015_public_xdataonline.
Alex Ford [Wed, 16 Dec 2015 20:04:10 +0000 (15:04 -0500)] 
Switched the hardcoded default experiment from fandf to 2015_public_xdataonline.

6 years agoXDATA-107 added several of the achievements to STOUT, though it's a bit of a "hack...
Alex Ford [Wed, 16 Dec 2015 19:42:26 +0000 (14:42 -0500)] 
XDATA-107 added several of the achievements to STOUT, though it's a bit of a "hack job" right now. The whole achievement concept needs to be thought out and designed properly before too much more is done.

6 years agoupdated instructions
Clay Gimenez [Tue, 15 Dec 2015 21:27:52 +0000 (16:27 -0500)] 
updated instructions

6 years agoXDATA-455 fixing a bug where the reset from_email was not being set to something...
Alex Ford [Thu, 10 Dec 2015 23:13:41 +0000 (18:13 -0500)] 
XDATA-455 fixing a bug where the reset from_email was not being set to something appropriate that the SMTP server would allow.

6 years agoXDATA-445 updated email address fields (hostname, port, etc.) and added a new convent...
Alex Ford [Thu, 10 Dec 2015 15:52:35 +0000 (10:52 -0500)] 
XDATA-445 updated email address fields (hostname, port, etc.) and added a new convention to help standardize emails in the system via properties in the settings file. Now we should set and use the EMAIL_TO_* and EMAIL_FROM_* properties as much as possible.

6 years agoXDATA-450 adding Google Analytics tracking code to the main index.html template.
Alex Ford [Thu, 10 Dec 2015 15:12:52 +0000 (10:12 -0500)] 
XDATA-450 adding Google Analytics tracking code to the main index.html template.

6 years agoSwitching over to the MySQL database for both development and production. This is...
Alex Ford [Wed, 9 Dec 2015 14:01:01 +0000 (09:01 -0500)] 
Switching over to the MySQL database for both development and production. This is necessary to avoid undetected database differences becoming problems during deployment.

6 years agoXDATA-449 fixing a bug that was introduced with the new user model; last_login is...
Alex Ford [Tue, 8 Dec 2015 21:00:36 +0000 (16:00 -0500)] 
XDATA-449 fixing a bug that was introduced with the new user model; last_login is now required, so this must be set when new users are created.

6 years agoUpdating the registration email message to include a link to the reset page.
Alex Ford [Mon, 7 Dec 2015 23:14:03 +0000 (18:14 -0500)] 
Updating the registration email message to include a link to the reset page.

6 years agoXDATA-440 | adding the sites module to the INSTALLED_APPS list in settings.py and...
Alex Ford [Mon, 7 Dec 2015 22:22:46 +0000 (17:22 -0500)] 
XDATA-440 | adding the sites module to the INSTALLED_APPS list in settings.py and setting the initial SITE_ID to 1.

6 years agoPutting back the check for existing users.
Alex Ford [Sat, 5 Dec 2015 00:59:28 +0000 (00:59 +0000)] 
Putting back the check for existing users.

6 years agoFixed a bug in the production db where last_login must now have a value.
Alex Ford [Sat, 5 Dec 2015 00:55:16 +0000 (00:55 +0000)] 
Fixed a bug in the production db where last_login must now have a value.

6 years agoXDATA-437 - addressing the re-registration error. Also improving some other stuff...
Alex Ford [Fri, 4 Dec 2015 22:39:29 +0000 (17:39 -0500)] 
XDATA-437 - addressing the re-registration error. Also improving some other stuff, like adding client-side form validation.

6 years agoXDATA-438 - updating the registration email text.
Alex Ford [Fri, 4 Dec 2015 21:48:51 +0000 (16:48 -0500)] 
XDATA-438 - updating the registration email text.

6 years agoMerge branch 'testing' of https://github.com/draperlaboratory/stout into testing
Alex Ford [Fri, 4 Dec 2015 21:20:23 +0000 (16:20 -0500)] 
Merge branch 'testing' of https://github.com/draperlaboratory/stout into testing

6 years agocommented achievements
unknown [Fri, 4 Dec 2015 20:12:06 +0000 (15:12 -0500)] 
commented achievements

6 years agomore rebranding and text updates
unknown [Fri, 4 Dec 2015 20:07:09 +0000 (15:07 -0500)] 
more rebranding and text updates

6 years agoAdding myself to the list of contributors! :)
Alex Ford [Thu, 3 Dec 2015 22:45:46 +0000 (17:45 -0500)] 
Adding myself to the list of contributors! :)

6 years agoMerge branch 'testing' of https://github.com/draperlaboratory/stout into testing
Alex Ford [Thu, 3 Dec 2015 22:44:52 +0000 (17:44 -0500)] 
Merge branch 'testing' of https://github.com/draperlaboratory/stout into testing

Conflicts:
op_tasks/templates/intro.html
op_tasks/templates/registration/login.html
op_tasks/templates/registration/register.html
xdata/templates/page.html

6 years agoXDATA-436 after merging in the 'rebranding' branch into the 'testing' branch, updated...
Alex Ford [Thu, 3 Dec 2015 21:39:25 +0000 (16:39 -0500)] 
XDATA-436 after merging in the 'rebranding' branch into the 'testing' branch, updated the styles used when listing the intake questionnaire on the task list.

6 years agoMerge branch 'rebranding' into testing
Alex Ford [Thu, 3 Dec 2015 21:28:17 +0000 (16:28 -0500)] 
Merge branch 'rebranding' into testing

6 years agoXDATA-439 implementing EmailUser from module custom_user which satisfies the "usernam...
Alex Ford [Thu, 3 Dec 2015 17:38:38 +0000 (12:38 -0500)] 
XDATA-439 implementing EmailUser from module custom_user which satisfies the "username length" problem, but also properly implements using email as the "username" instead of having a separate user name field.

6 years agoRemoved debugging alert that shouldn't be in production.
Alex Ford [Thu, 3 Dec 2015 00:44:29 +0000 (19:44 -0500)] 
Removed debugging alert that shouldn't be in production.

6 years agoFixing a bug where if a user doesn't have an experiment defined, the new code for...
Alex Ford [Wed, 2 Dec 2015 23:28:15 +0000 (18:28 -0500)] 
Fixing a bug where if a user doesn't have an experiment defined, the new code for intake introduces an out of bounds error when trying to list that user's tasks (which is of course, zero).

6 years agoAdding default value for new intake field so that migrations can go smoother.
Alex Ford [Wed, 2 Dec 2015 23:20:08 +0000 (18:20 -0500)] 
Adding default value for new intake field so that migrations can go smoother.

6 years agoXDATA-431 implementing the ability to set an intake questionnaire url, and have it...
Alex Ford [Wed, 2 Dec 2015 22:39:16 +0000 (17:39 -0500)] 
XDATA-431 implementing the ability to set an intake questionnaire url, and have it displayed as a task item. This currently follows more of the instructions task items rather than the optask task item approach, so it's a little "hacky."

6 years agoFixes XDATA-433, prevent excessive login attempts.
Alex Ford [Mon, 23 Nov 2015 22:51:32 +0000 (17:51 -0500)] 
Fixes XDATA-433, prevent excessive login attempts.

6 years agoinitial rebranding rebranding
unknown [Mon, 23 Nov 2015 05:51:30 +0000 (00:51 -0500)] 
initial rebranding

6 years agoupdate registration to specific experiment
Dan Traviglia [Sun, 15 Nov 2015 21:00:29 +0000 (16:00 -0500)] 
update registration to specific experiment

6 years agoupdated with consent form and new experiment text"
Dan Traviglia [Sun, 15 Nov 2015 18:37:13 +0000 (13:37 -0500)] 
updated with consent form and new experiment text"

6 years agoupdated settings with secret secret key
Dan Traviglia [Thu, 12 Nov 2015 19:18:42 +0000 (14:18 -0500)] 
updated settings with secret secret key

6 years agoadded developer portal back
Dan Traviglia [Fri, 6 Nov 2015 19:02:21 +0000 (14:02 -0500)] 
added developer portal back

6 years agodisabled activity count retrieval from ALE endpoint
Dan Traviglia [Fri, 6 Nov 2015 18:44:27 +0000 (13:44 -0500)] 
disabled activity count retrieval from ALE endpoint

6 years agoupdate ALE endpoing in javascript
Dan Traviglia [Fri, 6 Nov 2015 18:36:39 +0000 (13:36 -0500)] 
update ALE endpoing in javascript

6 years agoadded ALE endpoint to settings.py and referenced in op_tasks.views.py
Dan Traviglia [Fri, 6 Nov 2015 18:23:14 +0000 (13:23 -0500)] 
added ALE endpoint to settings.py and referenced in op_tasks.views.py

6 years agomoved email authorization to allow registration emails
Dan Traviglia [Fri, 6 Nov 2015 02:47:09 +0000 (21:47 -0500)] 
moved email authorization to allow registration emails

6 years agoMerge branch 'security' into testing
Dan Traviglia [Thu, 5 Nov 2015 21:14:11 +0000 (16:14 -0500)] 
Merge branch 'security' into testing

6 years agodelete conflicts from merge with achievements; mostly security stuff
Dan Traviglia [Thu, 5 Nov 2015 21:08:24 +0000 (16:08 -0500)] 
delete conflicts from merge with achievements; mostly security stuff

6 years agoMerge branch 'achievements' into testing
Dan Traviglia [Thu, 5 Nov 2015 20:44:33 +0000 (15:44 -0500)] 
Merge branch 'achievements' into testing

6 years agoadded authorization to all exp_portal and upload pages
Dan Traviglia [Thu, 5 Nov 2015 19:00:06 +0000 (14:00 -0500)] 
added authorization to all exp_portal and upload pages

6 years agoMerge branch 'dashboard' into testing
Dan Traviglia [Thu, 5 Nov 2015 15:56:12 +0000 (10:56 -0500)] 
Merge branch 'dashboard' into testing

6 years ago- added authentication to developer page
Dan Traviglia [Thu, 5 Nov 2015 15:48:16 +0000 (10:48 -0500)] 
- added authentication to developer page
- added accuracy placeholders to userprofile

6 years ago- updated models with 255 length strings for url
Ubuntu [Wed, 4 Nov 2015 22:00:30 +0000 (22:00 +0000)] 
- updated models with 255 length strings for url
- removed unique on url for product
- removed database encryption from views.py
- changed db to mysql from sqlite

6 years agoencryption functions and logging in views.py; AXES throttling prevention in settings.py
Ubuntu [Tue, 13 Oct 2015 18:26:11 +0000 (18:26 +0000)] 
encryption functions and logging in views.py; AXES throttling prevention in settings.py

6 years agoadd authorization to tasks views in exp_portal
Dan Traviglia [Tue, 13 Oct 2015 01:50:31 +0000 (21:50 -0400)] 
add authorization to tasks views in exp_portal

6 years agoupdated achievements tests
Dan Traviglia [Tue, 13 Oct 2015 01:05:00 +0000 (21:05 -0400)] 
updated achievements tests

6 years agoadd tests for achievements. achievements mostly functional
Dan Traviglia [Tue, 13 Oct 2015 01:02:28 +0000 (21:02 -0400)] 
add tests for achievements. achievements mostly functional

6 years agoAdded row shading to dashboard tray even <li>s to increase reability of long lists.
Kyle Finley [Fri, 2 Oct 2015 19:15:42 +0000 (15:15 -0400)] 
Added row shading to dashboard tray even <li>s to increase reability of long lists.

6 years agoMerge branch 'dashboard' into testing
Dan Traviglia [Fri, 2 Oct 2015 16:25:56 +0000 (12:25 -0400)] 
Merge branch 'dashboard' into testing

6 years agoupdate login required on uploads
Dan Traviglia [Fri, 2 Oct 2015 16:23:30 +0000 (12:23 -0400)] 
update login required on uploads

6 years agoMade a more thorough comment to django template code for poplulating metrics tool...
Kyle Finley [Fri, 2 Oct 2015 16:00:55 +0000 (12:00 -0400)] 
Made a more thorough comment to django template code for poplulating metrics tool dropdown. Added overflow to metrics body for long lists. Added animation test for dropdown to ensure it's not displayed behind another exp row.

6 years agologin required added to multiple pages
Dan Traviglia [Fri, 2 Oct 2015 15:09:34 +0000 (11:09 -0400)] 
login required added to multiple pages

6 years agoChanged the variable names to select the correct master answer columns.
Kyle Finley [Wed, 30 Sep 2015 13:29:33 +0000 (09:29 -0400)] 
Changed the variable names to select the correct master answer columns.

6 years agoUpdated the url and any instance of 'list' in the uploads module to 'expuploads'.
Kyle Finley [Tue, 29 Sep 2015 19:42:41 +0000 (15:42 -0400)] 
Updated the url and any instance of 'list' in the uploads module to 'expuploads'.

6 years agoupdate achievements
Dan Traviglia [Tue, 29 Sep 2015 19:33:50 +0000 (15:33 -0400)] 
update achievements

6 years agoChanged logic so that the D3 charts show up on initial load. Removed logic that refre...
Kyle Finley [Tue, 29 Sep 2015 15:55:48 +0000 (11:55 -0400)] 
Changed logic so that the D3 charts show up on initial load. Removed logic that refreshes only the chart view being changed. Commented out the Activity metric.

6 years agoAdded /static/results/* to gitignore. Updated expPortal views.py to include all metri...
Kyle Finley [Mon, 28 Sep 2015 21:33:11 +0000 (17:33 -0400)] 
Added /static/results/* to gitignore. Updated expPortal views.py to include all metrics (sans activity). Now also loading tool select dynamially.

6 years agopilot test achievements model
Dan Traviglia [Mon, 28 Sep 2015 14:55:48 +0000 (10:55 -0400)] 
pilot test achievements model

6 years agoMerge branch 'testing' of https://bitbucket.org/dtraviglia/stout into dashboard
Kyle Finley [Fri, 25 Sep 2015 18:25:25 +0000 (14:25 -0400)] 
Merge branch 'testing' of https://bitbucket.org/dtraviglia/stout into dashboard

6 years agoAdded a js file for uploads module. Added ipython notebook code to views.py for the...
Kyle Finley [Fri, 25 Sep 2015 18:22:24 +0000 (14:22 -0400)] 
Added a js file for uploads module. Added ipython notebook code to views.py for the exp_portal module.

6 years agomerge with email branch (also includes some dashboard updates)
Dan Traviglia [Tue, 22 Sep 2015 16:22:24 +0000 (12:22 -0400)] 
Merge ... email branch (also includes some dashboard updates)

6 years agoMerge branch 'email' of https://bitbucket.org/dtraviglia/stout into email
Kyle Finley [Tue, 22 Sep 2015 16:11:47 +0000 (12:11 -0400)] 
Merge branch 'email' of https://bitbucket.org/dtraviglia/stout into email

6 years agoAdded if-else statements in email.py to display different status messages based on...
Kyle Finley [Tue, 22 Sep 2015 16:10:30 +0000 (12:10 -0400)] 
Added if-else statements in email.py to display different status messages based on success or error in sending email. Updated the style of the send email button. Moved the status message div next to the submit button.