Commits

Branch selector

 master

User selector

All users

Datepicker

All time

Commit History

Commits on Sep 17, 2012

• fixed bug when subject is already found in the database

  dmarkant

  committed
  8c3bb23

  Copy full SHA for 8c3bb23

Commits on Jun 15, 2012

• /inexp now returns a mesage (basically just gets rid of an error message)

  johnmcdonnell

  committed
  893afc4

  Copy full SHA for 893afc4

Commits on Jun 5, 2012

• Prototype for a gui to credit participants.

  johnmcdonnell

  committed
  3ecb36f

  Copy full SHA for 3ecb36f

Commits on Jun 1, 2012

• Simplified counterbalance chooser.

  johnmcdonnell

  committed
  7a95a6e

  Copy full SHA for 7a95a6e

Commits on Apr 16, 2012

• Merge branch 'master' of github.com:johnmcdonnell/psiTurk

  johnmcdonnell

  committed
  c60413b

  Copy full SHA for c60413b

• typo, and realized my indexing syntax didn't work

  johnmcdonnell

  committed
  ea08a01

  Copy full SHA for ea08a01

• typo

  johnmcdonnell

  committed
  5f16b9d

  Copy full SHA for 5f16b9d

Commits on Apr 15, 2012

• More appropriate to choose counter within condition.

  johnmcdonnell

  committed
  dd2e4eb

  Copy full SHA for dd2e4eb

• Logging now inludes timestamp.

  johnmcdonnell

  committed
  0cae70b

  Copy full SHA for 0cae70b

Commits on Apr 13, 2012

• Hopefully final fix for ORM updates.

  johnmcdonnell

  committed
  db69992

  Copy full SHA for db69992

• Added db commits for all updates.

  johnmcdonnell

  committed
  6c55919

  Copy full SHA for 6c55919

Commits on Apr 12, 2012

• Redid ORM, I think it wasn't always closing the connection properly before.

  johnmcdonnell

  committed
  872b2c7

  Copy full SHA for 872b2c7

Commits on Mar 31, 2012

• Removed redundant code in condition/counter chooser; removed unused random seeding stuff.

  johnmcdonnell

  committed
  2f335f0

  Copy full SHA for 2f335f0

• More cleanup, eliminated some atavisms.

  johnmcdonnell

  committed
  03f316f

  Copy full SHA for 03f316f

• Merge remote-tracking branch 'smash/master'

  johnmcdonnell

  committed
  69f1e66

  Copy full SHA for 69f1e66

• Just a little inconsequential cleanup.

  johnmcdonnell

  committed
  7c47824

  Copy full SHA for 7c47824

Commits on Mar 29, 2012

• Keeping the config file out of git.

  johnmcdonnell

  committed
  d6ae9b2

  Copy full SHA for d6ae9b2

• Fixed questionnaire formatting.

  johnmcdonnell

  committed
  c8ed68c

  Copy full SHA for c8ed68c

• Using Flask's built-in error handlers.

  johnmcdonnell

  committed
  3db951b

  Copy full SHA for 3db951b

Commits on Mar 19, 2012

• Made port configurable in the config file.

  johnmcdonnell

  committed
  06d3a09

  Copy full SHA for 06d3a09

• Error handling in this case.

  johnmcdonnell

  committed
  7f3b949

  Copy full SHA for 7f3b949

• Removed some non-stylesheet coloring.

  johnmcdonnell

  committed
  aa20aab

  Copy full SHA for aa20aab

• Merged in app.py changes

  johnmcdonnell

  committed
  571b0d3

  Copy full SHA for 571b0d3

• Removed redundant app.py interface.

  johnmcdonnell

  committed
  2aaa330

  Copy full SHA for 2aaa330

Commits on Mar 14, 2012

• Made server debug mode adjustable in the config file.

  johnmcdonnell

  committed
  fe96c92

  Copy full SHA for fe96c92

• Some refactoring, also cleared the log.

  johnmcdonnell

  committed
  6be4422

  Copy full SHA for 6be4422

Commits on Feb 25, 2012

• Added balance check script.

  johnmcdonnell

  committed
  dbba546

  Copy full SHA for dbba546

• Switching mturk readme from rest to markdown.

  johnmcdonnell

  committed
  d5cb8b4

  Copy full SHA for d5cb8b4

• Updating mturk folder readme.

  johnmcdonnell

  committed
  91ba209

  Copy full SHA for 91ba209

• Now does it look right?

  johnmcdonnell

  committed
  98b5473

  Copy full SHA for 98b5473

• Hopefully the code snippets look right now.

  johnmcdonnell

  committed
  91667eb

  Copy full SHA for 91667eb

• Don't know what htis was doing here.

  johnmcdonnell

  committed
  7e67bec

  Copy full SHA for 7e67bec

• Duplicate detection may have been buggy, server logging makes more sense, readme updated.

  johnmcdonnell

  committed
  d89fcd0

  Copy full SHA for d89fcd0

Commits on Feb 22, 2012

• dumpdata fixed for multiple subjects.

  johnmcdonnell

  committed
  2bcf714

  Copy full SHA for 2bcf714

• Added config file and configured logging.

  johnmcdonnell

  committed
  e878cc7

  Copy full SHA for e878cc7

Pagination

Previous

Next