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

List:       markus-dev
Subject:    [MarkUs-dev] [MarkUsProject/Markus] 7d4bca: Merge pull request #2356 from david-yz-liu/fix-upd...
From:       GitHub <noreply () github ! com>
Date:       2015-11-18 3:33:01
Message-ID: 564bf16d59b66_7d963fc82b3ab2bc528d6 () hookshot-fe1-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]

Branch: refs/heads/master
  Home:   https://github.com/MarkUsProject/Markus
  Commit: 7d4bcaaea514f460e38752d3390c166199073eac
      https://github.com/MarkUsProject/Markus/commit/7d4bcaaea514f460e38752d3390c166199073eac
  Author: David Liu <david@cs.toronto.edu>
  Date:   2015-11-15 (Sun, 15 Nov 2015)

  Changed paths:
    M app/controllers/annotations_controller.rb
    M config/routes.rb

  Log Message:
  -----------
  Merge pull request #2356 from david-yz-liu/fix-update-annotation-route

fix update-annotation route


  Commit: 0a6557933b8d7c1e1839ba93db74c1d5661510c1
      https://github.com/MarkUsProject/Markus/commit/0a6557933b8d7c1e1839ba93db74c1d5661510c1
  Author: David Liu <liudavid@cs.toronto.edu>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M app/controllers/marking_schemes_controller.rb
    M app/views/marking_schemes/edit.js.erb
    M app/views/marking_schemes/index.html.erb
    M app/views/marking_schemes/new.js.erb

  Log Message:
  -----------
  Fix marking scheme bugs


  Commit: 44bea16acc44f907c2b40c3ecd36ec4b7143e40e
      https://github.com/MarkUsProject/Markus/commit/44bea16acc44f907c2b40c3ecd36ec4b7143e40e
  Author: David Liu <david@cs.toronto.edu>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M app/controllers/marking_schemes_controller.rb
    M app/views/marking_schemes/edit.js.erb
    M app/views/marking_schemes/index.html.erb
    M app/views/marking_schemes/new.js.erb

  Log Message:
  -----------
  Merge pull request #2360 from david-yz-liu/marking-scheme-fix

Marking scheme fix


Compare: https://github.com/MarkUsProject/Markus/compare/79113e8ca7ef...44bea16acc44

_______________________________________________
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]