Commit Graph

11977 Commits

Author SHA1 Message Date
Transifreq d33019f67e Updated pt-BR translation
Change-Id: I67882f6efe6cfc7d77b47b36d509fccfabd2a947
2014-08-05 05:25:21 -06:00
Transifreq 9bf313cbfc Updated ar translation
Change-Id: Id96cababc5214355e090b7aa7aaea034056c781d
2014-08-05 05:19:09 -06:00
Ryan Florence eb09993f70 fix student groups from if-lazy-list upgrade
you now have to specify the data you pass down
from the controller

Change-Id: I7bc6f9557c43aeee5eeab10a9e6d460b0ca1f334
Reviewed-on: https://gerrit.instructure.com/38332
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Product-Review: Ryan Florence <ryanf@instructure.com>
QA-Review: Ryan Florence <ryanf@instructure.com>
2014-08-04 21:43:53 +00:00
Duane Johnson 40b45c4aef fix 'assignment_visibility' API doc type
Swagger fails to generate code for pandarus / live API docs
because assignment_visibility array does not specify a type.

This sets the type to 'integer'.

Fixes SIS-400

Change-Id: I0a675dc51907d1a64993a36bed94d022deae3dda
Reviewed-on: https://gerrit.instructure.com/38575
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ken Romney <kromney@instructure.com>
Product-Review: Duane Johnson <duane@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
2014-08-04 21:12:15 +00:00
Ryan Florence 6bdb32c01b modules next: added basic item editing modal
test plan:

1. click the item row cog
2. choose “edit”
3. change the title
4. click save
   - item indicates “saving..”
   - item’s title updates
5. refresh the page
   - changes persist
6. repeat 1-3
7. click cancel
   - title does not update 

Change-Id: Idcd52c580078ca60ec468a4c85832b385d63220c
Reviewed-on: https://gerrit.instructure.com/38487
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Product-Review: Ryan Florence <ryanf@instructure.com>
QA-Review: Ryan Florence <ryanf@instructure.com>
2014-08-04 20:45:38 +00:00
James Williams 852ac4730b fix copying of quiz questions imported from question banks
test plan:
* create a course with a question bank
* add a question to the bank
* create a quiz
* import the question from the bank into the quiz
* copy the course
* the copied course should have a question bank
 matching the original name with the question

fixes #CNVS-14495

Change-Id: I8e56c5c59e88be5213a004d276aadd14b89ca0cd
Reviewed-on: https://gerrit.instructure.com/38610
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2014-08-04 19:49:36 +00:00
Cameron Matheson 83cf8d9af9 clear out stale submission fields on resubmit
fixes CNVS-5604

Test plan:
  * set up an assignment that takes online_url and online_text_entry
    submissions
  * make a online_url submission for an assignment
  * have the same student make an online_text_entry submission
  * the api response should now *not* include the url anymore

Change-Id: I2389b0b3e8a565eed01f85ba2bed874c59585a2f
Reviewed-on: https://gerrit.instructure.com/37796
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Anna Koalenz <akoalenz@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
2014-08-04 19:32:41 +00:00
Paul Hinze 70b38563df Remove manual hacks from mediaelement js/css
Rather than running our script that stitches together mediaelement js
and css files and _then_ manually editing in our hacks, enhance the
build script to be able to pull specific customizations from local
files.

Use this new facility to stitch in our "upload subtitle" feature in
more cleanly.

Also normalize the whitespace in our hacks to match me.js tab style to
reduce the diff between our code and upstream.

Note that the diff when ignoring whitespace on
public/javascripts/vendor/mediaelement-and-player.js is only comments.

On the CSS side, we pull out the full screen subtitle font-size bump
into a separate file. We also update the target location for the
vendored CSS file in the build script.

Now `rake build_media_element_js` should be idempotent.

Test plan:

 - Verify the media player works for video and audio.
 - Verify that captions in full screen videos show with a large font

