Commit Graph

19754 Commits

Author SHA1 Message Date
Ethan Vizitei 7cf97d0709 handle multiple RCE requests
fixes CNVS-27951

also document which methods are not in the
public interface to be clear
which methods are ok for other modules to call
on the service loader

TEST PLAN:
 1) go to some RCE use case with the service
    enabled
 2) make sure only 1 "get_module" call happens
    in the network panel

Change-Id: I064436e2a9ea7aa1c340848a2bf3e91dfcd23bb5
Reviewed-on: https://gerrit.instructure.com/74292
Tested-by: Jenkins
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Ethan Vizitei <evizitei@instructure.com>
2016-03-15 23:11:53 +00:00
Ethan Vizitei 39b4757a55 submit assignment RCE flag
closes CNVS-27647

Start RCE service integration with granular
feature flags for high risk areas

TEST PLAN:
 1) regression test submitting an assignment with a text entry
    type
 2) with RCE service in the mix and the RICH_CONTENT_HIGH_RISK_ENABLED
    flag on (the high risk flag), test submitting the assignment
 3)  note there will be no sidebar here.  We expect there to be no
    regressions using the remote editor.

Change-Id: I606a6c4004eea9656b6f4eaf3d883024801f177b
Reviewed-on: https://gerrit.instructure.com/73887
Tested-by: Jenkins
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Ethan Vizitei <evizitei@instructure.com>
2016-03-15 23:11:46 +00:00
Andrew Butterfield 4e2eef2285 Fix filename omission in first part of file upload
fixes PLAT-1369

When the file upload process is initiated, the file name that is
submitted in the initial request is being overwritten with an empty
string in the json response.

Test plan:
* Take the first step in the file upload process documented in the api
  docs
* Ensure that in the json response data the
    ['upload_params']['Filename']
  field contains the same file name that was sent in the request

Change-Id: I9335c5c6aecbf85f9900a57323a93f17b9ab0960
Reviewed-on: https://gerrit.instructure.com/74279
Reviewed-by: Brad Horrocks <bhorrocks@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Tested-by: Jenkins
Product-Review: Andrew Butterfield <abutterfield@instructure.com>
2016-03-15 21:48:57 +00:00
MFairbourn d0f4414f06 spec: logic changes to work with chrome
Test Plan:
- Test pass
- Code review

Change-Id: I22b5567351eb12db3411b9eda3d539ac7adb8252
Reviewed-on: https://gerrit.instructure.com/74570
Reviewed-by: Robert Lamb <rlamb@instructure.com>
Product-Review: Robert Lamb <rlamb@instructure.com>
QA-Review: Robert Lamb <rlamb@instructure.com>
Tested-by: Jenkins
2016-03-15 21:19:41 +00:00
Steven Burnett e653b2c71a fix combobox reading with jaws
fix combox reading with jaws on the message compose "to" field

fixes CNVS-26494

Test Plan:
- As any user of anything migrate to the inbox
- Compose a message
- With all screenreaders navigate to the "To" field of the
  compose message.  Notice it gives correct instructions

Change-Id: I5e6da7086550c68dca2fd406d853ac6f767b7fc9
Reviewed-on: https://gerrit.instructure.com/74205
Tested-by: Jenkins
Reviewed-by: Matt Berns <mberns@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Steven Burnett <sburnett@instructure.com>
2016-03-15 19:33:54 +00:00
James Williams 3bf51b246e cancel future appointments when enrollment is deleted
test plan:
* as a teacher, create a scheduler appointment group
* as a student, sign up for one of the slots
* remove the student from the course
* the slot should be free

closes #CNVS-27376

Change-Id: I098a8c8ad7b534d86a4f7be390e49d203ccbd4e1
Reviewed-on: https://gerrit.instructure.com/73483
QA-Review: Heath Hales <hhales@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams  <jamesw@instructure.com>
2016-03-15 19:23:14 +00:00
Joel Hough 33f379f7bd toggle star icon state when starred via cog menu in inbox
fixes CNVS-27745

test plan
- in conversations inbox, toggle starred status on a conversation
 via the cog menu
- ensure that the title of the conversation's star icon on the
 left sidebar reads "Unstar" or "Star" as appropriate. read the
 title either with a screenreader or by hovering the mouse over
 the icon

Change-Id: I4d2f2d42ff5b0d9de003e8fb3f5036a64d337504
Reviewed-on: https://gerrit.instructure.com/74066
Tested-by: Jenkins
Reviewed-by: Steven Burnett <sburnett@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2016-03-15 18:42:38 +00:00
James Williams d10e97ebc1 delete context_modules.scss
not used

