fixes CNVS-11424
test plan:
- rake db:migrate
- if you don't already have one, set yourself up with a developer token.
(you can do so from <canvas>/developer_keys)
- $ curl -H "Authorization: Bearer <ACCESS-TOKEN>" \
-X GET -F 'ns=test' \
<canvas>/api/v1/users/self/custom_data
#=> {"message":"no data for scope"}
- $ curl -H "Authorization: Bearer <ACCESS-TOKEN>" \
-X PUT -F 'ns=test' \
-F 'data[apple]=so tasty' \
-F 'data[kiwi]=a bit sour' \
<canvas>/api/v1/users/self/custom_data/fruit
#=> {"data":{"apple":"so tasty","kiwi":"a bit sour"}}
- $ curl -H "Authorization: Bearer <ACCESS-TOKEN>" \
-X GET -F 'ns=test' \
<canvas>/api/v1/users/self/custom_data
#=> {"data":{"fruit":{"apple":"so tasty","kiwi":"a bit sour"}}}
- $ curl -H "Authorization: Bearer <ACCESS-TOKEN>" \
-X DELETE -F 'ns=test' \
<canvas>/api/v1/users/self/custom_data/fruit/kiwi
#=> {"data":"a bit sour"}
- $ curl -H "Authorization: Bearer <ACCESS-TOKEN>" \
-X GET -F 'ns=test' \
<canvas>/api/v1/users/self/custom_data
#=> {"data":{"fruit":{"apple":"so tasty"}}}
- see new API doc for more info about how it should work, but
basically, you should be able to GET, PUT, and DELETE at will
for any given scope, and PUTting JSON hashes creates referenceable
scopes. (e.g. the DELETE above has 'kiwi' in its scope)
Change-Id: If027ae4aeec14edf44275ba0372a68aef7e5600e
Reviewed-on: https://gerrit.instructure.com/31173
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
fixes CNVS-11987
test plan:
* open old conversations
* open the view dropdown
* verify that it does not include the "discussion replies" link
Change-Id: Iaeeaa94a62a978a4d30af251c06b51d7855ed246
Reviewed-on: https://gerrit.instructure.com/32278
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Braden Anderson <banderson@instructure.com>
This reverts commit 7dd4e4855dd37b05b86164ae0b01d5e0e36175fe.
Change-Id: I6a44be89838f539b032a18c239ee0d01b89874ac
Reviewed-on: https://gerrit.instructure.com/31210
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
QA-Review: Jacob Fugal <jacob@instructure.com>
fixes CAT-13
test plan:
- in rails console (for canvas):
-- a = Account.default
-- a.settings[:dashboard_url] = 'http://www.hackaday.com'
-- a.save
- visit canvas root url
-- if already logged in, you'll be redirected to hackaday.com
-- else, log in, then you'll be redirected to hackaday.com
Change-Id: Ib6e48ae9c3be3761810f0e859b441dcc2edd1f23
Reviewed-on: https://gerrit.instructure.com/32011
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeff Belser <jbelser@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
CNVS-11519
this fixes an error introduced in
https://gerrit.instructure.com/#/c/28234/
test plan:
-try to upload a zipped directory containing lots
of files (for example, there is a dropbox link in
CNVS-11519 containing a file you can use
-while the upload is still in progress, try to upload
the same in a different course
-check that all files are uploaded, in each course
Change-Id: I373dfebe5dbc1f21e681d35e227037cb4a316676
Reviewed-on: https://gerrit.instructure.com/31933
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Anthus Williams <awilliams@instructure.com>
fixes CNVS-11983
we can't load and serialize all quiz_submissions at once since some quizzes
will have tens of thousands of submissions. This will need to be changed in a
future commit to use a better strategy for getting submissions
Change-Id: Iab1a5ce9eb7a08424df3e6262a1fcf1f25efae0e
Reviewed-on: https://gerrit.instructure.com/32271
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Reviewed-by: Stanley Stuart <stanley@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
fixes: CNVS-11948
make sure that cache invalidation (Rails.cache.delete) clears both
rails 2 and rails 3
test plan:
* clear your cache
* run rails 2 and load your dashboard (with stream items)
* run rails 3 and load your dashboard
* clear cache
* reload your dashboard under rails 3
* run rails 2 and load your dashboard
* it should not error in any of these cases
* redis-cli keys '*' should have both plain and rails3:: prefixed
versions of keys
* Rails.cache.delete(<one of the keys) under rails 2 should delete
both copies
* Ditto under rails 3
Change-Id: I363aae884f76e8c1f85125acf941f5c1ee832222
Reviewed-on: https://gerrit.instructure.com/32246
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
test plan:
* as an account admin (but not site admin), verify
that you can see the draft state feature in your
account;
* as a teacher, verify that you cannot see the draft
state feature in your courses until the account admin
has set the feature to 'allow.'
Change-Id: I5d2f54d9ee0b50742b8011b1d9b777c9825030a1
Reviewed-on: https://gerrit.instructure.com/32255
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Clare Strong <clare@instructure.com>
refs: CNVS-10301
This is the canvas-lms part of the fix for the ticket. This adds logic to
the submission model missing? method to take into consideration whether the
assignment expects a submission or not and has been graded with a grade of zero.
Change-Id: I043dab161e1765268e34464ec49fd0276b16acbb
Reviewed-on: https://gerrit.instructure.com/29186
Reviewed-by: Nick Cloward <ncloward@instructure.com>
Product-Review: Nick Cloward <ncloward@instructure.com>
QA-Review: Nick Cloward <ncloward@instructure.com>
Tested-by: Nick Cloward <ncloward@instructure.com>
also fix undeleting practice quizzes
fixes CNVS-11955
test plan:
- in a course, delete a quiz
- go to /courses/:id/undelete
- click the button to undelete the quiz
- it should work
- quick regression on undeleting quizzes/discussion_topics both linked and not
linked to assignments
Change-Id: I88d30d1baa5685e6c4f16280c9aa34c8965b31fe
Reviewed-on: https://gerrit.instructure.com/32217
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Josh Simpson <jsimpson@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
fixes CNVS-10939
test plan:
* create or edit a discussion or announcement
* edit the topic body
* navigate away from the page
* verify that a warning is presented
* revert your changes
* navigate away from the page
* verify that no warning is presented
Change-Id: I3e66b4b84a652cb7478f0fa120e6ab335ff3436c
Reviewed-on: https://gerrit.instructure.com/31703
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Joel Hough <joel@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Braden Anderson <banderson@instructure.com>
fixes CNVS-11856
test plan
- in a course with draft state enabled
- delete an assignment with submissions
- navigate to /course/:id/undelete
- restore the deleted item
- refresh page; verify item is not listed
- navigate to assignments index; verify item is not listed
- repeat for assignment without submissions
Change-Id: I4e1cf09ad8172de30aea137e69c8c9ed6770041e
Reviewed-on: https://gerrit.instructure.com/32202
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Liz Abinante <labinante@instructure.com>
also only send user_ids one time per course
and don't run if there are no user_ids
test plan
- specs should pass
Change-Id: I168758ff00413380b1bf1b2729488a7f95a4a9b1
Reviewed-on: https://gerrit.instructure.com/31985
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
test plan:
- enable draft state in a course
- create some assignments, quizzes, and graded discussions
with due dates and points possible
- add them to a module
- the due dates and points possible should show up on
the modules page
- edit the due date and/or points possible on an assignment
and return to the modules page
- the changed information should be reflected on the modules page
fixes CNVS-11850
Change-Id: I7cb7eecc6744ff2df63888ff1ec83633e1e382a3
Reviewed-on: https://gerrit.instructure.com/32087
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Mark Severson <markse@instructure.com>
Product-Review: Mark Severson <markse@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
fixes CNVS-11935
test plan
- as a student, create a discussion topic
- ensure that "Not Published" is not displayed on the top right
of the discussion edit page
- edit the new discussion
- ensure that "Published" is not displayed on the top right of
the discussion edit page
Change-Id: I5bae83750c16a368bf4d6c58c850d23fa3c7e883
Reviewed-on: https://gerrit.instructure.com/32163
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Reviewed-by: Braden Anderson <banderson@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
Change-Id: I1b20b2d3a8e452a803bf4be03325c4ab27d1b24f
Reviewed-on: https://gerrit.instructure.com/32184
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: James Williams <jamesw@instructure.com>
Change-Id: I2af3335578140c943b962dee7fa506bba62948d3
Reviewed-on: https://gerrit.instructure.com/32171
Reviewed-by: James Williams <jamesw@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
test plan:
* create a course with draft state enabled
* create several students (enough so that visiting the
module student progressions page, '/courses/X/modules/progressions',
fills the list of students on the right-hand side
* all of the students should now be accessible with a scroll-bar,
rather than hidden
fixes #CNVS-11847
Change-Id: If93766d06ace89f6d490a69fdb5ea53d66a01486
Reviewed-on: https://gerrit.instructure.com/32044
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
test plan:
- have a course with draft state enabled
- have a published assignment with student submissions
- have a file
- add the assignment and the file to a module
- without reloading the page, if you hover over the cloud icon
for the new modules items, you should get an explanation for
why you can't unpublish the items
fixes CNVS-11845
Change-Id: I8cd98865b65552fb25e9151268eb956016f987e2
Reviewed-on: https://gerrit.instructure.com/32120
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
test plan:
- have an item (quiz, page, etc.) that is published
- add it to a module
- it should appear published (green text) immediately
fixes CNVS-11535
Change-Id: Iaa92dcc855263eb656931cbd921e0b6616ab2667
Reviewed-on: https://gerrit.instructure.com/32092
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
fixes CNVS-11738
test plan:
* create a graded discussion
* pin and unpin it on the index page
* verify that it shows up in the appropriate section
* regression test creating, editing, and viewing discussions
Change-Id: I425881f1d963cd18fcbe77823de4de0843333841
Reviewed-on: https://gerrit.instructure.com/31588
Reviewed-by: Jon Willesen <jonw@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Braden Anderson <banderson@instructure.com>
test plan:
- have a course with draft state enabled
- have a module requiring sequential completion
- put a wiki page in the module after an item with a requirement
- as a student that has not completed this requirement,
attempt to access the page via All Pages
- should get a message indicating the page is locked
fixes CNVS-11842
Change-Id: Id91cde3677a7c0b6bdcdfb89d565e72f347c3d13
Reviewed-on: https://gerrit.instructure.com/32028
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Mark Severson <markse@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
test plan:
verify conference type is moved to plugin config and out of
conferences
Change-Id: Ia483a5d4e1d605ac064e1361fef98ce80cb579d4
Reviewed-on: https://gerrit.instructure.com/32134
Reviewed-by: Jake Sorce <jake@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Adam Phillipps <adam@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
fixes CNVS-10728
test plan:
* open new conversations
* select multiple unread conversations with shift-click
(or select multiple and mark as unread)
* in the header's "More options" menu, click "mark as read"
* verify that the messages are marked as read
* reload the page
* verify that the change persists
Change-Id: I21cad13d1334f15708fbf0a7a4fdbba51304e487
Reviewed-on: https://gerrit.instructure.com/31700
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
Product-Review: Braden Anderson <banderson@instructure.com>
Test Plan:
* With draft state on add a module header item to a module
* it should be unpublished
closes CNVS-11839
Change-Id: Ia36326b63bbbf980534cb4d163c648016ddb41fe
Reviewed-on: https://gerrit.instructure.com/32047
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Test Plan:
1. Create a webex conference for a future date
2. Verify that the date shows up in the new conferences table
Change-Id: I6592c856c8ed0a3c7264d76f7fd4a4446ef790a2
closes: PS-1102
Reviewed-on: https://gerrit.instructure.com/31884
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brandon Broschinsky <brandonbr@instructure.com>
Product-Review: Adam Phillipps <adam@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
fixes CNVS-11824
test plan:
- go to the assignment index page
- click the 'new assignment' button
- on the new assignment details page, click the cog
- click 'delete'
- it should take you back to the index page, and not save the new assignment
Change-Id: Ifbbb151b40e526cd337ce809ea12d0df4371143c
Reviewed-on: https://gerrit.instructure.com/32034
Reviewed-by: Cameron Matheson <cameron@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Clare Strong <clare@instructure.com>
Temporary fix until we merge in a commit from ic-ajax that does this
automatically.
Change-Id: Iebaa987354eba4fa5796af50ea94f115dfd1f8f2
Reviewed-on: https://gerrit.instructure.com/31898
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Stanley Stuart <stanley@instructure.com>
QA-Review: Stanley Stuart <stanley@instructure.com>
we've seen some broken conversions that are 20x+ larger than
the original video. add a quick heuristic to deprioritize any
conversion > 5x the size of the original. (seems like if
the conversions are substantially larger than the original,
then we're doing it wrong.)
fixes CNVS-11227
Change-Id: I0b318c609ddd59f4507d38a4b69383f3ff77279c
Reviewed-on: https://gerrit.instructure.com/31442
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Change-Id: I02b6fd42d5d784b0628198e8e309d503bea0cc1a
Reviewed-on: https://gerrit.instructure.com/31711
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams <jamesw@instructure.com>
QA-Review: James Williams <jamesw@instructure.com>
if mocha was initialized prior to rails (i.e. if a spec like swagger
that doesn't initialize rails runs prior to a spec that needs rails),
CollectionProxy would remove the mocha methods when it was first defined.
so make sure we restore them
Change-Id: Icf9b1a2598fef279c32b37dd7afe52e15c07c23e
Reviewed-on: https://gerrit.instructure.com/31934
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Reviewed-by: Cameron Matheson <cameron@instructure.com>
fixes CNVS-11010
test plan:
* open a course conferences page
* open the new conference dialog
* attempt to enter more than 255 characters in the title field
* verify that you cannot do so
* save your new conference
* verify that it saves successfully
Change-Id: I3d7c5d51ee0c8e224827a576982690cfebc38553
Reviewed-on: https://gerrit.instructure.com/31690
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
Product-Review: Braden Anderson <banderson@instructure.com>
fixes CNVS-11330
test plan:
* open outcome gradebook
* hover on a column header
* click on the details link
* click on an outcome
* click on its title
* verify that the outcome information loads
Change-Id: I46e3096659d8dcea47778dea738b26c7ff6958ca
Reviewed-on: https://gerrit.instructure.com/31691
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
Product-Review: Braden Anderson <banderson@instructure.com>
Michael Ziwisky