Change-Id: I698b0c3454c12bfa4efffc2d98ab9056d351220c
Reviewed-on: https://gerrit.instructure.com/38455
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Paul Hinze <paulh@instructure.com>
2014-08-04 19:04:16 +00:00
Joel Hough 81eae17868 spec: disable last_authored_message_at checks
CNVS-13598 fixed some instances where last_authored_message_at was
not being set correctly. unfortunately, it caused regressions in
forwarding and reply-all. CNVS-14333 reverted CNVS-13598, but
left fragile last_authored_message_at checks.

this commit removes those checks. they should be put back when we
fix the original problem in CNVS-13598

Change-Id: Iaa04d8c3ee41e9753b9f8ea042e035b12cc619f6
Reviewed-on: https://gerrit.instructure.com/38680
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Reviewed-by: Mark Severson <markse@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-08-04 16:48:37 +00:00
Jeremy Stanley dc613caf6d zip content exports for course, group, user
test plan:
 1. use the content exports api with export_type=zip
    to export files from courses, groups, and users
   a. confirm only users who have permission to
      download files from these contexts can perform
      the export
   b. confirm that deleted files and folders do not show
      up in the downloaded archive
   c. confirm that students cannot download locked files
      or folders from courses this way
   d. check the progress endpoint and make sure
      it increments sanely
 2. perform selective content exports by passing an array
    of ids in select[folders] and/or select[attachments].
    for example,
      ?select[folders][]=123&select[folders][]=456
      ?select[attachments][]=345
      etc.
   a. any selected files, plus the full contents of any
      selected folders (that the caller has permission
      to see) should be included
      - that means locked files and subfolders should
        be excluded from the archive
   b. if all selected files and folders are descendants
      of the same subfolder X, the export should be named
      "X_export.zip" and all paths inside the zip should be
      relative to it. for example, if you are exporting A/B/1
      and A/C/2, you should get "A_export.zip" containing
      files "B/1" and "C/2".
 3. use the index and show endpoints to list and view
    content exports in courses, groups, and users
   a. confirm students cannot view non-zip course exports
      (such as common cartridge exports)
   b. confirm students cannot view other users' file (zip)
      exports, in course, group, and user context
   c. confirm teachers cannot view other users' file (zip)
      exports, in course, group, and user context
      (but can still view course [cc] exports initiated by
      other teachers)
  4. look at /courses/X/content_exports (web, not API)
   a. confirm teachers see file exports they performed
   b. confirm teachers do not see file exports performed by
      other teachers
   c. confirm teachers see all non-zip course exports
      (cc/qti) including those initiated by other teachers
  5. as a site admin user, perform a zip export of another
     user's files. then, as that other user, go to
     /dashboard/data_exports and confirm that the export
     performed by the site admin user is not shown.

fixes CNVS-12706

Change-Id: Ie9b58e44ac8006a9c9171b3ed23454bf135385b0
Reviewed-on: https://gerrit.instructure.com/34341
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Jon Willesen <jonw@instructure.com>
2014-08-04 16:38:19 +00:00
Jon Jensen 10e5fe6596 spec: once-ler spec/controllers/[m-q]*
reduce runtime ~45% (4:46 -> 2:34)

Change-Id: If1190222d3077dabe62b8cba1b929f4855aad146
Reviewed-on: https://gerrit.instructure.com/38669
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2014-08-04 16:18:20 +00:00
Jon Jensen 064c35710f spec: once-ler spec/controllers/[f-l]*
reduce runtime ~65% (5:05 -> 1:50)

Change-Id: I5090e1d66bc4dc3315734090d160046df16df1dc
Reviewed-on: https://gerrit.instructure.com/38667
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2014-08-04 16:18:17 +00:00
Jon Jensen ae7a5fb84c spec: once-ler spec/controllers/[d-e]*
reduce runtime ~50% (2:16 -> 1:06)

Change-Id: I7fae1628f8d9f726bcd0ac6b94f170682e0a9394
Reviewed-on: https://gerrit.instructure.com/38666
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2014-08-04 16:18:14 +00:00
Jon Jensen eeea9947fb spec: speed up some model specs
reduce runtime of these files ~25% (3:54 -> 2:56)

