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

List:       markus-dev
Subject:    [MarkUs-dev] [MarkUsProject/Markus] d281da: Added columns to database annotation table
From:       GitHub <noreply () github ! com>
Date:       2015-02-26 3:28:20
Message-ID: 54ee92d4649d2_69163fa62ded92bc6039d () hookshot-fe6-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]

Branch: refs/heads/master
  Home:   https://github.com/MarkUsProject/Markus
  Commit: d281da5dcb2a956a27c62e824b1090efc89b46e8
      https://github.com/MarkUsProject/Markus/commit/d281da5dcb2a956a27c62e824b1090efc89b46e8
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M db/schema.rb

  Log Message:
  -----------
  Added columns to database annotation table


  Commit: cf1eb1be45a8709dff7fcecf36f273575018f280
      https://github.com/MarkUsProject/Markus/commit/cf1eb1be45a8709dff7fcecf36f273575018f280
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-01-17 (Sat, 17 Jan 2015)

  Changed paths:
    M app/helpers/submissions_helper.rb
    M app/models/grouping_queue.rb
    M app/views/assignments/_form.html.erb
    M app/views/flexible_criteria/index.html.erb
    M config/locales/en.yml
    M config/locales/fr.yml
    M config/locales/pt.yml
    M test/unit/submission_collector_test.rb

  Log Message:
  -----------
  Merge branch 'master' into Issue#1936_Annotation


  Commit: 08aa1318388bfeb4032d6d50951e59ef2e813175
      https://github.com/MarkUsProject/Markus/commit/08aa1318388bfeb4032d6d50951e59ef2e813175
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-01-17 (Sat, 17 Jan 2015)

  Changed paths:
    M app/controllers/annotations_controller.rb
    M app/models/text_annotation.rb
    M app/views/results/common/_annotations.js.erb

  Log Message:
  -----------
  Added column start/end support for annotations, currently saves the start/end to \
the DB. Requires further changes to display the selected range


  Commit: 0d6e727004ebd7533e90dadfb9be65b5a0217127
      https://github.com/MarkUsProject/Markus/commit/0d6e727004ebd7533e90dadfb9be65b5a0217127
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-01-17 (Sat, 17 Jan 2015)

  Changed paths:
    M app/views/annotations/create.js.erb
    M app/views/results/common/_text_codeviewer.html.erb

  Log Message:
  -----------
  work for displaying annotations by column


  Commit: 1f2ca365bd6f00dc3d4bdd964e9cafb15416c02d
      https://github.com/MarkUsProject/Markus/commit/1f2ca365bd6f00dc3d4bdd964e9cafb15416c02d
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLine.js
    M app/views/annotations/create.js.erb
    M app/views/results/common/_annotations.js.erb
    M app/views/results/common/_text_codeviewer.html.erb

  Log Message:
  -----------
  Some changes that might be usefull... not sure, facing issues with the local \
machine


  Commit: fcf6d4503f7b6990a43586397c399f21a3d3b0f0
      https://github.com/MarkUsProject/Markus/commit/fcf6d4503f7b6990a43586397c399f21a3d3b0f0
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLine.js

  Log Message:
  -----------
  Readded work in progress


  Commit: f7143877e57237c3c9599bcd4a258484a12340bd
      https://github.com/MarkUsProject/Markus/commit/f7143877e57237c3c9599bcd4a258484a12340bd
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLine.js
    M app/controllers/annotations_controller.rb
    M app/models/text_annotation.rb
    M app/views/annotations/create.js.erb
    M app/views/results/common/_annotations.js.erb
    M app/views/results/common/_text_codeviewer.html.erb
    M db/schema.rb

  Log Message:
  -----------
  Merge branch 'Issue#1936_Annotation' of github.com:spring-ryanc/Markus into \
Issue#1936_Annotation

