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

List:       markus-dev
Subject:    [MarkUs-dev] [MarkUsProject/Markus] 33e0c9: Merge pull request #12 from MarkUsProject/git
From:       GitHub <noreply () github ! com>
Date:       2015-01-16 23:42:00
Message-ID: 54b9a1c864770_f043fcbe59d92c0730ee () hookshot-fe6-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]

Branch: refs/heads/git
  Home:   https://github.com/MarkUsProject/Markus
  Commit: 33e0c9be9749985cd8305ea665b28ee54d14e473
      https://github.com/MarkUsProject/Markus/commit/33e0c9be9749985cd8305ea665b28ee54d14e473
  Author: Alexander Grenier <alex.grenier@gmail.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    A app/assets/javascripts/Results/tag_operations.js
    A app/assets/javascripts/Tags/text_updater.js
    M app/assets/stylesheets/common/_core.scss
    M app/assets/stylesheets/common/_markus.scss
    A app/assets/stylesheets/common/_tags.scss
    M app/assets/stylesheets/grader.scss
    M app/assets/stylesheets/results.scss
    M app/assets/stylesheets/submissions.scss
    A app/assets/stylesheets/tags.scss
    M app/controllers/results_controller.rb
    A app/controllers/tags_controller.rb
    M app/helpers/submissions_helper.rb
    A app/helpers/tags_helper.rb
    M app/models/grouping.rb
    A app/models/tag.rb
    M app/views/grade_entry_forms/_list_manage.html.erb
    M app/views/layouts/_menu.html.erb
    M app/views/layouts/_sub_menu.html.erb
    M app/views/layouts/_sub_sub_menu.html.erb
    M app/views/results/edit.html.erb
    M app/views/results/marker/_boot.js.erb
    M app/views/results/marker/_marker_panes.html.erb
    A app/views/results/marker/_tag_summary.html.erb
    M app/views/results/student/no_remark_result.html.erb
    M app/views/submissions/_submissions_table.js.jsx.erb
    M app/views/submissions/browse.html.erb
    A app/views/tags/_boot.js.erb
    A app/views/tags/_edit.html.erb
    A app/views/tags/_edit_dialog.js.erb
    A app/views/tags/_tags_table.js.jsx.erb
    A app/views/tags/index.html.erb
    M config/environments/development.rb
    M config/locales/en.yml
    M config/routes.rb
    A db/migrate/20141017184954_create_tags.rb
    A db/migrate/20141017202829_create_groupings_tags.rb
    M db/schema.rb
    M lib/repo/git_repository.rb
    M spec/factories/assignment_files.rb

  Log Message:
  -----------
  Merge pull request #12 from MarkUsProject/git

Bring in master updates


  Commit: 3f9043198ac782bab76c199a5aa89e6e71a24e19
      https://github.com/MarkUsProject/Markus/commit/3f9043198ac782bab76c199a5aa89e6e71a24e19
  Author: Alex Grenier <alex.grenier@gmail.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M app/controllers/submissions_controller.rb
    M app/models/user.rb
    M config/environments/development.rb
    M lib/markus_configurator.rb
    M lib/repo/git_repository.rb

  Log Message:
  -----------
  Hound fixes


  Commit: eafec9ea1073baa4ac1b5618bdcbd508cc1532c8
      https://github.com/MarkUsProject/Markus/commit/eafec9ea1073baa4ac1b5618bdcbd508cc1532c8
  Author: Alex Grenier <alex.grenier@gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M config/environments/development.rb

  Log Message:
  -----------
  Git branch config


  Commit: e81303c8689ac6c7a3c90155910952916a9c3a91
      https://github.com/MarkUsProject/Markus/commit/e81303c8689ac6c7a3c90155910952916a9c3a91
  Author: Alex Grenier <alex.grenier@gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M config/environments/development.rb

  Log Message:
  -----------
  Hound


  Commit: 97da43bebe01181da3162e9b40473c09a9fc5c1b
      https://github.com/MarkUsProject/Markus/commit/97da43bebe01181da3162e9b40473c09a9fc5c1b
  Author: Alex Grenier <alex.grenier@gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M config/environments/development.rb

  Log Message:
  -----------
  Brought back double-quotes for string interpolation cases


  Commit: 3ca71cc9e794e4596819264a749e71fe5b4cd674
      https://github.com/MarkUsProject/Markus/commit/3ca71cc9e794e4596819264a749e71fe5b4cd674
  Author: Alex Grenier <alex.grenier@gmail.com>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M lib/repo/git_repository.rb

  Log Message:
  -----------
  Indentation


  Commit: b696d9565291988ae379abcd5c000fa7b16ecd3f
      https://github.com/MarkUsProject/Markus/commit/b696d9565291988ae379abcd5c000fa7b16ecd3f
  Author: Alex Grenier <alex.grenier@gmail.com>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M lib/repo/git_repository.rb

  Log Message:
  -----------
  Hound


  Commit: c6218094501520934d0a572e1404c08934e56d2a
      https://github.com/MarkUsProject/Markus/commit/c6218094501520934d0a572e1404c08934e56d2a
  Author: Alex Grenier <alex.grenier@gmail.com>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M lib/repo/git_repository.rb

  Log Message:
  -----------
  Hound


  Commit: 6e72cc88e988de89ae524f1f2c17dc16a95ade33
      https://github.com/MarkUsProject/Markus/commit/6e72cc88e988de89ae524f1f2c17dc16a95ade33
  Author: Alex Grenier <alex.grenier@gmail.com>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M lib/repo/git_repository.rb

  Log Message:
  -----------
  Hound


  Commit: ff3d19db2ef196cf7c3656c8bd0ec69e6ec10e43
      https://github.com/MarkUsProject/Markus/commit/ff3d19db2ef196cf7c3656c8bd0ec69e6ec10e43
  Author: David Liu <liudavid@cs.toronto.edu>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M app/controllers/submissions_controller.rb
    M app/models/user.rb
    M config/environments/development.rb
    M lib/markus_configurator.rb
    M lib/repo/git_repository.rb

  Log Message:
  -----------
  Merge pull request #1983 from SoftwareDev/git

Hound fixes


Compare: https://github.com/MarkUsProject/Markus/compare/8a037009a496...ff3d19db2ef1

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