Change-Id: Ibdb7260ac55c7272c8e35961fcfcdafa8da638ea
Reviewed-on: https://gerrit.instructure.com/38665
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2014-08-04 16:18:12 +00:00
Hannah Bottalla 23a1ee79f8 add bullet_instructure gem and config
Change-Id: I044b10725d73cabccdee07403b4fa269c1d10944
Reviewed-on: https://gerrit.instructure.com/38279
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Reviewed-by: Adam Ard <aard@instructure.com>
2014-08-04 16:17:09 +00:00
Ryan Shaw 485b90a6f7 replace compass with node-sass
after many steps towards this moment, we're finally here

This yanks sass and compass out of canvas-lms
completely and instead uses the libsass based
node-sass to compile our SASS files.

wins:

It is WAYYY faster!
as in, < 10 seconds to recompile all css in canvas
(compared to the 5+ minutes it used to take)

It is all in JS, helping use move to a completely
nodeJS based fronted tooling workflow.

next steps:

remove jammit: we don't need an assets.yml file
since node-sass can output compressed css for us
and we use sass to do all of our @import'ing of other
files (@colleen calls those "compiler" sheets), this
would simplify and speed up fronted asset building
even more

use gulp/broccoli/whatev to do cached, incremental builds

test plan:

all outputted css should look exactly the
same as it used to.

run `npm run compile-sass`, make sure it works
and is way faster than `rake css:generate` used to be

Change-Id: I7d865ea6b3e374cdc27a883d2019a4c15746c0e2
Reviewed-on: https://gerrit.instructure.com/38416
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2014-08-04 15:28:29 +00:00
Ryan Shaw ba4d2db268 get all remaining sass files working with lib sass
to test, run:
https://gist.github.com/anonymous/bc9c74c7d2438c3f6375
from the /app/stylesheets directory
and see that it works

to re-render all sass in the app went from
294.39s user 21.77s system 273% cpu 1:55.41 total
to:
79.14s user 11.29s system 684% cpu 13.212 total

from 2 minutes down to thirteen seconds!!!

(with a bunch of stuff I can do to further optimize)

Change-Id: Ib239da39226f041d02cea4fb9d5e4f6fe3e18468
Reviewed-on: https://gerrit.instructure.com/38415
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2014-08-04 15:28:12 +00:00
Ryan Shaw 9f6efcf5b5 get c-common.scss parseable by node-sass
This is the hardest one, it was not too bad though.
Things I found you need to do:

1. You can't have a "//" comment on the same line in .sass syntax
so the following line:

.foo //a comment about foo

would need to be:
//a comment about #foo
.foo

2. in .sass, you have to use double quotes for @import
so:      @import 'foo'
becomes: @import "foo"

things you do NOT have to do:

1. don't have to add the extension or the underscore
in front of filename for @import.
e.g, DON'T have to convert:
@import "foo"
to:
@import "_foo.scss"

2: don't have to convert the leading colon syntax
   of super old sass to colon between syntax
e.g:
.foo
  :width 100%
is just fine

(Hallelujah on not having to do those 2, it
makes this a lot smaller of a change)

test plan:
`npm install node-sass` then
within the /app/stylesheets directory,
run this command and see that it works:

../../node_modules/.bin/node-sass --include-path variants/new_styles_high_contrast base/c-common.scss

Change-Id: I73e382560e3dcbf55c32e97bb245b5ec262d4cb0
Reviewed-on: https://gerrit.instructure.com/38414
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2014-08-04 15:27:58 +00:00
Ryan Shaw ade0ad9fcf relax warning on ensure-contrast
...so we don't get bugged by our input:placeholder
styles

the number 2 was just something arbitrary that I had picked

Change-Id: I256880f0c4e3b11084387dfabf1dffa3fdaf6688
Reviewed-on: https://gerrit.instructure.com/38484
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2014-08-04 13:48:16 +00:00
Ryan Shaw 2bc9f23f9e remove reference to calendar1 css
it doesn't exist and is not used anyway

this fixes this warning:
Jammit Warning: No assets match 'public/stylesheets_compiled/k12_high_contrast/pages/calendar/calendar.css'

test plan:
run rake canvas:compile_assets and see that you
don't get that warning

