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

List:       markus-dev
Subject:    [MarkUs-dev] [MarkUsProject/Markus] ab98be: issue-2561: Only show texts for current assignment
From:       GitHub <noreply () github ! com>
Date:       2016-08-22 23:23:52
Message-ID: 57bb8988ada7f_36e33ffb81fd313c1264e8 () hookshot-fe6-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]

Branch: refs/heads/master
  Home:   https://github.com/MarkUsProject/Markus
  Commit: ab98be06039a4e7e57e88e43de0ea9c4152df7f5
      https://github.com/MarkUsProject/Markus/commit/ab98be06039a4e7e57e88e43de0ea9c4152df7f5
  Author: Christine Murad <christine.murad@mail.utoronto.ca>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

  Changed paths:
    M app/controllers/annotation_categories_controller.rb

  Log Message:
  -----------
  issue-2561: Only show texts for current assignment


  Commit: d8891e3dfbe98dc8938378a378a55bf460c49a66
      https://github.com/MarkUsProject/Markus/commit/d8891e3dfbe98dc8938378a378a55bf460c49a66
  Author: Christine Murad <christine.murad@mail.utoronto.ca>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

  Changed paths:
    M app/controllers/annotation_categories_controller.rb

  Log Message:
  -----------
  issue-2561: Used a join instead of going through so many associations


  Commit: 2d26e474025008780a8a78727955c0ae0c2a109f
      https://github.com/MarkUsProject/Markus/commit/2d26e474025008780a8a78727955c0ae0c2a109f
  Author: david-yz-liu <david@cs.toronto.edu>
  Date:   2016-08-22 (Mon, 22 Aug 2016)

  Changed paths:
    M app/controllers/annotation_categories_controller.rb

  Log Message:
  -----------
  Merge branch 'issue-2561' of https://github.com/christinem/Markus


  Commit: e8cf9912d736a4b5f1daec0a31f17870db0bb5f3
      https://github.com/MarkUsProject/Markus/commit/e8cf9912d736a4b5f1daec0a31f17870db0bb5f3
  Author: david-yz-liu <david@cs.toronto.edu>
  Date:   2016-08-22 (Mon, 22 Aug 2016)

  Changed paths:
    M app/controllers/annotation_categories_controller.rb
    M spec/controllers/annotation_categories_controller_spec.rb

  Log Message:
  -----------
  Get annotation texts from annotation categories


Compare: https://github.com/MarkUsProject/Markus/compare/7d4cb83dc8d9...e8cf9912d736

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