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

List:       markus-dev
Subject:    [MarkUs-dev] [MarkUsProject/Markus] 4414da: Added updating marks functionality to api
From:       GitHub <noreply () github ! com>
Date:       2015-07-29 17:29:36
Message-ID: 55b90d8074974_9cf3fdec5fad2bc68587 () hookshot-fe4-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]

Branch: refs/heads/master
  Home:   https://github.com/MarkUsProject/Markus
  Commit: 4414da827bc47dcb6bc840ab8cc0323c481b2adb
      https://github.com/MarkUsProject/Markus/commit/4414da827bc47dcb6bc840ab8cc0323c481b2adb
  Author: hootiehoo <jesse.riemann@gmail.com>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

  Changed paths:
    A app/controllers/api/results_controller.rb
    M config/routes.rb

  Log Message:
  -----------
  Added updating marks functionality to api


  Commit: 8c23d8b58f9807b71411d540343eb9bcd3a6067a
      https://github.com/MarkUsProject/Markus/commit/8c23d8b58f9807b71411d540343eb9bcd3a6067a
  Author: hootiehoo <jesse.riemann@gmail.com>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

  Changed paths:
    M app/controllers/submissions_controller.rb
    M app/helpers/grade_entry_forms_helper.rb
    M app/helpers/submissions_helper.rb
    M app/views/assignments/_boot.js.erb
    M app/views/grade_entry_forms/_boot.js.erb
    M app/views/grade_entry_forms/_form.html.erb
    M app/views/grade_entry_forms/_grade_entry_item.html.erb
    M app/views/grade_entry_forms/edit.html.erb
    M app/views/grade_entry_forms/new.html.erb
    M app/views/submissions/repo_browser.html.erb
    M config/.rubocop.yml
    M config/locales/en.yml
    M config/locales/fr.yml
    M config/locales/pt.yml
    M db/seeds.rb
    A lib/tasks/assignments.rake
    A lib/tasks/groups.rake
    A lib/tasks/marks.rake
    A lib/tasks/rubric.rake
    A lib/tasks/users.rake
    M test/functional/grade_entry_forms_controller_test.rb

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/MarkUsProject/Markus into api-work


  Commit: 8fd2dee730522c8f5f7ebd8609d863752c7e9e14
      https://github.com/MarkUsProject/Markus/commit/8fd2dee730522c8f5f7ebd8609d863752c7e9e14
  Author: hootiehoo <jesse.riemann@gmail.com>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

  Changed paths:
    M config/routes.rb

  Log Message:
  -----------
  Changed route to support singular resource


  Commit: 9cd9a4188340b0d23cda9847c38a385a97c7179d
      https://github.com/MarkUsProject/Markus/commit/9cd9a4188340b0d23cda9847c38a385a97c7179d
  Author: hootiehoo <jesse.riemann@gmail.com>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

  Changed paths:
    M app/controllers/api/results_controller.rb

  Log Message:
  -----------
  hound


  Commit: c675012f2165d5c1f1b6722ad1005027540d7914
      https://github.com/MarkUsProject/Markus/commit/c675012f2165d5c1f1b6722ad1005027540d7914
  Author: hootiehoo <jesse.riemann@gmail.com>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

  Changed paths:
    M app/controllers/api/groups_controller.rb
    M config/routes.rb

  Log Message:
  -----------
  Moved update marks method into groups_controller


  Commit: 5dd0f8030466cb471e98e1d61324bbd0057a5596
      https://github.com/MarkUsProject/Markus/commit/5dd0f8030466cb471e98e1d61324bbd0057a5596
  Author: hootiehoo <jesse.riemann@gmail.com>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

  Changed paths:
    R app/controllers/api/results_controller.rb

  Log Message:
  -----------
  Removed old results_controller, as it's no longer needed


  Commit: b2de6e9a3858a6862986fd4bb91a89f4e7f897b0
      https://github.com/MarkUsProject/Markus/commit/b2de6e9a3858a6862986fd4bb91a89f4e7f897b0
  Author: hootiehoo <jesse.riemann@gmail.com>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

  Changed paths:
    M config/routes.rb

  Log Message:
  -----------
  hound


  Commit: b3731513f56fc2e4ec7fd5cca391c9a11678882b
      https://github.com/MarkUsProject/Markus/commit/b3731513f56fc2e4ec7fd5cca391c9a11678882b
  Author: hootiehoo <jesse.riemann@gmail.com>
  Date:   2015-07-28 (Tue, 28 Jul 2015)

  Changed paths:
    M app/controllers/api/groups_controller.rb

  Log Message:
  -----------
  Cleaned up and restructured upload_marks function


  Commit: d29846ce31ff19fce0b7334b84f32f354b1def80
      https://github.com/MarkUsProject/Markus/commit/d29846ce31ff19fce0b7334b84f32f354b1def80
  Author: hootiehoo <jesse.riemann@gmail.com>
  Date:   2015-07-29 (Wed, 29 Jul 2015)

  Changed paths:
    M app/controllers/api/groups_controller.rb

  Log Message:
  -----------
  Some restructuring on update_marks method


  Commit: a4e659ecac325195d6055ef41d673fa7d289d13a
      https://github.com/MarkUsProject/Markus/commit/a4e659ecac325195d6055ef41d673fa7d289d13a
  Author: hootiehoo <jesse.riemann@gmail.com>
  Date:   2015-07-29 (Wed, 29 Jul 2015)

  Changed paths:
    M app/controllers/api/groups_controller.rb

  Log Message:
  -----------
  Fixed criterion lookup to identify assignment by id


  Commit: cf9447571a9cc3439579904bb340d71a39761536
      https://github.com/MarkUsProject/Markus/commit/cf9447571a9cc3439579904bb340d71a39761536
  Author: hootiehoo <jesse.riemann@gmail.com>
  Date:   2015-07-29 (Wed, 29 Jul 2015)

  Changed paths:
    M app/controllers/api/groups_controller.rb

  Log Message:
  -----------
  Removed accidental blank lines


  Commit: 30f73009b29da0a7398766a0e38db816e1c0ce43
      https://github.com/MarkUsProject/Markus/commit/30f73009b29da0a7398766a0e38db816e1c0ce43
  Author: David Liu <liudavid@cs.toronto.edu>
  Date:   2015-07-29 (Wed, 29 Jul 2015)

  Changed paths:
    M app/controllers/api/groups_controller.rb
    M config/routes.rb

  Log Message:
  -----------
  Merge pull request #2209 from hootiehoo/api-work

Updating marks through API


Compare: https://github.com/MarkUsProject/Markus/compare/49cdb3f58f12...30f73009b29d

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