Change-Id: I547b846e922139d3cd7580e6c121ca53f131a9b4
Reviewed-on: https://gerrit.instructure.com/38483
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2014-08-04 13:47:47 +00:00
Transifreq 50ea9cbc73 Updated fa-IR translation
Change-Id: I3f8b1108efd795e780b1d31ec1debe5636464e00
2014-08-04 05:44:18 -06:00
Transifreq caf4080fb5 Updated en-AU translation
Change-Id: I79e3676e0336282e8e039858fc4b30a26c854656
2014-08-04 05:37:54 -06:00
Aaron Cannon 69d209a141 Accessibility: Turned discussion edit button into button for SR users
Fixes CNVS-13971

Test plan:
- Visit a discussion with edit privileges
- Using a screen reader, verify that the edit button is reported as being a
  button

Change-Id: Ie89a3595d33f14fbb990dc2f8140216d5a08bfe2
Reviewed-on: https://gerrit.instructure.com/38469
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jayce Higgins <jhiggins@instructure.com>
Product-Review: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: David Josse <david@instructure.com>
2014-08-04 08:00:52 +00:00
Jon Jensen 57b9247488 spec: speed up content migrations specs
1. add some :once's to reduce total runtime from 4:50 -> 3:50
2. split it out into multiple files so that it can be parallelized
   (slowest one is course_copy_quizzes_spec.rb @ 0:50)

Change-Id: I5fd70d9d05f622180fa000e25e982e821ff36d82
Reviewed-on: https://gerrit.instructure.com/38605
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
Tested-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
2014-08-03 18:23:26 +00:00
Transifreq 8aee120ee4 Updated fa-IR translation
Change-Id: I3abcf2317e9a8a4fc5c20fd2b556b239f87fef6d
2014-08-03 05:43:15 -06:00
Transifreq 4a17dde3d0 Updated nb translation
Change-Id: I2760d958646159d8d8e5833506e5f50467840dc1
2014-08-03 05:30:28 -06:00
Transifreq 417f146777 Updated fa-IR translation
Change-Id: I3044c22dd1d82bd1d067a0fe685d58aa9d65b293
2014-08-02 05:41:39 -06:00
Cody Cutrer 948a57a183 fix permission inheritance
fixes CNVS-14451

test plan:
 * create a role in a root account
 * grant a permission to that role, and add an admin to that role
 * in a sub-account, revoke that permission from that role
 * ensure that the admin still has the permission in both the root
   account and a sub account (the sub account can't revoke permissions
   that admins got from further up the chain)
 * add an admin in that role to the sub account
 * ensure this new admin does not have the permission

 * and, sadly, permissions regression, cause we're messing with
   low level permissions stuff again

Change-Id: I7ccc32f36e4476d5df77eaec765abcb1c7b89b3e
Reviewed-on: https://gerrit.instructure.com/38604
Reviewed-by: Nick Cloward <ncloward@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2014-08-02 01:28:49 +00:00
Cameron Matheson abea42ae86 fix bulk_load_versioned_attachments bug
fixes CNVS-14509

previously it didn't include a submissions's attachment (used for
screenshots on url submissions)

Test plan:
  * make a url submission
  * use the submissions api (for_students endpoint) to get the submission
  * it should include an attachment for the screenshot of the submission

Change-Id: Ic4c2cfe693e0446bb48c811e8d2c5fd44e53d6a9
Reviewed-on: https://gerrit.instructure.com/37731
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
2014-08-02 00:36:13 +00:00
Joel Hough 2f8880d2e2 Revert "conversations: fix last_authored_message_at"
fixes CNVS-14333

This reverts commit 4e83960eb4.

Change-Id: I4631088293abc5f2bcb281d60165f9710c7b6111
Reviewed-on: https://gerrit.instructure.com/38622
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
Product-Review: Matthew Wheeler <mwheeler@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-08-02 00:28:48 +00:00
Brad Horrocks d1092fc27e Language selection label - "English" is now "English (US)"
Making it known that the default english locale is en_US

Fixes INTL-2

