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

List:       markus-dev
Subject:    [MarkUs-dev] [MarkUsProject/Markus] d048bf: shift arrow keys to cycle criterion
From:       GitHub <noreply () github ! com>
Date:       2017-06-21 12:49:34
Message-ID: 594a6b5e625c6_335b3fdd8277fc3c887b () hookshot-fe6-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]

Branch: refs/heads/master
  Home:   https://github.com/MarkUsProject/Markus
  Commit: d048bf9a7d179519717975bf3a061cec609e36dd
      https://github.com/MarkUsProject/Markus/commit/d048bf9a7d179519717975bf3a061cec609e36dd
  Author: Tyler Han <tylerhan97@gmail.com>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    M app/assets/javascripts/Grader/marking.js
    M app/assets/stylesheets/results.scss
    M app/views/results/edit.html.erb
    M app/views/results/marker/_keybinding.js.erb
    A vendor/assets/javascripts/mousetrap-global-bind.min.js

  Log Message:
  -----------
  shift arrow keys to cycle criterion


  Commit: e4530fb39ec64974cf7c86aef4491a8eb2b876f7
      https://github.com/MarkUsProject/Markus/commit/e4530fb39ec64974cf7c86aef4491a8eb2b876f7
  Author: Tyler Han <tylerhan97@gmail.com>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    M app/assets/javascripts/Grader/marking.js
    M app/views/results/marker/_keybinding.js.erb

  Log Message:
  -----------
  streamlined hiding


  Commit: 22dcfed7064384ada275b5218f3d9d3072ee2a1c
      https://github.com/MarkUsProject/Markus/commit/22dcfed7064384ada275b5218f3d9d3072ee2a1c
  Author: Tyler Han <tylerhan97@gmail.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M app/assets/javascripts/Grader/marking.js

  Log Message:
  -----------
  initial differences


  Commit: 441918cb590d74419a9324597adbaad297168443
      https://github.com/MarkUsProject/Markus/commit/441918cb590d74419a9324597adbaad297168443
  Author: Tyler Han <tylerhan97@gmail.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M app/assets/javascripts/Grader/marking.js

  Log Message:
  -----------
  indent fix


  Commit: 30d562d286357ea8d48a496c87776cecfae53976
      https://github.com/MarkUsProject/Markus/commit/30d562d286357ea8d48a496c87776cecfae53976
  Author: Tyler Han <tylerhan97@gmail.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M app/assets/javascripts/Grader/marking.js

  Log Message:
  -----------
  reverted reformatting


  Commit: 0f0c147513ed3382e9df7a76f7c7bc21c30ec203
      https://github.com/MarkUsProject/Markus/commit/0f0c147513ed3382e9df7a76f7c7bc21c30ec203
  Author: Tyler Han <tylerhan97@gmail.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M app/views/results/marker/_keybinding.js.erb

  Log Message:
  -----------
  spacing issues fixed


  Commit: 9522bdc0e2efab896ac1153e2978736caaa21319
      https://github.com/MarkUsProject/Markus/commit/9522bdc0e2efab896ac1153e2978736caaa21319
  Author: Tyler Han <tylerhan97@gmail.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M app/views/results/marker/_keybinding.js.erb

  Log Message:
  -----------
  keybinding indent fix


  Commit: d281452d7e00ca3682017d8eda101138cc2b060e
      https://github.com/MarkUsProject/Markus/commit/d281452d7e00ca3682017d8eda101138cc2b060e
  Author: Tyler Han <tylerhan97@gmail.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M app/assets/javascripts/Grader/marking.js
    M app/views/results/common/_checkbox_criterion.html.erb
    M app/views/results/common/_flexible_criterion.html.erb
    M app/views/results/edit.html.erb
    M app/views/results/marker/_keybinding.js.erb

  Log Message:
  -----------
  initial fixes


  Commit: a09e54c86d2413125b55549d48c905aca883d55b
      https://github.com/MarkUsProject/Markus/commit/a09e54c86d2413125b55549d48c905aca883d55b
  Author: Tyler Han <tylerhan97@gmail.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M app/views/results/edit.html.erb
    M app/views/results/marker/_keybinding.js.erb

  Log Message:
  -----------
  added help modal back in


  Commit: d0cfa46ad6dfd6feccffb7ea391a075ca3ae8f7a
      https://github.com/MarkUsProject/Markus/commit/d0cfa46ad6dfd6feccffb7ea391a075ca3ae8f7a
  Author: Tyler Han <tylerhan97@gmail.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M app/assets/javascripts/Grader/marking.js

  Log Message:
  -----------
  small style fix


  Commit: 217a572b47b81768eb66b53ce13e235c4914f695
      https://github.com/MarkUsProject/Markus/commit/217a572b47b81768eb66b53ce13e235c4914f695
  Author: Tyler Han <tylerhan97@gmail.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M app/views/results/edit.html.erb

  Log Message:
  -----------
  fixed help modal


  Commit: 99ed035a7ccb71ddb025c404918bfd7b62360fa9
      https://github.com/MarkUsProject/Markus/commit/99ed035a7ccb71ddb025c404918bfd7b62360fa9
  Author: Tyler Han <tylerhan97@gmail.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M app/assets/stylesheets/results.scss

  Log Message:
  -----------
  style changes to help dialog


  Commit: 4ca014a8e4182cb054faf9b2919fc97aa6292bab
      https://github.com/MarkUsProject/Markus/commit/4ca014a8e4182cb054faf9b2919fc97aa6292bab
  Author: Tyler Han <tylerhan97@gmail.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M app/assets/stylesheets/results.scss
    M app/views/results/edit.html.erb
    M app/views/results/marker/_keybinding.js.erb
    M config/locales/en.yml
    M config/locales/es.yml
    M config/locales/fr.yml
    M config/locales/pt.yml

  Log Message:
  -----------
  added language and small syntax fixes


  Commit: c1afe7d2996413b2cfe635a02296c7ddef8916f4
      https://github.com/MarkUsProject/Markus/commit/c1afe7d2996413b2cfe635a02296c7ddef8916f4
  Author: Tyler Han <tylerhan97@gmail.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M app/assets/stylesheets/results.scss
    R vendor/assets/javascripts/mousetrap-global-bind.min.js

  Log Message:
  -----------
  removed global file


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

  Changed paths:
    M app/assets/javascripts/Grader/marking.js
    M app/assets/stylesheets/results.scss
    M app/views/results/common/_checkbox_criterion.html.erb
    M app/views/results/common/_flexible_criterion.html.erb
    M app/views/results/edit.html.erb
    M app/views/results/marker/_keybinding.js.erb
    M config/locales/en.yml
    M config/locales/es.yml
    M config/locales/fr.yml
    M config/locales/pt.yml

  Log Message:
  -----------
  Merge pull request #3081 from DecathectZero/indentfix

WIP: Shift/Arrow key cycle + Help Prompt + Indent fix


Compare: https://github.com/MarkUsProject/Markus/compare/4180089c37eb...5062f61064c6

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