[prev in list] [next in list] [prev in thread] [next in thread] 

List:       markus-dev
Subject:    [MarkUs-dev] [MarkUsProject/Markus] abc045: Fixed styling issues with the marks.rake file. Als...
From:       GitHub <noreply () github ! com>
Date:       2015-07-24 13:51:53
Message-ID: 55b242f9f2413_614e3fc5288912a05699d () hookshot-fe2-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]

Branch: refs/heads/master
  Home:   https://github.com/MarkUsProject/Markus
  Commit: abc0454af075d8543a62ab269c990a7cb099f753
      https://github.com/MarkUsProject/Markus/commit/abc0454af075d8543a62ab269c990a7cb099f753
  Author: PatGuan <vagrant@vagrant-ubuntu-precise-32.(none)>
  Date:   2015-07-20 (Mon, 20 Jul 2015)

  Changed paths:
    M db/seeds.rb
    A lib/tasks/marks.rake

  Log Message:
  -----------
  Fixed styling issues with the marks.rake file. Also submitting through a new pull \
request due to rebase issues


  Commit: 10a2806a9c58a2c82ce5a4e1bd99aa61e6ba0e37
      https://github.com/MarkUsProject/Markus/commit/10a2806a9c58a2c82ce5a4e1bd99aa61e6ba0e37
  Author: PatGuan <vagrant@vagrant-ubuntu-precise-32.(none)>
  Date:   2015-07-23 (Thu, 23 Jul 2015)

  Changed paths:
    M app/helpers/grade_entry_forms_helper.rb
    M app/views/grade_entry_forms/_boot.js.erb
    M app/views/grade_entry_forms/_form.html.erb
    M app/views/grade_entry_forms/_grade_entry_item.html.erb
    M app/views/grade_entry_forms/edit.html.erb
    M app/views/grade_entry_forms/new.html.erb
    M config/locales/en.yml
    M config/locales/fr.yml
    M config/locales/pt.yml
    M test/functional/grade_entry_forms_controller_test.rb

  Log Message:
  -----------
  Merge https://github.com/PatGuan/Markus into AutomateFakeMarks


  Commit: 03dcfa1432a73476264982039d682ddf17ad196d
      https://github.com/MarkUsProject/Markus/commit/03dcfa1432a73476264982039d682ddf17ad196d
  Author: PatGuan <vagrant@vagrant-ubuntu-precise-32.(none)>
  Date:   2015-07-23 (Thu, 23 Jul 2015)

  Changed paths:
    M Gemfile.lock
    M lib/tasks/marks.rake

  Log Message:
  -----------
  Fixed the submission tables to be now green when collected and fixed a bug where A2 \
and A4 did not have rubric criterias


  Commit: 3a9d0254114dbe56286e86102ec75f0bc040a6e8
      https://github.com/MarkUsProject/Markus/commit/3a9d0254114dbe56286e86102ec75f0bc040a6e8
  Author: PatGuan <vagrant@vagrant-ubuntu-precise-32.(none)>
  Date:   2015-07-24 (Fri, 24 Jul 2015)

  Changed paths:
    M lib/tasks/marks.rake

  Log Message:
  -----------
  Fixed marks.rake so that it A2 and A4 use flexible criteria


  Commit: 1cc2c1f3f0f74bc35da53b9769178bec3444ade4
      https://github.com/MarkUsProject/Markus/commit/1cc2c1f3f0f74bc35da53b9769178bec3444ade4
  Author: david-yz-liu <liudavid@cs.toronto.edu>
  Date:   2015-07-24 (Fri, 24 Jul 2015)

  Changed paths:
    M Gemfile.lock
    M lib/tasks/assignments.rake
    M lib/tasks/marks.rake

  Log Message:
  -----------
  some extra tweaks to make marks seeding work


Compare: https://github.com/MarkUsProject/Markus/compare/101027786bff...1cc2c1f3f0f7



_______________________________________________
Markus-dev mailing list
Markus-dev@markusproject.org
http://markusproject.org/cgi-bin/mailman/listinfo/markus-dev


[prev in list] [next in list] [prev in thread] [next in thread]