refs #CNVS-27773

Change-Id: I8f41200549af10061aa91984f25df11dd4d5d7c8
Reviewed-on: https://gerrit.instructure.com/74392
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2016-03-15 18:35:01 +00:00
Jeremy Stanley e2066d7c6f don't undelete questions when copying over a deleted quiz
test plan:
 1. have a course with a quiz containing two or more questions
 2. copy this course
 3. delete one question in the source course's quiz
 4. delete the entire quiz from the destination course
 5. re-import the source course into the destination
 6. confirm the quiz question deleted in step 3 isn't present
    in the destination course's quiz

fixes CNVS-27725

Change-Id: Iaa04fce9fa2471a98223fe30a412d0ce1cfe0074
Reviewed-on: https://gerrit.instructure.com/74414
Reviewed-by: Ryan Taylor <rtaylor@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Tested-by: Jenkins
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2016-03-15 18:33:30 +00:00
Clay Diffrient e659ffd70f add start and async test to the replacements for qunitjsxloader
This makes it so using async test features of qUnit works within
the JSX specs.

Change-Id: I602468d7ef70091e603f02bc9558390b94c0bfee
Reviewed-on: https://gerrit.instructure.com/74527
Tested-by: Jenkins
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Clay Diffrient <cdiffrient@instructure.com>
2016-03-15 18:18:04 +00:00
Ethan Vizitei dc8ef9d39a allow RCE flag to be engaged on prod
fixes CNVS-28027

TEST PLAN:
 1) should be able to enable this flag on prod

Change-Id: Ie03d937d225cc77fcc08ae20c63289f95e45eb89
Reviewed-on: https://gerrit.instructure.com/74457
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins
Product-Review: Ethan Vizitei <evizitei@instructure.com>
QA-Review: Ethan Vizitei <evizitei@instructure.com>
2016-03-15 18:17:18 +00:00
James Williams 8c86084379 fix ExternalFeedAggregator with psych and atom
Change-Id: I939e376c4685ed2a0724776bcff0ca4cfc003abe
Reviewed-on: https://gerrit.instructure.com/74498
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2016-03-15 17:18:14 +00:00
Joel Hough d9b3e386dc make help dialog instructor message link use a group conversation
fixes CNVS-12692

test plan
- create a course with more than one instructor
- as a student, use the help menu to send a message to the course
 instructor
- as one of the instructors, view the message that was sent
- ensure that all course instructors are listed in the recipient
 list

Change-Id: I6281be19cdcedeeb0d885020b8d6a976ce8a940a
Reviewed-on: https://gerrit.instructure.com/72331
Reviewed-by: Steven Burnett <sburnett@instructure.com>
Tested-by: Jenkins
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2016-03-15 17:06:51 +00:00
James Williams 5c24ba9d0e hide groups for inaccessible courses in groups list
test plan:
* create a course with a group
* add a student to the course and group
* soft-conclude the course by term dates and
 check the "Restrict students from viewing after end date"
 setting
* the group should not be shown in the list of
 "Previous Groups" for the student
 (at "/groups")

closes #CNVS-27827

Change-Id: I3051a915af99e10e53ca58caaefcab196b39c9de
Reviewed-on: https://gerrit.instructure.com/74394
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2016-03-15 16:48:34 +00:00
Derek Bender 0648ef00dc add more specs for totalcolumn.jsx
closes: CNVS-25713

test plan:
 - tests should pass: `JS_SPEC_MATCHER=*/**/totalColumnSpec.js bundle exec rake js:test`

Change-Id: I9b9b8d5ef9029e5eaf1df4440cbdf3961318bb8e
Reviewed-on: https://gerrit.instructure.com/69299
Reviewed-by: Spencer Olson <solson@instructure.com>
Tested-by: Jenkins
QA-Review: KC Naegle <knaegle@instructure.com>
Product-Review: Derek Bender <djbender@instructure.com>
2016-03-15 16:35:14 +00:00
Cody Cutrer b469b83f64 protect against inadvertent use of potentially dangerous redis commands
test plan:
 * try Rails.cache.instance_variable_get(:@data).keys, or any other way
   you can think of to try and get all keys (or flushdb or other scary
   stuff) from redis
 * it should raise an error
 * Shackles.activate!(:deploy)
 * try again
 * it should work