test plan:
- open up user settings
- click edit
- open the language dropdown
- make sure that "English" no longer shows up while "English (US)" does
- save your changes
- validate that the changes were made
- this will affect any place that renders the local name from i18n.available_locales

Change-Id: Ice1f00655be1f83293553e1875ab377ad9008f1a
Reviewed-on: https://gerrit.instructure.com/38281
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Mark Severson <markse@instructure.com>
Product-Review: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
2014-08-01 23:45:41 +00:00
Jon Jensen bdc9369699 spec: fix sporadic page view failure
two specs saved a page view with the same id, thus the count would not
change on the second one unless run in isolation

Change-Id: I04bdfd440fa1fd67e58f07df9c7e75cf854c7137
Reviewed-on: https://gerrit.instructure.com/38608
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
2014-08-01 23:42:33 +00:00
Jon Jensen f79fdff173 spec: fix sporadic media comment spec failures
delayed jobs from a previous (non-transactional) spec were causing the
expectations to fail

Change-Id: I0b4c2db3e4b2baa0a3416233c18e5ec3230cdfb2
Reviewed-on: https://gerrit.instructure.com/38607
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
2014-08-01 23:42:30 +00:00
Jon Jensen eef510c920 spec: stub test translations
fixes sporadic i18n failures (due to unexpected translations persisting
across tests)

Change-Id: Id7f4f13d8d789797b60c5492e5d37ae8e6aae34e
Reviewed-on: https://gerrit.instructure.com/38606
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
2014-08-01 23:42:26 +00:00
Jon Jensen 8f7089a6fd fix external mathjax script, fixes CNVS-14540
cdn was giving 404s; this was causing a selenium spec failure and
preventing preview from working in the advanced editor. switch to
something more reliable.

from my limited testing, we can't easily host this ourselves, because it
dynamically loads other scripts.

test plan:
1. go to the equation editor
2. confirm there are no errors in the js console
3. confirm that the basic editor works
4. confirm that the advanced editor works (live preview too)

Change-Id: Id261740d848cdae8922c9cfd985c9c7e7f84236e
Reviewed-on: https://gerrit.instructure.com/38624
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
2014-08-01 21:14:07 +00:00
Matthew Berns 764a9fecac fixed typo on API, line was repeated.
fixes CNVS-14227

test plan:
- visit /doc/api/assignments.html
- should only see one instance of line 'API for accessing assignment information.'

Change-Id: Ia0c55d2aaea4f7eeaefd30ea0427be75b0719b6a
Reviewed-on: https://gerrit.instructure.com/38465
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-08-01 20:50:19 +00:00
Joel Hough 1c31aee79c stop stream items from unlinking discussion subentries
fixes CNVS-14383

test plan
- create a discussion with "post before seeing replies" checked
- create a reply to the discussion
- as a user in the course who has not replied to the topic,
 fetch the /api/v1/courses/:course_id/activity_stream/summary
- as the topic creator, edit the topic message (to queue a job
 to recreate the materialized view)
- ensure that the reply is still present (the materialized view
 must be regenerated before the bug would remove the entry)
- toggle the unread state on the entry, ensuring that no errors
 appear in the debug console

Change-Id: Iaf8d15195c5c6fef8f1b22bf7dfc9110b05394f2
Reviewed-on: https://gerrit.instructure.com/38564
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
Reviewed-by: Mark Severson <markse@instructure.com>
Product-Review: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
2014-08-01 20:11:42 +00:00
Cameron Matheson 708328d18d don't let crocodoc blob/hmac be used for canvadoc
Test plan:
  make sure canvadocs/crocodoc still work in speedgrader

Change-Id: Ie5a7b8759206b0293757a2c2d820f0e7f5af164d
Reviewed-on: https://gerrit.instructure.com/36201
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
2014-08-01 19:32:13 +00:00
Aaron Cannon 03389e6093 Accessibility: Names of external links are no longer obscured for SR users
Fixes CNVS-14483

Test plan:
- Add a link to an external site, such as Google, to a wiki page
- View the page with a screen reader and verify that the name of the external
  link is read, and that the text informing the user that it is an external
  link is appended to the link name.
- Verify that the visual appearance and opporation of the external link is
  uneffected

