ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
47,856 Commits 324 Branches 20,019 Tags 1.7 GiB
Commit Graph

6 Commits

Author SHA1 Message Date
Cody Cutrer 06763dd519 add # frozen_string_literal: true for lib 
Change-Id: I59b751cac52367a89e03f572477f0cf1d607b405
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/251155
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
 2020-10-27 20:49:50 +00:00
Cody Cutrer 9cd92f0d48 use the proper methods for getting plugin settings 
refs CORE-2863

Change-Id: I5f440dbc20f869840bf25b4851cfb3bac74977f0
Reviewed-on: https://gerrit.instructure.com/191886
Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
 2019-05-02 20:31:18 +00:00
Landon Wilkins f1359d33e2 da licença part 27 
add consistent license headers to all source files
(ruby, coffeescript, javascript)

except for vendor files

Change-Id: I331826e3e3be8b7d73bbf4f6afe3a79ec1340f54
Reviewed-on: https://gerrit.instructure.com/110051
Tested-by: Jenkins
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
 2017-04-27 21:53:31 +00:00
Keith Garner 66460ad5ce refactor crocodoc_document.upload for better timeout logging 
The code now differentiates between three similar but different error
conditions that prevent an upload: 1) no response from the service, 2)
timing out when talking to the service, 3) skipping over the call due to
timeout protection.

This also changes the timeout protection names around all the crocodoc
calls to be unique.

fixes CNVS-33152

test plan:
 - Confirm crocodoc upload and viewing still works

Change-Id: Ie0b1eca38bbcfd1b3f1c3765d772ea7fd28d8bbe
Reviewed-on: https://gerrit.instructure.com/94589
Tested-by: Jenkins
Reviewed-by: Cameron Matheson <cameron@instructure.com>
QA-Review: KC Naegle <knaegle@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
 2016-11-07 21:52:53 +00:00
Cameron Matheson 1f8c0c4aa5 show warning when crocodoc is still processing 
closes CNVS-15940

Test plan:
  * make a file upload assignment
  * submit a crocodocable submission
  * turn off delayed jobs
  * submit another crocodocable submission
  * in speedgrader, the second submission should not display in
    crocodoc.  you will be notified that the submission is still being
    processed

Change-Id: Ifcdda634dd97a81f17d0d753cade0b80f3e0ebce
Reviewed-on: https://gerrit.instructure.com/42387
Reviewed-by: Josh Simpson <jsimpson@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
 2014-11-04 20:30:55 +00:00
Cameron Matheson b5f566f1f6 crocodoc integration 
Adds support for optionally viewing documents with Crocodoc.

closes #9865

Test plan:
  * configure the crocodoc plugin
  * add an assignment that allows file uploads
  * make a submission for that assignment with a pdf or doc or ppt
    - on the 'submission details' page, opening a preview of the
      assignment should display it in crocodoc
    - speedgrader should display the submission in crocodoc too
  * make a submission with odt or rtf
    - the submission should be displayed with scribd or google docs
  * if you disable the crocodoc plugin, submissions could continue being
    previewed in google docs or scribd

Change-Id: I7dd2547f8e2d907c98ebe894a7f1ee9d58f1e030
Reviewed-on: https://gerrit.instructure.com/13668
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
 2012-09-21 12:57:02 -06:00