Change-Id: I57772df3851fd14b6a46a56c9cd8ef6ddce015e3
Reviewed-on: https://gerrit.instructure.com/73940
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2016-03-15 15:02:07 +00:00
Cody Cutrer 5172abb5db fix user search returning non-scopes
makes it non-chainable for more scopes

test plan:
 * use /api/v1/accounts/:id/users?search_term=<the id of a user>&include[]=last_login
 * it should not 500, and return valid info for last_login

Change-Id: I7a4bf9dbc6bcb4e5be15a86d883467036b9de266
Reviewed-on: https://gerrit.instructure.com/74295
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2016-03-15 15:01:50 +00:00
Michael Brewer-Davis ab229b47a4 add student/assignment ids to grade/submission events
- allows CYOE listener to avoid api call to reconcile
  students/assignments/grades

refs CYOE-80

Test plan:
1.  Set up live_events in Canvas
2.  Monitor the live_events stream using
      `script/tail_kinesis`
3.  Create and grade on a student assignment
4.  Verify that there are user_id and assignment_id
    fields on the `grade_change`, `submission_created`,
    and `submission_updated` events

Change-Id: I0c24d6773e5f635b0f6a00cd18865600c498a98d
Reviewed-on: https://gerrit.instructure.com/74155
Reviewed-by: Michael Brewer-Davis <mbd@instructure.com>
Product-Review: Dan Minkevitch <dan@instructure.com>
QA-Review: Dan Minkevitch <dan@instructure.com>
Tested-by: Jenkins
Reviewed-by: Matt Smith <msmith@instructure.com>
2016-03-15 14:19:14 +00:00
MFairbourn 533d68dd7f spec: fix radio_btn select issue in content_migrations_spec
Test Plan:
-Specs should pass
-Code review

Change-Id: Ia915a74402259811dd7f3d1ad80c130e2e4efd33
Reviewed-on: https://gerrit.instructure.com/74483
Tested-by: Jenkins
Reviewed-by: Pedro Fajardo <pfajardo@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2016-03-15 13:01:40 +00:00
MFairbourn 78d30d7f84 spec: fix misc specs to run in chrome
Test Plan:
-Specs pass
-code review

Change-Id: I1da50dbee8decaf8a4d3750508ab5f0837f60fa4
Reviewed-on: https://gerrit.instructure.com/74482
Tested-by: Jenkins
Reviewed-by: Pedro Fajardo <pfajardo@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2016-03-15 13:01:16 +00:00
Transifreq 872fec6dc3 update he translation
Change-Id: I356e62e568cbf90f3b6547f8d89ebdb91416b8f7
2016-03-15 05:15:26 -06:00
Transifreq a8e0476bd0 update es translation
Change-Id: Icde809cd8ff4a9e1e7a4f2093355502fb707fad2
2016-03-15 05:12:37 -06:00
Landon Wilkins ead38ae4d8 tiny doc change, fixes CNVS-28032
test plan:
* n/a, doc only change

Change-Id: I470be23a1f3ca12fabd4c033f11adb8497cbfc3e
Reviewed-on: https://gerrit.instructure.com/74489
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
Tested-by: Landon Wilkins <lwilkins@instructure.com>
Reviewed-by: Braden Anderson <braden@instructure.com>
2016-03-15 07:26:38 +00:00
MFairbourn c749bc6143 spec: fix admin_tools permission spec
test plan:
-Specs pass
-Code review

Change-Id: I4d52f4a8253627c08cd04fa331d0a1e1f665ce95
Reviewed-on: https://gerrit.instructure.com/74485
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
Tested-by: Jenkins
2016-03-15 03:51:03 +00:00
MFairbourn b391a163e0 spec: fix map strip issue in discussion specs
test plan:
- specs pass
- code review

Change-Id: I2c1c259168137cc2d0c5664f7c64f78ff12e80dd
Reviewed-on: https://gerrit.instructure.com/74484
Tested-by: Jenkins
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
2016-03-15 03:23:40 +00:00
MFairbourn 8c4d9f8a39 spec: refactor specs to work with chrome
Test Plan:
- Specs should pass
- Code review

Change-Id: I6f807b6b867c10a3f2301ede2bc9723c40bc232f
Reviewed-on: https://gerrit.instructure.com/74472
Tested-by: Jenkins
Reviewed-by: Pedro Fajardo <pfajardo@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2016-03-15 00:47:19 +00:00
MFairbourn 0f917bcd6e spec: fix new_files specs to run with chrome.
Test Plan:
- Specs should pass
- Code review