Merging onto home computer


  Commit: 92e7bae26b2413daa382514a06ed0c715d7e4662
      https://github.com/MarkUsProject/Markus/commit/92e7bae26b2413daa382514a06ed0c715d7e4662
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-01-25 (Sun, 25 Jan 2015)

  Changed paths:
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLine.js
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLineAnnotations.js
    M app/assets/stylesheets/common/SyntaxHighlighter.scss
    M app/views/annotations/add_existing_annotation.js.erb
    M app/views/annotations/create.js.erb
    M app/views/results/common/_annotations.js.erb
    M app/views/results/common/_text_codeviewer.html.erb

  Log Message:
  -----------
  Preview of the annotation changes, can add and remove selections (1 per line)


  Commit: 2bc7d32b892c892223a82830705155142d907c97
      https://github.com/MarkUsProject/Markus/commit/2bc7d32b892c892223a82830705155142d907c97
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-01-31 (Sat, 31 Jan 2015)

  Changed paths:
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLine.js

  Log Message:
  -----------
  Saving progress made on iteration2


  Commit: 3cc43869823f99c5fc3470dd81bf76fb0a92f1ec
      https://github.com/MarkUsProject/Markus/commit/3cc43869823f99c5fc3470dd81bf76fb0a92f1ec
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-01-31 (Sat, 31 Jan 2015)

  Changed paths:
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLine.js
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLineAnnotations.js

  Log Message:
  -----------
  Completed changes to split spans for highlighting. Check in before mouse listener \
changes


  Commit: 53cf532a3b7f3e466aa8759ea6eef41f203453e1
      https://github.com/MarkUsProject/Markus/commit/53cf532a3b7f3e466aa8759ea6eef41f203453e1
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-01-31 (Sat, 31 Jan 2015)

  Changed paths:
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLine.js

  Log Message:
  -----------
  Made a few changes for supporting multiple annotations on the same line


  Commit: dec0a40437c12f4b5588e8893c3940bfa304803d
      https://github.com/MarkUsProject/Markus/commit/dec0a40437c12f4b5588e8893c3940bfa304803d
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-01-31 (Sat, 31 Jan 2015)

  Changed paths:
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLine.js
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLineAnnotations.js

  Log Message:
  -----------
  Added support for mouselisteners


  Commit: 1876e9c7fd67481a86d616c3979836af8c86dcaf
      https://github.com/MarkUsProject/Markus/commit/1876e9c7fd67481a86d616c3979836af8c86dcaf
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-01-31 (Sat, 31 Jan 2015)

  Changed paths:
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLine.js
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLineAnnotations.js
    M app/assets/stylesheets/common/SyntaxHighlighter.scss

  Log Message:
  -----------
  Fixed issue of copying event listeners, cleaned up code, commented the observer \
