'[MarkUs-dev] [MarkUsProject/Markus] f32cdd: Added views for split pdf progress bar'

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

List:       markus-dev
Subject:    [MarkUs-dev] [MarkUsProject/Markus] f32cdd: Added views for split pdf progress bar
From:       GitHub <noreply () github ! com>
Date:       2017-06-30 13:13:13
Message-ID: 59564e69b3048_3733f9b1f75bc3893344 () hookshot-fe5-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]

Branch: refs/heads/master
  Home:   https://github.com/MarkUsProject/Markus
  Commit: f32cdd9246fa5b9382a6377f03d5557bb080a85f
      https://github.com/MarkUsProject/Markus/commit/f32cdd9246fa5b9382a6377f03d5557bb080a85f
  Author: Rathu Kugan <rathu.kugan@gmail.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M app/models/exam_template.rb
    A app/views/exam_templates/_poll_split_job.js.erb
    M app/views/exam_templates/_split_form.html.erb

  Log Message:
  -----------
  Added views for split pdf progress bar

  Commit: ca4188de31e2c93b32ff5df4af6511bf3013c163
      https://github.com/MarkUsProject/Markus/commit/ca4188de31e2c93b32ff5df4af6511bf3013c163
  Author: Rathu Kugan <rathu.kugan@gmail.com>
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
    M app/controllers/exam_templates_controller.rb
    M app/views/exam_templates/_split_form.html.erb

  Log Message:
  -----------
  Added redirect to logs for split controller

  Commit: 01339208dd680501b1766dfee842268f3c4e4206
      https://github.com/MarkUsProject/Markus/commit/01339208dd680501b1766dfee842268f3c4e4206
  Author: Rathu Kugan <rathu.kugan@gmail.com>
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
    M app/controllers/exam_templates_controller.rb
    M app/views/exam_templates/view_logs.html.erb

  Log Message:
  -----------
  Redirect and flash message working with view logs

  Commit: fae7ceeafce57a0879bb5b8dc2b742306fd9797f
      https://github.com/MarkUsProject/Markus/commit/fae7ceeafce57a0879bb5b8dc2b742306fd9797f
  Author: Rathu Kugan <rathu.kugan@gmail.com>
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
    R app/views/exam_templates/_poll_split_job.js.erb

  Log Message:
  -----------
  Removed split poll job js file

  Commit: 7f8ed1baddb5be34bf507864dc4e99d04decdc9f
      https://github.com/MarkUsProject/Markus/commit/7f8ed1baddb5be34bf507864dc4e99d04decdc9f
  Author: Rathu Kugan <rathu.kugan@gmail.com>
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
    M app/jobs/split_pdf_job.rb

  Log Message:
  -----------
  Fixed progress values for split job

  Commit: 4fb0a53252d25b9951294344c7f4cf3d96c47f15
      https://github.com/MarkUsProject/Markus/commit/4fb0a53252d25b9951294344c7f4cf3d96c47f15
  Author: Rathu Kugan <rathu.kugan@gmail.com>
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
    M app/assets/javascripts/Grader/file_selector.js
    M app/assets/javascripts/MathJax/mathjax_helpers.js
    M app/assets/stylesheets/grader.scss
    M app/controllers/exam_templates_controller.rb
    M app/jobs/generate_job.rb
    M app/models/criteria_assignment_files_join.rb
    M app/models/exam_template.rb
    M app/views/annotations/_annotation_modal.html.erb
    M app/views/exam_templates/_generate_form.html.erb
    A app/views/exam_templates/_poll_generate_job.js.erb
    M app/views/results/common/_file_selector_dropdown.html.erb
    M app/views/results/edit.html.erb
    M app/views/results/marker/_keybinding.js.erb
    M bin/markus
    M config/locales/en.yml
    M config/locales/es.yml
    M config/locales/fr.yml
    M config/locales/pt.yml
    M config/locales/views/exam_templates/en.yml
    M config/locales/views/exam_templates/es.yml
    M config/locales/views/exam_templates/fr.yml
    M config/locales/views/exam_templates/pt.yml
    M config/routes.rb

  Log Message:
  -----------
  Merge branch 'master' of git://github.com/MarkUsProject/Markus into split-progress

  Commit: 261002d3f6fe237899b0b6c0b0b420cda5a21473
      https://github.com/MarkUsProject/Markus/commit/261002d3f6fe237899b0b6c0b0b420cda5a21473
  Author: Rathu Kugan <rathu.kugan@gmail.com>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M app/controllers/exam_templates_controller.rb
    M app/views/exam_templates/view_logs.html.erb

  Log Message:
  -----------
  Replaced flash with session variable

  Commit: 5644e03f84a0acdb6eb973224b47108a237a0f6c
      https://github.com/MarkUsProject/Markus/commit/5644e03f84a0acdb6eb973224b47108a237a0f6c
  Author: Rathu Kugan <rathu.kugan@gmail.com>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M app/views/exam_templates/view_logs.html.erb
    M app/views/layouts/_header.html.erb
    A app/views/shared/_poll_job.js.erb

  Log Message:
  -----------
  Poll job on any page, initial commit

  Commit: 6840379663d56b5cb96a537416fc18422aea1063
      https://github.com/MarkUsProject/Markus/commit/6840379663d56b5cb96a537416fc18422aea1063
  Author: Rathu Kugan <rathu.kugan@gmail.com>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M app/controllers/job_messages_controller.rb
    M app/views/layouts/_header.html.erb
    M app/views/shared/_poll_job.js.erb

  Log Message:
  -----------
  Removed job session variable in job controller

  Commit: 67885ca960639c4ecbd0912a6a176e8e121a245e
      https://github.com/MarkUsProject/Markus/commit/67885ca960639c4ecbd0912a6a176e8e121a245e
  Author: Rathu Kugan <rathu.kugan@gmail.com>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M app/controllers/job_messages_controller.rb
    M app/views/shared/_poll_job.js.erb

  Log Message:
  -----------
  Progress bar working after page redirects

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

  Changed paths:
    M app/controllers/exam_templates_controller.rb
    M app/controllers/job_messages_controller.rb
    M app/jobs/split_pdf_job.rb
    M app/models/exam_template.rb
    M app/views/exam_templates/_split_form.html.erb
    M app/views/layouts/_header.html.erb
    A app/views/shared/_poll_job.js.erb

  Log Message:
  -----------
  Merge pull request #3095 from rathukugan/split-progress

Split progress bar

Compare: https://github.com/MarkUsProject/Markus/compare/a61babcded09...386a4d8e7c44

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