Change-Id: I8dad776ff64c81ce2b0a0efa9afa3007bafe0b7c
Reviewed-on: https://gerrit.instructure.com/74437
Tested-by: Jenkins
Reviewed-by: Pedro Fajardo <pfajardo@instructure.com>
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2016-03-14 22:19:27 +00:00
Ethan Vizitei 997f66d72e Calendar RCE
closes CNVS-27639

Start RCE service integration with granular
feature flags for sidebar areas

TEST PLAN:
 1) regression test creating a calendar event
    with more options (should not break)
 2) with RCE service in the mix and the RICH_CONTENT_SIDEBAR_ENABLED
    flag on (the medium risk flag), side bar should show replaced
    by dummy sidebar from RCE service
 3) note that we do not expect the sidebar to be functional yet
    with the service, this is just making sure we can flip the
    switch, and didn't break calendar in the process

Change-Id: I7b07ed1522312445ed0f245d794995755341dcf7
Reviewed-on: https://gerrit.instructure.com/73643
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Ethan Vizitei <evizitei@instructure.com>
2016-03-14 21:19:00 +00:00
James Williams 095ae3a62d don't auto-activate observer enrollments for unregistered users
test plan:
* use the course people page to create a new user as an
 observer in a course
* they should recieve an invitation

closes #CNVS-26611

Change-Id: I3f919a9b9907a57efa03d140f789359d0d63b92c
Reviewed-on: https://gerrit.instructure.com/74401
Tested-by: Jenkins
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Allison Weiss <allison@instructure.com>
2016-03-14 20:58:02 +00:00
Cody Cutrer d414b19a1d fix passing time restrictions through to pv4
apparently we like to change param names halfway through the stack

test plan:
 * enable pv4
 * do an api request for pv4 data, passing start_time and end_time
 * it should work

Change-Id: I3fdc7c9105af5f45a2380f15981be03e91caed55
Reviewed-on: https://gerrit.instructure.com/74413
Tested-by: Jenkins
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2016-03-14 20:01:58 +00:00
Colleen Palmer 82c7235539 Take out wide breakpoint from canvas variables
closes: CNVS-27362

Test Plan:
- CSS should compile successfully
- No wide breakpoints should be found anywhere in code
- No UI changes

Change-Id: I8c96cce76819b171a332cf76c366c1250791d9e4
Reviewed-on: https://gerrit.instructure.com/74054
Tested-by: Jenkins
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Product-Review: Jennifer Stern <jstern@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
2016-03-14 19:38:43 +00:00
Chris Hart 5dcdc61edb Add short name to profile tray header
Fixes: CNVS-27536

Test plan:
- With the new UI enabled, log in as any kind of
  user and click the Profile link on the main
  nav.
- The tray header should now look like this:
  http://screencast.com/t/uSdNt9w276Zc
- The tray header should output the user's
  display name. If there is no display name, it
  will default to full name. If there is no full
  name, the email address will be used.
- Long names/addresses will be handled with
  ellipses.
- If the user has no avatar, the default avatar
  image will be used, same as the primary nav.

Change-Id: I272a3bdf5884e2bcaaab7491d369a615eb0a655b
Reviewed-on: https://gerrit.instructure.com/73685
Tested-by: Jenkins
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
QA-Review: Pedro Fajardo <pfajardo@instructure.com>
2016-03-14 19:38:42 +00:00
Colleen Palmer 59d4803d41 Take out wide breakpoint on item-groups
refs: CNVS-27362

Test Plan:
- Go to styleguide and "Item Groups"
- The size on the item group title is now 40% from 992px up

Screenshot - http://cl.ly/2k0H3X0C0q3k

Change-Id: Ic5179d027de52aebd90e7708cc47d97eb7076301
Reviewed-on: https://gerrit.instructure.com/74025
Tested-by: Jenkins
Reviewed-by: Pam Hiett <phiett@instructure.com>
Product-Review: Pam Hiett <phiett@instructure.com>
QA-Review: Gentry Beckmann <gbeckmann@instructure.com>
2016-03-14 19:38:38 +00:00
Adrian Russell 73bf947974 SPEC: move 2 tests to be done as students, delete a duplicate
Change-Id: I59159f879a85ff2635aa15026a9e6672bccca29a
Reviewed-on: https://gerrit.instructure.com/74433
Reviewed-by: Michael Hargiss <mhargiss@instructure.com>
Product-Review: Michael Hargiss <mhargiss@instructure.com>
QA-Review: Michael Hargiss <mhargiss@instructure.com>
Tested-by: Michael Hargiss <mhargiss@instructure.com>
2016-03-14 19:37:06 +00:00
Ethan Vizitei 23b995ec10 wiki RCE flag
closes CNVS-27642

