added assigned pages
Editing assignments
Editing assignments
Fixing little bugs
added attribute normalizers for experimenter and categories (slugs == tags)
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch feature/experiment
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   app/models/category.rb
#	modified:   app/models/experiment.rb
#	modified:   app/models/experimenter.rb
#
text is changed on experiment page: assigned, participated. Also on the subject pool page: button - assign subjects and label: never participated before
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch ppod-fixes
# Your branch is ahead of 'origin/ppod-fixes' by 1 commit.
#   (use "git push" to publish your local commits)
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   app/views/experiments/_subject_pool.html.slim
#	modified:   app/views/profiles/_form.html.slim
#
Sociology added to majors
Added the number of assigned subjects to SP and again correction of texts
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch ppod-fixes
# Your branch is ahead of 'origin/ppod-fixes' by 1 commit.
#   (use "git push" to publish your local commits)
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   app/views/experiments/_subject_pool.html.slim
#	modified:   app/views/profiles/_form.html.slim
#
remove session button fixed
Issue #29 closed
Refined assignment
Added migrations
little fix
fixes
models
message
fixing merge conflict