Change-Id: I689045fa09191239637dc686352bf6a0728ead0e
Reviewed-on: https://gerrit.instructure.com/38499
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Aaron Cannon <acannon@instructure.com>
2014-08-01 19:19:41 +00:00
Simon Williams 029d6a050d api: restore regular per_page defaults to assignment index action
closes CNVS-14424

test plan:
- in a course with >10 assignments, list them with the api
- you should get 10 back by default

Change-Id: If671da72e1f6f85bce57635460306123addcaeb2
Reviewed-on: https://gerrit.instructure.com/38232
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cameron Matheson <cameron@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-08-01 17:56:24 +00:00
Cody Cutrer cbebeddac5 ruby 2.1 is tested automatically now
even if it hasn't had a full manual regression check on it

Change-Id: Ia9275c1fe95236b750b602e34727d7cd2caf2936
Reviewed-on: https://gerrit.instructure.com/38603
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-08-01 16:57:22 +00:00
Michael Nomitch a8f91b248e DA - assignment and submission access for students and observers
fixes CNVS-14071

test plan:
  - set up differentiated assignments
    - as a student go directly to an assignment url
      (eg - courses/1/assignments/2)
      - students without visibility should get a flash
        message and get redirected to the assignment index
      - students with visibility should see the normal page
    - as a student go directly to a submission url
      (eg - courses/1/assignments/2/submissions/3)
      - students without visibility should get a flash
        message and get redirected to the assignment index
      - students with visibility should see the normal page
    - as a teacher and TA these pages should work fine
    - observers should have the same permissions as the
      students they are observing (try hard to break)

Change-Id: I063fbd5ab3664d69754f01f5bdc740fb79048804
Reviewed-on: https://gerrit.instructure.com/37704
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Liz Abinante <labinante@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Mike Nomitch <mnomitch@instructure.com>
2014-08-01 15:29:20 +00:00
Simon Williams 8bb6fcdcc2 don't display account settings notification tab if empty
fixes CNVS-2684
fixes CNVS-2768

test plan:
- in the site admin account settings page:
  - the notification tab should be gone
  - updating settings should still work
- in the root account settings page:
  - the notifications tab should still be present and functional
- in a sub-account settings page:
  - the notification tab should be gone
  - updating settings should still work

Change-Id: Ic6b016be8d0b7a00f4153870220dbb34388a350b
Reviewed-on: https://gerrit.instructure.com/38367
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Anna Koalenz <akoalenz@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-08-01 15:20:25 +00:00
James Williams 829478bc38 add support for tar and tar.gz archives in content migrations
also add limits for byte size and file count to prevent
zip/tar "bombs"

test plan:
 * import the package referenced in the ticket
 * should import successfully

 * content migration regressions

closes #CNVS-14303 #CNVS-14428

Change-Id: Ia424b5260e34f35b62ca47f7aafa77118c4f5b5b
Reviewed-on: https://gerrit.instructure.com/37881
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2014-08-01 12:36:27 +00:00
Transifreq 00b6f88161 Updated fa-IR translation
Change-Id: I71cc8145664ebec5e34b19a65edbc4d5fcf2455e
2014-08-01 06:13:53 -06:00
Transifreq 87a05dcf94 Updated tr translation
Change-Id: Ie12d7e2de3d210305bcc93c86332e01fb99a1766
2014-08-01 06:09:47 -06:00
Transifreq 228f546c67 Updated en-AU translation
Change-Id: I5697595562430460cbb0a622935bd1eb5dc25845
2014-08-01 06:05:38 -06:00
Transifreq 58c2010742 Updated en-GB translation
Change-Id: I799025701eaf45e1a387d45d5250487d486062d3
2014-08-01 06:01:27 -06:00
Transifreq e5411fbdf3 Updated ko translation
Change-Id: Ifc431f8c35a3d789cd27f5a2555edef65bc6b337
2014-08-01 05:57:19 -06:00
Transifreq f2880352a0 Updated nb translation
Change-Id: I23854f8bf1194d24f75a8115a0942b6d23ad4282
2014-08-01 05:53:15 -06:00