Start RCE service integration with granular
feature flags for sidebar areas

TEST PLAN:
 1) regression test creating/editing a wiki page
 2) with RCE service in the mix and the RICH_CONTENT_SIDEBAR_ENABLED
    flag on (the medium risk flag), side bar should show replaced
    by dummy sidebar from RCE service
 3) note that we do not expect the sidebar to be functional yet
    with the service, this is just making sure we can flip the
    switch, and didn't break wiki in the process

Change-Id: I16810bf4f3941fd762f7d36f37cc25ab6e521b23
Reviewed-on: https://gerrit.instructure.com/73796
Tested-by: Jenkins
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Ethan Vizitei <evizitei@instructure.com>
2016-03-14 18:50:18 +00:00
Clay Diffrient e1a19ff487 Fix qunit jsx dependency loader regex
This makes it so that multi-line define statements work with
the qunit dep loader for jsx.

Prior to this commit
```
  define([
    'jsx/account_course_user_search/reducers/rootReducer'
  ], (reducer) => {
```

is not properly transformed, however

```
define(['jsx/account_course_user_search/reducers/rootReducer'], (reducer) => {
```

does get transformed properly.

Effectively, this replaces the `.` regex operator which doesn't transend
newlines with `[\s\S]` which effectively does the same thing
including newlines as well though.

Change-Id: Ife96438695997050fbdf866b7c319fa1b075875a
Reviewed-on: https://gerrit.instructure.com/74419
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
Tested-by: Jenkins
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Clay Diffrient <cdiffrient@instructure.com>
2016-03-14 18:39:12 +00:00
Pam Hiett b6072f029f consolidate hint-text/input-hint - increase from 10px to 12px
Refs: CNVS-26581

test plan:
- as an admin using the new and then old ui
- navigate to the admin link from the left-hand nav
- click into "users"
- now click the "add a new user" button from the right-hand side bar
- the modal that launches is now using the enlarge hint-text
  example in new ui: http://screencast.com/t/ZVpJgTyABLK
  example in old ui: http://screencast.com/t/hMQzCmewi

note: within this commit the input-hint class was removed in favor
of using the _forms.scss class hint-text

Change-Id: I817b2750969bfefbfa148232ccaf9e389125dc2f
Reviewed-on: https://gerrit.instructure.com/73269
Reviewed-by: Chris Hart <chart@instructure.com>
Product-Review: Chris Hart <chart@instructure.com>
Tested-by: Jenkins
QA-Review: Gentry Beckmann <gbeckmann@instructure.com>
2016-03-14 17:35:32 +00:00
James Williams 716ac86854 change warning text for course copy into self
closes #CNVS-27117

Change-Id: I0770bba397102a3c8fcc5ac114bdeae5cc60c1c8
Reviewed-on: https://gerrit.instructure.com/74407
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2016-03-14 17:09:36 +00:00
James Williams 41aabf6dae fix restoring discussion topics with posts
test plan:
* create a discussion topic for a course
* reply to the topic as a student
* delete the topic
* should be able to restore the discussion topic
 (to an active state) using the "undelete" endpoint

e.g. /courses/:id/undelete/discussion_topic_(:topic_id)

closes #CNVS-27924

Change-Id: I146930c6e8cc55c93698cd4df72471247e895642
Reviewed-on: https://gerrit.instructure.com/74325
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2016-03-14 17:06:40 +00:00
Spencer Olson 1e7d619e90 exclude excused submissions from grading totals
when a teacher excuses an assignment for a student
in the gradebook (using EX) and the student deselects
the box "Calculate based only on graded assignments"
on the courses grades page, the score for the excused
assignment will no longer be considered.

closes CNVS-27356

test plan:

1. from within the gradebook give a student a
   grade of excused
2. navigate to the student grade page and uncheck
   the box "Calculate based only on graded assignments"
3. observe the total score does not include the excused
   submission (previously, it would treat the excused
   submission as a 0)

Change-Id: I7a0c0fc2a96e2c81c57983c9fd9943b3e030df3b
Reviewed-on: https://gerrit.instructure.com/74282
Tested-by: Jenkins
Reviewed-by: Cameron Matheson <cameron@instructure.com>
QA-Review: KC Naegle <knaegle@instructure.com>
Product-Review: Christi Wruck
2016-03-14 17:01:51 +00:00
Felix Milea-Ciobanu 7c533d9ab0 fix keyboard focus issue when creating new folder
change depracted component.getDOMNode() syntax to React.findDOMNode

