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

List:       markus-dev
Subject:    [MarkUs-dev] [MarkUsProject/Markus] f04508: setting default associated criteria_assignment_fil...
From:       GitHub <noreply () github ! com>
Date:       2017-06-15 17:31:37
Message-ID: 5942c479459cd_67233fbc69905c3070828 () hookshot-fe2-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]

Branch: refs/heads/master
  Home:   https://github.com/MarkUsProject/Markus
  Commit: f045089bb2eec3917b93189e8fe39a37c2b920e0
      https://github.com/MarkUsProject/Markus/commit/f045089bb2eec3917b93189e8fe39a37c2b920e0
  Author: jenachoi <jena.choi1106@gmail.com>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M app/models/template_division.rb
    M lib/tasks/scanned_exam.rake

  Log Message:
  -----------
  setting default associated criteria_assignment_files_join everytime template \
division is created or saved


  Commit: 294a012b2513bb6f26235d2bea4e78045a9b6333
      https://github.com/MarkUsProject/Markus/commit/294a012b2513bb6f26235d2bea4e78045a9b6333
  Author: jenachoi <jena.choi1106@gmail.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M app/models/template_division.rb

  Log Message:
  -----------
  improving code


  Commit: 631513b7d7b34f72bfbe31f85f73ce907de3cb39
      https://github.com/MarkUsProject/Markus/commit/631513b7d7b34f72bfbe31f85f73ce907de3cb39
  Author: jenachoi <jena.choi1106@gmail.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M app/models/template_division.rb

  Log Message:
  -----------
  criteria has only label as a name


  Commit: cd784543f0e8515748a80073d96e637d71dbb8bd
      https://github.com/MarkUsProject/Markus/commit/cd784543f0e8515748a80073d96e637d71dbb8bd
  Author: jenachoi <jena.choi1106@gmail.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M app/models/template_division.rb

  Log Message:
  -----------
  create->new


  Commit: ebcd64ad79b4640ca7ba82fa2592d7841205e95c
      https://github.com/MarkUsProject/Markus/commit/ebcd64ad79b4640ca7ba82fa2592d7841205e95c
  Author: jenachoi <jena.choi1106@gmail.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    A app/jobs/split_pdf_job.rb
    M app/models/criteria_assignment_files_join.rb
    M app/models/exam_template.rb
    M app/models/template_division.rb
    M lib/markus_configurator.rb

  Log Message:
  -----------
  merge branch 'master' into set-defaults-for-template-division


  Commit: d3e8e6a9c0a939015f63725323d9316390fd174b
      https://github.com/MarkUsProject/Markus/commit/d3e8e6a9c0a939015f63725323d9316390fd174b
  Author: jenachoi <jena.choi1106@gmail.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M app/models/template_division.rb

  Log Message:
  -----------
  forgot to delete this when pulled


  Commit: b7ef65b40d90b3af9bfd72fb780c8a615b2e76cf
      https://github.com/MarkUsProject/Markus/commit/b7ef65b40d90b3af9bfd72fb780c8a615b2e76cf
  Author: jenachoi <jena.choi1106@gmail.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M app/models/template_division.rb

  Log Message:
  -----------
  think it should be 'create' instead of 'new' for CriteriaAssignmentFilesJoin


  Commit: d4a29b5af49682a9e08769241356967850a4c094
      https://github.com/MarkUsProject/Markus/commit/d4a29b5af49682a9e08769241356967850a4c094
  Author: David Liu <david@cs.toronto.edu>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M app/models/template_division.rb
    M lib/tasks/scanned_exam.rake

  Log Message:
  -----------
  Merge pull request #3070 from jenachoi/set-defaults-for-template-division

setting default associated criteria_assignment_files_join when emplate division is \
created or updated


Compare: https://github.com/MarkUsProject/Markus/compare/b722f139bdf4...d4a29b5af496



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