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

List:       markus-dev
Subject:    [MarkUs-dev] [MarkUsProject/Markus] e2db29: Made the remarks able to have marks added. The pro...
From:       GitHub <noreply () github ! com>
Date:       2015-02-28 5:05:37
Message-ID: 54f14ca163e38_19b93feabe47f2a050199 () hookshot-fe1-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]

Branch: refs/heads/master
  Home:   https://github.com/MarkUsProject/Markus
  Commit: e2db29ee60fcb995795f0cf99faacb98bf926600
      https://github.com/MarkUsProject/Markus/commit/e2db29ee60fcb995795f0cf99faacb98bf926600
  Author: Christian Millar <christian_millar@msn.com>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

  Changed paths:
    M app/views/results/marker/_marker_summary.html.erb

  Log Message:
  -----------
  Made the remarks able to have marks added. The problem was that there were two \
extra marks lists - the old list, and the remark. When there's a remark, the old \
marks list appears before the new one in the html, so the add extra mark button puts \
the dialogue on that html (you'll have to look at the source of the page to see it. \
So, I swapped their order. Also, made the old marks hidden by default, since they \
weren't before.


  Commit: 178bde005b48a1b3e46249ae8b8ddca750508602
      https://github.com/MarkUsProject/Markus/commit/178bde005b48a1b3e46249ae8b8ddca750508602
  Author: Christian Millar <christian_millar@msn.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M app/views/results/student/_student_summary.html.erb

  Log Message:
  -----------
  Added the hide marks fix to post-submit summaries


  Commit: 40cd3a9aed132ebe4624bf762e2a1cec99f5462a
      https://github.com/MarkUsProject/Markus/commit/40cd3a9aed132ebe4624bf762e2a1cec99f5462a
  Author: Christian Millar <christian_millar@msn.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLine.js
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLineAnnotations.js
    M app/assets/stylesheets/common/SyntaxHighlighter.scss
    M app/controllers/annotations_controller.rb
    M app/controllers/results_controller.rb
    M app/controllers/submissions_controller.rb
    M app/helpers/submissions_helper.rb
    M app/models/grouping.rb
    M app/models/text_annotation.rb
    M app/views/annotations/_annotation_categories.html.erb
    M app/views/annotations/add_existing_annotation.js.erb
    M app/views/annotations/create.js.erb
    M app/views/results/common/_annotations.js.erb
    M app/views/results/common/_text_codeviewer.html.erb
    M app/views/results/edit.html.erb
    M app/views/results/marker/_marker_panes.html.erb
    M app/views/results/marker/_setup_annotation_categories.js.erb
    M app/views/results/student/_remark_request_form.html.erb
    M app/views/results/student/_student_panes.html.erb
    A db/migrate/20150201040434_add_columns_to_annotations.rb
    M test/blueprints/blueprints.rb
    M test/functional/results_controller_test.rb

  Log Message:
  -----------
  Merge branch 'master' of git://github.com/MarkUsProject/Markus into \
1869-add-extra-mark-on-remark


  Commit: bc1371e1bd5b44edb9c2be94b9d1a035fb8053a5
      https://github.com/MarkUsProject/Markus/commit/bc1371e1bd5b44edb9c2be94b9d1a035fb8053a5
  Author: David Liu <liudavid@cs.toronto.edu>
  Date:   2015-02-28 (Sat, 28 Feb 2015)

  Changed paths:
    M app/views/results/marker/_marker_summary.html.erb
    M app/views/results/student/_student_summary.html.erb

  Log Message:
  -----------
  Merge pull request #2056 from Eitredes/1869-add-extra-mark-on-remark

Made the remarks able to have marks added. Fixes #1869


Compare: https://github.com/MarkUsProject/Markus/compare/b6545ededc48...bc1371e1bd5b



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