methods not being used


  Commit: ae28fe7e24a919bab65054438ba8e5c3819af95b
      https://github.com/MarkUsProject/Markus/commit/ae28fe7e24a919bab65054438ba8e5c3819af95b
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-01-31 (Sat, 31 Jan 2015)

  Changed paths:
    A db/migrate/20150201040434_add_columns_to_annotations.rb

  Log Message:
  -----------
  Created migration file for DB changes


  Commit: beb6753609fd51c8d681ebda25d88ceff6fe6732
      https://github.com/MarkUsProject/Markus/commit/beb6753609fd51c8d681ebda25d88ceff6fe6732
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-01-31 (Sat, 31 Jan 2015)

  Changed paths:
    M db/schema.rb

  Log Message:
  -----------
  Undid changes to schema


  Commit: 1f5d1d1c490dae8de31ea8831e92b77790a262e9
      https://github.com/MarkUsProject/Markus/commit/1f5d1d1c490dae8de31ea8831e92b77790a262e9
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-02-08 (Sun, 08 Feb 2015)

  Changed paths:
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLine.js
    M app/views/results/common/_text_codeviewer.html.erb

  Log Message:
  -----------
  Refactored glow method and fixed some styling issues


  Commit: f5c48c741f85438f861f699adf5ec39465c735f5
      https://github.com/MarkUsProject/Markus/commit/f5c48c741f85438f861f699adf5ec39465c735f5
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-02-08 (Sun, 08 Feb 2015)

  Changed paths:
    M test/blueprints/blueprints.rb

  Log Message:
  -----------
  Attempt to fix build issues..


  Commit: f7f443ab82bdf8f9d9f3fb4cb20cb3940bc68112
      https://github.com/MarkUsProject/Markus/commit/f7f443ab82bdf8f9d9f3fb4cb20cb3940bc68112
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-02-08 (Sun, 08 Feb 2015)

  Changed paths:
    M test/blueprints/blueprints.rb

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


  Commit: 640bbcfa5ed04a4986206ca2557586003253896c
      https://github.com/MarkUsProject/Markus/commit/640bbcfa5ed04a4986206ca2557586003253896c
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-02-08 (Sun, 08 Feb 2015)

  Changed paths:
    M test/blueprints/blueprints.rb

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


  Commit: 35b26d74f7d3924febf20d9f1b8c3fe151bb789f
      https://github.com/MarkUsProject/Markus/commit/35b26d74f7d3924febf20d9f1b8c3fe151bb789f
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-02-08 (Sun, 08 Feb 2015)

  Changed paths:
    M test/blueprints/blueprints.rb

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


  Commit: 4ce92b0c57c0ab9cf3c97fdce2958cb864dce2cb
      https://github.com/MarkUsProject/Markus/commit/4ce92b0c57c0ab9cf3c97fdce2958cb864dce2cb
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-02-08 (Sun, 08 Feb 2015)

  Changed paths:
    M test/blueprints/blueprints.rb

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


  Commit: 181f4bad1c8591f1f372e2ddd70d4667e37704bb
      https://github.com/MarkUsProject/Markus/commit/181f4bad1c8591f1f372e2ddd70d4667e37704bb
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLine.js
    M app/views/results/common/_annotations.js.erb

  Log Message:
  -----------
  Fixes for the million+ edge cases and the multi line bug introduced by last commit


  Commit: f819e0134fff8a43bdc340828bf957be1fe004be
      https://github.com/MarkUsProject/Markus/commit/f819e0134fff8a43bdc340828bf957be1fe004be
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLine.js

  Log Message:
  -----------
  Hound fixes, line length and camel case


  Commit: ae9d58793ebd6547809fbcc0aeb1210b691676dd
      https://github.com/MarkUsProject/Markus/commit/ae9d58793ebd6547809fbcc0aeb1210b691676dd
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLine.js

  Log Message:
  -----------
  Hound fixes, line length and camel case


  Commit: ba30d398ad02f72d46076bc841115cc41c810196
      https://github.com/MarkUsProject/Markus/commit/ba30d398ad02f72d46076bc841115cc41c810196
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLine.js
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLineAnnotations.js

  Log Message:
  -----------
  Hound fixes, line length and camel case


  Commit: 6513465b83bada106df0bd41c7132879f4bdaeae
      https://github.com/MarkUsProject/Markus/commit/6513465b83bada106df0bd41c7132879f4bdaeae
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLine.js
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLineAnnotations.js
    M app/assets/stylesheets/common/SyntaxHighlighter.scss
    M app/models/text_annotation.rb
    M test/blueprints/blueprints.rb

  Log Message:
  -----------
  Hound fixes, line length and camel case


  Commit: e5631acdf7d73fb8e594899e657104ab49139a9a
      https://github.com/MarkUsProject/Markus/commit/e5631acdf7d73fb8e594899e657104ab49139a9a
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLineAnnotations.js
    M test/blueprints/blueprints.rb

  Log Message:
  -----------
  Hound fixes, line length and camel case


  Commit: c2ae2b846dae83a5d751512f00deb8872ec33dce
      https://github.com/MarkUsProject/Markus/commit/c2ae2b846dae83a5d751512f00deb8872ec33dce
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M test/blueprints/blueprints.rb

  Log Message:
  -----------
  Hound fixes, line length and camel case


  Commit: ae4ca566bfa1c59a6668803391a0bbdaa0276d07
      https://github.com/MarkUsProject/Markus/commit/ae4ca566bfa1c59a6668803391a0bbdaa0276d07
  Author: Ryan S <spring.ryanc@gmail.com>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

  Changed paths:
    M app/models/text_annotation.rb

  Log Message:
  -----------
  Reverted change to test to try and satisfy Travis


  Commit: 2365d59fa68c03c54272f63d24c179c621c70d9d
      https://github.com/MarkUsProject/Markus/commit/2365d59fa68c03c54272f63d24c179c621c70d9d
  Author: David Liu <liudavid@cs.toronto.edu>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLine.js
    M app/assets/javascripts/SourceCodeGlower/SourceCodeLineAnnotations.js
    M app/assets/stylesheets/common/SyntaxHighlighter.scss
    M app/controllers/annotations_controller.rb
    M app/models/text_annotation.rb
    M app/views/annotations/add_existing_annotation.js.erb
    M app/views/annotations/create.js.erb
    M app/views/results/common/_annotations.js.erb
    M app/views/results/common/_text_codeviewer.html.erb
    A db/migrate/20150201040434_add_columns_to_annotations.rb
    M test/blueprints/blueprints.rb

  Log Message:
  -----------
  Merge pull request #2051 from spring-ryanc/Issue#1936_Annotation

Fixes #989


Compare: https://github.com/MarkUsProject/Markus/compare/58281d404fb9...2365d59fa68c



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