test plan:
- navigate to a user's Files page
- tab to the +Folder button and press Enter
- enter a name for the new folder and press Enter
- keyboard focus should now be on the newly created folder

fixes CNVS-26562

Change-Id: Id2e7547b9f3b3ff78b21c4d2e7780e9449bf2db5
Reviewed-on: https://gerrit.instructure.com/74067
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Tested-by: Jenkins
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Clay Diffrient <cdiffrient@instructure.com>
2016-03-14 16:47:02 +00:00
Cody Cutrer 825ac973af Merge branch 'feature/fix_course_update_params' of git://github.com/cmurtaugh/canvas-lms 2016-03-14 10:12:08 -06:00
Cody Cutrer 137b30b4e0 Merge branch 'feature/fix_section_update_params' of git://github.com/cmurtaugh/canvas-lms 2016-03-14 10:09:51 -06:00
Colleen Palmer 90148c0a03 Take out wide breakpoint on Submission details sidebar
refs: CNVS-27362

Test Plan:
- Go to an assignment that's been submitted > Submission Details
- Details sidebar on right should remain the same width from 992px and up
Screenshot - http://cl.ly/1o3R06433W1F

Change-Id: If002bc7f14da3e4b063a1dd88eda257e13befe15
Reviewed-on: https://gerrit.instructure.com/73995
Tested-by: Jenkins
Reviewed-by: Pam Hiett <phiett@instructure.com>
Product-Review: Pam Hiett <phiett@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
2016-03-14 15:09:00 +00:00
Rob Orton e66c5435b5 enable new default report for all accounts
refs CNVS-26643

test plan
 - run migrations
 - new report should be enabled

Change-Id: Id36a8a61200239cbaf1fb9c1b7301abb7268eafe
Reviewed-on: https://gerrit.instructure.com/74287
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
2016-03-14 05:08:15 +00:00
Cody Cutrer 214b7e5203 fix timeouts on ruby 2.3
Error was introduced as an alias for ExitException in 2.0; ExitException
was removed in 2.3

Change-Id: I872456ceee1d79b2ac827939ebf2b0fdbb5f5e69
Reviewed-on: https://gerrit.instructure.com/74343
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2016-03-12 17:07:34 +00:00
Colin Murtaugh 550aa4215a add missing course update API doc param
fix typos

clarified documentation re: is_public vs. is_public_to_auth_users
2016-03-12 09:14:10 -05:00
Colin Murtaugh 9b601e18ce add missing section update API doc parameters; removed unnecessary comment
Squashed commits:
[d5a7138] removed unnecessary comment
2016-03-12 08:55:44 -05:00
Cody Cutrer d5ee20727d fix course restriction dates for quiz eligibility
fixes CNVS-27986

test plan:
- Create a quiz in Canvas
- Check the "Users can only participate in the course between these dates" box in the course settings
- As a student, attempt to take the quiz
- Ensure that student is able to take the quiz

Change-Id: I9b00d56c1657eb88cc996377f40ff6b1aec5dcee
Reviewed-on: https://gerrit.instructure.com/74381
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
QA-Review: Pedro Fajardo <pfajardo@instructure.com>
Product-Review: Bryan Petty <bpetty@instructure.com>
Tested-by: Jenkins
2016-03-12 04:15:44 +00:00
Max Thom Stahl fcd99f9826 Add more accessible icon for post to SIS status
The previous icon for displaying whether an assignment in the
assignments list view is set to post to SIS wasn't accessible for
colorblind people in that it changed color but not shape. This has now
been replaced with a slightly different icon now so that the shape as
well as color change when it is toggled.

Fixes: SIS-1740

Test plan:
    Look at the list assignments view.

    Toggle the "post to sis" button for some assignments.

    The new icon is filled in with a clear "S"; the old icon is not
    filled in with a solid "S". See the Jira ticket for more info.

    Confirm all other accessible cases work as expected

Change-Id: Iff4f9bac77081959fb8c8cfb55181f7b3c9ce46a
Reviewed-on: https://gerrit.instructure.com/72597
Reviewed-by: Jayce Higgins <jhiggins@instructure.com>
Tested-by: Jenkins
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Ken Romney <kromney@instructure.com>
2016-03-11 23:47:41 +00:00