[prev in list] [next in list] [prev in thread] [next in thread]
List: markus-dev
Subject: [MarkUs-dev] [MarkUsProject/Markus] e6c1aa: Fixed YAML upload
From: GitHub <noreply () github ! com>
Date: 2014-12-20 17:51:17
Message-ID: 5495b715f0eaf_29513fed4eddb2bc200f5 () hookshot-fe3-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]
Branch: refs/heads/tagging
Home: https://github.com/MarkUsProject/Markus
Commit: e6c1aa0ad0b6f57df15c30156b4fcff18f696dc0
https://github.com/MarkUsProject/Markus/commit/e6c1aa0ad0b6f57df15c30156b4fcff18f696dc0
Author: Bryan Muscedere <bmuscede@uwo.ca>
Date: 2014-12-12 (Fri, 12 Dec 2014)
Changed paths:
M app/controllers/tags_controller.rb
M app/models/tag.rb
M app/views/tags/index.html.erb
M config/locales/en.yml
Log Message:
-----------
Fixed YAML upload
Commit: e320289c97df4bd07bd481f9d694295f6ec136bf
https://github.com/MarkUsProject/Markus/commit/e320289c97df4bd07bd481f9d694295f6ec136bf
Author: Bryan Muscedere <bmuscede@uwo.ca>
Date: 2014-12-15 (Mon, 15 Dec 2014)
Changed paths:
M app/views/submissions/_submissions_table.js.jsx.erb
Log Message:
-----------
Merge branch 'tagging' of git://github.com/MarkUsProject/Markus into tagging
Commit: d0a638bab93c8bb3d0f4fa78a917b7b4e86cbaec
https://github.com/MarkUsProject/Markus/commit/d0a638bab93c8bb3d0f4fa78a917b7b4e86cbaec
Author: Bryan Muscedere <bmuscede@uwo.ca>
Date: 2014-12-18 (Thu, 18 Dec 2014)
Changed paths:
M app/assets/javascripts/Tags/text_updater.js
M app/controllers/results_controller.rb
M app/controllers/tags_controller.rb
M app/models/tag.rb
M app/views/tags/index.html.erb
M config/locales/en.yml
Log Message:
-----------
YML upload and text updater fix
Commit: 098a77436e70a4313d0247f179e4388da089744c
https://github.com/MarkUsProject/Markus/commit/098a77436e70a4313d0247f179e4388da089744c
Author: Bryan Muscedere <bmuscede@uwo.ca>
Date: 2014-12-18 (Thu, 18 Dec 2014)
Changed paths:
M app/assets/javascripts/Results/tag_operations.js
M app/controllers/tags_controller.rb
M app/helpers/tags_helper.rb
M app/models/tag.rb
M app/views/results/marker/_boot.js.erb
M app/views/results/marker/_tag_summary.html.erb
M app/views/tags/index.html.erb
M config/locales/en.yml
M db/migrate/20141017202829_create_groupings_tags.rb
Log Message:
-----------
HoundCI and style fixes
Commit: 40f583751580884ac3db301fcd6c5b0dfbc9f982
https://github.com/MarkUsProject/Markus/commit/40f583751580884ac3db301fcd6c5b0dfbc9f982
Author: Bryan Muscedere <bmuscede@uwo.ca>
Date: 2014-12-18 (Thu, 18 Dec 2014)
Changed paths:
A .travis.yml
M Gemfile
M Gemfile.lock
M README.md
M Vagrantfile
R app/assets/images/asc@2x.png
R app/assets/images/des@2x.png
A app/assets/images/pdfjs/annotation-check.svg
A app/assets/images/pdfjs/annotation-comment.svg
A app/assets/images/pdfjs/annotation-help.svg
A app/assets/images/pdfjs/annotation-insert.svg
A app/assets/images/pdfjs/annotation-key.svg
A app/assets/images/pdfjs/annotation-newparagraph.svg
A app/assets/images/pdfjs/annotation-noicon.svg
A app/assets/images/pdfjs/annotation-note.svg
A app/assets/images/pdfjs/annotation-paragraph.svg
A app/assets/images/pdfjs/findbarButton-next-rtl.png
A app/assets/images/pdfjs/findbarButton-next-rtl@2x.png
A app/assets/images/pdfjs/findbarButton-next.png
A app/assets/images/pdfjs/findbarButton-next@2x.png
A app/assets/images/pdfjs/findbarButton-previous-rtl.png
A app/assets/images/pdfjs/findbarButton-previous-rtl@2x.png
A app/assets/images/pdfjs/findbarButton-previous.png
A app/assets/images/pdfjs/findbarButton-previous@2x.png
A app/assets/images/pdfjs/grab.cur
A app/assets/images/pdfjs/grabbing.cur
A app/assets/images/pdfjs/loading-icon.gif
A app/assets/images/pdfjs/loading-small.png
A app/assets/images/pdfjs/secondaryToolbarButton-documentProperties.png
A app/assets/images/pdfjs/secondaryToolbarButton-documentProperties@2x.png
A app/assets/images/pdfjs/secondaryToolbarButton-firstPage.png
A app/assets/images/pdfjs/secondaryToolbarButton-firstPage@2x.png
A app/assets/images/pdfjs/secondaryToolbarButton-handTool.png
A app/assets/images/pdfjs/secondaryToolbarButton-handTool@2x.png
A app/assets/images/pdfjs/secondaryToolbarButton-lastPage.png
A app/assets/images/pdfjs/secondaryToolbarButton-lastPage@2x.png
A app/assets/images/pdfjs/secondaryToolbarButton-rotateCcw.png
A app/assets/images/pdfjs/secondaryToolbarButton-rotateCcw@2x.png
A app/assets/images/pdfjs/secondaryToolbarButton-rotateCw.png
A app/assets/images/pdfjs/secondaryToolbarButton-rotateCw@2x.png
A app/assets/images/pdfjs/shadow.png
A app/assets/images/pdfjs/texture.png
A app/assets/images/pdfjs/toolbarButton-bookmark.png
A app/assets/images/pdfjs/toolbarButton-bookmark@2x.png
A app/assets/images/pdfjs/toolbarButton-download.png
A app/assets/images/pdfjs/toolbarButton-download@2x.png
A app/assets/images/pdfjs/toolbarButton-menuArrows.png
A app/assets/images/pdfjs/toolbarButton-menuArrows@2x.png
A app/assets/images/pdfjs/toolbarButton-openFile.png
A app/assets/images/pdfjs/toolbarButton-openFile@2x.png
A app/assets/images/pdfjs/toolbarButton-pageDown-rtl.png
A app/assets/images/pdfjs/toolbarButton-pageDown-rtl@2x.png
A app/assets/images/pdfjs/toolbarButton-pageDown.png
A app/assets/images/pdfjs/toolbarButton-pageDown@2x.png
A app/assets/images/pdfjs/toolbarButton-pageUp-rtl.png
A app/assets/images/pdfjs/toolbarButton-pageUp-rtl@2x.png
A app/assets/images/pdfjs/toolbarButton-pageUp.png
A app/assets/images/pdfjs/toolbarButton-pageUp@2x.png
A app/assets/images/pdfjs/toolbarButton-presentationMode.png
A app/assets/images/pdfjs/toolbarButton-presentationMode@2x.png
A app/assets/images/pdfjs/toolbarButton-print.png
A app/assets/images/pdfjs/toolbarButton-print@2x.png
A app/assets/images/pdfjs/toolbarButton-search.png
A app/assets/images/pdfjs/toolbarButton-search@2x.png
A app/assets/images/pdfjs/toolbarButton-secondaryToolbarToggle-rtl.png
A app/assets/images/pdfjs/toolbarButton-secondaryToolbarToggle-rtl@2x.png
A app/assets/images/pdfjs/toolbarButton-secondaryToolbarToggle.png
A app/assets/images/pdfjs/toolbarButton-secondaryToolbarToggle@2x.png
A app/assets/images/pdfjs/toolbarButton-sidebarToggle-rtl.png
A app/assets/images/pdfjs/toolbarButton-sidebarToggle-rtl@2x.png
A app/assets/images/pdfjs/toolbarButton-sidebarToggle.png
A app/assets/images/pdfjs/toolbarButton-sidebarToggle@2x.png
A app/assets/images/pdfjs/toolbarButton-viewAttachments.png
A app/assets/images/pdfjs/toolbarButton-viewAttachments@2x.png
A app/assets/images/pdfjs/toolbarButton-viewOutline-rtl.png
A app/assets/images/pdfjs/toolbarButton-viewOutline-rtl@2x.png
A app/assets/images/pdfjs/toolbarButton-viewOutline.png
A app/assets/images/pdfjs/toolbarButton-viewOutline@2x.png
A app/assets/images/pdfjs/toolbarButton-viewThumbnail.png
A app/assets/images/pdfjs/toolbarButton-viewThumbnail@2x.png
A app/assets/images/pdfjs/toolbarButton-zoomIn.png
A app/assets/images/pdfjs/toolbarButton-zoomIn@2x.png
A app/assets/images/pdfjs/toolbarButton-zoomOut.png
A app/assets/images/pdfjs/toolbarButton-zoomOut@2x.png
A app/assets/images/sort_asc.png
A app/assets/images/sort_both.png
A app/assets/images/sort_desc.png
M app/assets/javascripts/DropDownMenu/DropDownMenu.js
M app/assets/javascripts/ReactComponents/table.js
A app/assets/javascripts/ReactComponents/table_sorts.js
M app/assets/javascripts/SourceCodeGlower/AnnotationTextManager.js
A app/assets/javascripts/SourceCodeGlower/PdfAnnotationManager.js
M app/assets/javascripts/SourceCodeGlower/SourceCodeLineAnnotations.js
A app/assets/javascripts/pdfjs.js
A app/assets/javascripts/pdfjs_lib/compatibility.js
A app/assets/javascripts/pdfjs_lib/default_preferences.js
A app/assets/javascripts/pdfjs_lib/display/annotation_helper.js
A app/assets/javascripts/pdfjs_lib/display/api.js
A app/assets/javascripts/pdfjs_lib/display/canvas.js
A app/assets/javascripts/pdfjs_lib/display/font_loader.js
A app/assets/javascripts/pdfjs_lib/display/metadata.js
A app/assets/javascripts/pdfjs_lib/display/pattern_helper.js
A app/assets/javascripts/pdfjs_lib/display/svg.js
A app/assets/javascripts/pdfjs_lib/display/webgl.js
A app/assets/javascripts/pdfjs_lib/document_properties.js
A app/assets/javascripts/pdfjs_lib/l10n.js
A app/assets/javascripts/pdfjs_lib/l10n/README.md
A app/assets/javascripts/pdfjs_lib/l10n/ach/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/ach/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/af/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/af/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/ak/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/ak/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/an/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/an/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/ar/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/ar/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/ar/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/as/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/as/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/ast/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/ast/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/az/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/az/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/be/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/be/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/bg/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/bg/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/bn-BD/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/bn-BD/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/bn-BD/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/bn-IN/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/bn-IN/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/br/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/br/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/bs/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/bs/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/ca/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/ca/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/ca/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/cs/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/cs/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/cs/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/csb/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/csb/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/cy/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/cy/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/cy/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/da/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/da/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/da/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/de/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/de/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/de/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/el/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/el/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/el/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/en-GB/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/en-GB/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/en-US/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/en-US/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/en-US/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/en-ZA/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/en-ZA/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/eo/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/eo/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/es-AR/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/es-AR/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/es-CL/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/es-CL/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/es-ES/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/es-ES/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/es-MX/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/es-MX/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/et/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/et/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/eu/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/eu/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/fa/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/fa/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/fa/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/ff/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/ff/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/fi/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/fi/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/fi/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/fr/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/fr/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/fr/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/fy-NL/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/fy-NL/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/ga-IE/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/ga-IE/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/gd/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/gd/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/gl/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/gl/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/gu-IN/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/gu-IN/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/he/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/he/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/he/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/hi-IN/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/hi-IN/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/hr/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/hr/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/hu/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/hu/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/hy-AM/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/hy-AM/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/is/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/is/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/it/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/it/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/it/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/ja/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/ja/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/ja/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/ka/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/ka/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/kk/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/kk/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/km/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/km/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/kn/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/kn/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/ko/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/ko/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/ko/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/ku/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/ku/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/lg/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/lg/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/lij/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/lij/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/lt/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/lt/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/lt/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/lv/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/lv/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/mai/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/mai/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/mk/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/mk/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/ml/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/ml/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/mn/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/mn/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/mr/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/mr/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/ms/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/ms/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/my/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/my/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/nb-NO/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/nb-NO/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/nl/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/nl/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/nl/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/nn-NO/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/nn-NO/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/nso/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/nso/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/oc/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/oc/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/or/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/or/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/pa-IN/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/pa-IN/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/pl/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/pl/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/pl/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/pt-BR/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/pt-BR/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/pt-BR/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/pt-PT/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/pt-PT/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/rm/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/rm/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/ro/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/ro/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/ro/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/ru/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/ru/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/ru/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/rw/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/rw/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/sah/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/sah/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/si/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/si/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/sk/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/sk/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/sl/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/sl/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/son/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/son/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/sq/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/sq/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/sr/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/sr/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/sr/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/sv-SE/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/sv-SE/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/sv-SE/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/sw/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/sw/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/ta-LK/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/ta-LK/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/ta/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/ta/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/te/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/te/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/th/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/th/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/tl/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/tl/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/tn/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/tn/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/tr/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/tr/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/tr/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/uk/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/uk/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/ur/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/ur/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/vi/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/vi/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/vi/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/wo/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/wo/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/xh/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/xh/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/zh-CN/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/zh-CN/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/zh-CN/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/zh-TW/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/zh-TW/metadata.inc
A app/assets/javascripts/pdfjs_lib/l10n/zh-TW/viewer.properties
A app/assets/javascripts/pdfjs_lib/l10n/zu/chrome.properties
A app/assets/javascripts/pdfjs_lib/l10n/zu/viewer.properties
A app/assets/javascripts/pdfjs_lib/overlay_manager.js
A app/assets/javascripts/pdfjs_lib/page_view.js
A app/assets/javascripts/pdfjs_lib/password_prompt.js
A app/assets/javascripts/pdfjs_lib/pdf.js
A app/assets/javascripts/pdfjs_lib/pdf.worker.js
A app/assets/javascripts/pdfjs_lib/preferences.js
A app/assets/javascripts/pdfjs_lib/shared/cffStandardStrings.js
A app/assets/javascripts/pdfjs_lib/shared/fonts_utils.js
A app/assets/javascripts/pdfjs_lib/shared/util.js
A app/assets/javascripts/pdfjs_lib/text_layer_builder.js
A app/assets/javascripts/pdfjs_lib/ui_utils.js
A app/assets/javascripts/pdfjs_lib/view_history.js
A app/assets/javascripts/pdfjs_lib/viewer.js
A app/assets/javascripts/syntaxhighlighter/shBrushHaskell.js
M app/assets/javascripts/syntaxhighlighter/shBrushScheme.js
A app/assets/javascripts/upload_button_control.js
M app/assets/stylesheets/common/SyntaxHighlighter.scss
M app/assets/stylesheets/common/_core.scss
M app/assets/stylesheets/common/_markus.scss
M app/assets/stylesheets/groups.scss
M app/assets/stylesheets/main.scss
A app/assets/stylesheets/pdfjs/viewer.scss
M app/assets/stylesheets/submissions.scss
M app/controllers/annotations_controller.rb
M app/controllers/assignments_controller.rb
M app/controllers/flexible_criteria_controller.rb
M app/controllers/main_controller.rb
M app/controllers/results_controller.rb
M app/controllers/submissions_controller.rb
M app/controllers/summaries_controller.rb
M app/helpers/submissions_helper.rb
M app/helpers/summaries_helper.rb
M app/models/annotation.rb
M app/models/annotation_text.rb
M app/models/assignment.rb
M app/models/mark.rb
A app/models/pdf_annotation.rb
M app/models/submission.rb
M app/models/submission_collector.rb
M app/models/submission_file.rb
M app/views/annotation_categories/index.html.erb
M app/views/annotations/add_existing_annotation.js.erb
M app/views/annotations/create.js.erb
M app/views/annotations/destroy.js.erb
A app/views/assignments/_assignment_info_summary.html.erb
A app/views/assignments/_assignment_summary.html.erb
A app/views/assignments/_grade_distribution_graph.html.erb
A app/views/assignments/_grader_summary.html.erb
M app/views/assignments/grader_index.html.erb
M app/views/assignments/index.html.erb
M app/views/assignments/refresh_graph.js.erb
A app/views/assignments/view_summary.js.erb
M app/views/flexible_criteria/index.html.erb
M app/views/graders/index.html.erb
M app/views/groups/index.html.erb
M app/views/layouts/_sub_menu.html.erb
R app/views/main/_assignment_info_summary.html.erb
R app/views/main/_assignment_summary.html.erb
A app/views/main/_dashboard_list.html.erb
R app/views/main/_grade_distribution_graph.html.erb
R app/views/main/_grader_summary.html.erb
A app/views/main/_spreadsheet_list.html.erb
M app/views/main/index.html.erb
M app/views/results/common/_annotations.js.erb
M app/views/results/common/_image_codeviewer.html.erb
M app/views/results/common/_pdf_codeviewer.html.erb
M app/views/results/common/_syntax_highlighter_brushes.html.erb
M app/views/results/common/codeviewer.js.erb
M app/views/results/edit.html.erb
M app/views/results/marker/_marker_panes.html.erb
M app/views/results/student/_remark_request_form.html.erb
M app/views/results/view_marks.html.erb
M app/views/rubrics/index.html.erb
M app/views/students/_students_table.js.jsx.erb
M app/views/students/index.html.erb
R app/views/submissions/_repo_browser_boot.js.erb
A app/views/submissions/_repo_files_table.js.jsx.erb
M app/views/submissions/_submissions_table.js.jsx.erb
M app/views/submissions/file_manager.html.erb
R app/views/submissions/populate_repo_browser.js.erb
M app/views/submissions/repo_browser.html.erb
R app/views/submissions/repo_browser/_directory_row.html.erb
R app/views/submissions/repo_browser/_exit_directory.html.erb
R app/views/submissions/repo_browser/_filter_table_row.html.erb
M app/views/summaries/_summaries_table.js.jsx.erb
M app/views/tas/index.html.erb
M config/application.rb
A config/database.yml.ci
M config/environments/development.rb
M config/environments/production.rb
M config/environments/test.rb
M config/locales/en.yml
M config/locales/fr.yml
M config/locales/pt.yml
M config/routes.rb
A db/migrate/20141128075905_add_page_to_annotations.rb
M db/schema.rb
M lib/benchmarking/submission_files/submissions_controller.rb
A spec/factories/assignment_files.rb
A spec/factories/marks.rb
M spec/factories/rubric_criteria.rb
A spec/factories/sections.rb
M spec/factories/student_memberships.rb
M spec/models/assignment_spec.rb
M spec/models/group_spec.rb
M spec/models/grouping_spec.rb
A spec/models/mark_spec.rb
M spec/spec_helper.rb
M test/functional/main_controller_test.rb
M test/functional/results_controller_test.rb
M test/functional/submissions_controller_test.rb
M test/unit/assignment_test.rb
R test/unit/group_test.rb
R test/unit/mark_test.rb
M test/unit/submission_file_test.rb
Log Message:
-----------
Merge branch 'tagging' of git://github.com/MarkUsProject/Markus into tagging
Commit: e410bc804253fd8a139073c31a4fd641bc27e2ed
https://github.com/MarkUsProject/Markus/commit/e410bc804253fd8a139073c31a4fd641bc27e2ed
Author: Bryan Muscedere <bmuscede@uwo.ca>
Date: 2014-12-20 (Sat, 20 Dec 2014)
Changed paths:
M app/controllers/tags_controller.rb
M app/models/tag.rb
M app/views/tags/index.html.erb
M config/locales/en.yml
Log Message:
-----------
Hound fixes and change to YAML
Commit: a02b2e1b9247dc21af698f66d00b9e4344e78620
https://github.com/MarkUsProject/Markus/commit/a02b2e1b9247dc21af698f66d00b9e4344e78620
Author: David Liu <liudavid@cs.toronto.edu>
Date: 2014-12-20 (Sat, 20 Dec 2014)
Changed paths:
M app/assets/javascripts/Results/tag_operations.js
M app/assets/javascripts/Tags/text_updater.js
M app/controllers/results_controller.rb
M app/controllers/tags_controller.rb
M app/helpers/tags_helper.rb
M app/models/tag.rb
M app/views/results/marker/_boot.js.erb
M app/views/results/marker/_tag_summary.html.erb
M app/views/tags/index.html.erb
M config/locales/en.yml
M db/migrate/20141017202829_create_groupings_tags.rb
Log Message:
-----------
Merge pull request #1950 from bmuscede/tagging
YAML Upload/Download & HoundCI Fixes
Compare: https://github.com/MarkUsProject/Markus/compare/4c3b54eddfd4...a02b2e1b9247
_______________________________________________
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]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic