Commit Graph

21223 Commits

Author SHA1 Message Date
Ryan Shaw 6c6e58b919 ensure jQuery is loaded before running pageless on user_notes page
refs: CNVS-28781

I don't think this would have been a problem in production
but locally, jquery ($) was not loaded yet when
it tried to run this

test plan:
load http://c.dev/users/1/user_notes
it should not say "$ is not defined" in dev console

Change-Id: I5adcef12d6e6cee64431b6ff00a0856085ac2841
Reviewed-on: https://gerrit.instructure.com/84835
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2016-07-12 16:47:12 +00:00
Ryan Shaw 75f1bb2adb move css for #syllabus from common to just the places that use it
refs: CNVS-28781

instead of loading the css for scss on every page
in the common.scss bundle, this just loads it in the
three places it is actually used

test plan:

* compile assets
* go to the syllabus for your course
* enable "Faculty Journal" and go to /courses/x/user_notes
* they should render correctly and look like they did before
* styles for #syllabus should _not_ be included on
  every other pageload in common.css

Change-Id: I9e5f90e790f3fa122486f6296780511f7c0c0592
Reviewed-on: https://gerrit.instructure.com/77306
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2016-07-12 16:26:29 +00:00
Matthew Sessions 3642fa1942 JS code coverage
Fixes CNVS-30301

Test Plan:
 - Running the js tests locally should generate
   a folder called coverage-js with an index.html
   file that has the coverage information

Change-Id: Ib57b40c60791324d0a1eafab4c541957a2c2e7e7
Reviewed-on: https://gerrit.instructure.com/84839
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Tested-by: Jenkins
Product-Review: Steven Burnett <sburnett@instructure.com>
QA-Review: Steven Burnett <sburnett@instructure.com>
2016-07-12 16:06:31 +00:00
Brent Burgoyne 796725b688 fix syllabus description not showing in rcs editor
state is being maintained in a data attribute of the containing div,
and is only set in the text area when showing the edit form. after
the first edit is was being set on a stale node.

fixes CNVS-30322

test plan:
- enable the remote editor with sidebar feature flag
- go to syllabus
- click edit
- made a change
- click save
- click edit again
  - the editor should be populated with the right content, not empty

Change-Id: I568be0815265d28728c11687068d73e723571a25
Reviewed-on: https://gerrit.instructure.com/84562
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2016-07-12 15:11:04 +00:00
James Williams a869a26b73 separate discussion topics and announcements in importers
test plan:
* import the package referenced in the ticket,
 selecting discussion topics
* it should not bring it announcements

closes #CNVS-30348

Change-Id: I733deb2bb22601f3f4c912cf9b81ab7b9a109bda
Reviewed-on: https://gerrit.instructure.com/84785
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2016-07-12 13:30:10 +00:00
Transifreq bfbcf1df4a update pt-BR translation
Change-Id: I724912d905186b9fdd9eb1e954ea998953ca49d9
2016-07-12 05:25:26 -06:00
Transifreq 6f988fb1bf update pl translation
Change-Id: Ieb7ea45b91c6a18f0a2e31377af77e3d807a9b85
2016-07-12 05:23:30 -06:00
Transifreq efda25f149 update nb translation
Change-Id: I7907876ee2a7c4cb4663dac1a610af2811d3d963
2016-07-12 05:20:52 -06:00
Transifreq fc80ace838 update en-AU translation
Change-Id: I2e573f76bba87299e146763334002de399dc9ba6
2016-07-12 05:12:31 -06:00
Transifreq 6ae58c2e79 update ar translation
Change-Id: I157d2c8398b704cc465cf7237f673be031d70946
2016-07-12 05:09:41 -06:00
Matthew Sessions be60fac01e Move collaborations tool to own page
Fixes PLAT-1654 & PLAT-1655

Test Plan:
 - With new collaborations feature flag, and
   lti_tool_provider_example set up
 - Go the new collaborations page through the
   course nav
 - Click the + Collaboration button (if you have multiple
   collaboration lti tools set up, click on one of the options)
 - This should take you to a new page that loads
 - lti tool in an iframe
 - Going back should take you back to the collaborations
   index page
 - Clicking on the edit link of a collaboration should
   behave similar to the + Collaboration button, just
   taking you to the edit portion of the lti tool

Change-Id: I2d13ef8d1eeafe3230c157485c15060c0f80f8d4
Reviewed-on: https://gerrit.instructure.com/84820
Tested-by: Jenkins
Reviewed-by: Andrew Butterfield <abutterfield@instructure.com>
QA-Review: Brad Humphrey <brad@instructure.com>
Product-Review: Matthew Sessions <msessions@instructure.com>
2016-07-11 22:41:35 +00:00
Neil Gupta 0612a4d1ad Add screen reader announcements when searching grading periods
Fixes CNVS-30168

Test plan:
* Go to your account's grading standards page
* Create some grading periods
* Search for those grading periods while using a screen reader

You should hear the number of results found after a search.

Change-Id: Iebaf92e9b509ca1df35ba6079de4ea68719461eb
Reviewed-on: https://gerrit.instructure.com/84891
Tested-by: Jenkins
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2016-07-11 22:40:31 +00:00
Neil Gupta 8c01985c51 Remove tabindex="0" from score column of grades summary
Fixes CNVS-29540

Test plan:
* Load a student's grade summary page
* Tab through the elements, you should not reach the score column

Change-Id: I9eccb4d42a5d2962c8209bc9d330bc9911cacf55
Reviewed-on: https://gerrit.instructure.com/84493
Tested-by: Jenkins
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Jeremy Neander <jneander@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2016-07-11 22:34:31 +00:00
Ryan Shaw 8207962b44 take out unused rake brand_configs:fingerprints task
we stopped using this in 
c3386397ef

test plan:
webpack build should work as normal

Change-Id: I47eab08811c5aa28b7d0c5bd1a70253bd457d134
Reviewed-on: https://gerrit.instructure.com/84827
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2016-07-11 22:29:18 +00:00
Ryan Shaw 34a7915257 Expose Brand JSON as API endpoint
closes: CNVS-21487

Mobile apps should be able to hit API endpoint that 
gets JSON of what their branding colors/images are.
We are generating a static .json file for active_brand_config, 
this is just exposing it in the API for mobile

test plan:
* go to /api/v1/brand_variables
* it should redirect to a json file of all the 
  brand variables to use for this domain

Change-Id: If725812a4d3ab0febc92a8a56a0c3540592bde50
Reviewed-on: https://gerrit.instructure.com/84624
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
QA-Review: Pedro Fajardo <pfajardo@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2016-07-11 21:05:53 +00:00
Matthew Sessions 481dc70037 Focus bio when name input is unavailable
Fixes CNVS-30304

Test Plan:
 - In account settings check Enable Profiles feature
 - Ensure that Users may edit their name is disabled
 - go to a students user profile page
 - Using a SR click the edit button
 - Notice that focus goes to the bio text area and
   this information is told to the SR user

Change-Id: Ib592e3e0d8434cdd1ab180cc74960d4593cdc5da
Reviewed-on: https://gerrit.instructure.com/84378
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Tested-by: Jenkins
Product-Review: Matthew Sessions <msessions@instructure.com>
2016-07-11 20:43:36 +00:00
Jeremy Stanley 93dee27904 fix discussion topic permissions for unauthenticated users
test plan:
 - in a public course, unauthenticated users should have the
   same restricted access as logged-in users who aren't enrolled
   in the course, namely:
   - the discussion topic index should not be accessible
     (/courses/X/discussion_topics redirects to a login page)
   - graded discussion topic descriptions are visible on the
     assignments page, but posts are not shown

fixes CNVS-30262

Change-Id: I8a4351c6bab5ca06a3c0c89a51b38e3d8bed3d24
Reviewed-on: https://gerrit.instructure.com/84164
Tested-by: Jenkins
Reviewed-by: Joel Hough <joel@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2016-07-11 18:42:51 +00:00
Cody Cutrer 0cc82ca5ab allow bundler up to 1.12.5
also stop using the undocumented eval_gemfile - apparently its
implementation changed

Change-Id: I5db6c98cb06baa5da2573ba15a4764cf4822aae1
Reviewed-on: https://gerrit.instructure.com/84534
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2016-07-11 18:03:47 +00:00
Ryan Shaw 02b182d9d7 add .nvmrc file so people that use NVM use the right node version
closes: CNVS-30354

test plan:

install nvm
run `nvm install` in with this checked out
it should say that it is using node 0.12.15

Change-Id: I0967b8e65d2e6a6b7ce00a63187ece0fbcd8204b
Reviewed-on: https://gerrit.instructure.com/84102
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2016-07-11 17:19:14 +00:00
Rob Orton 4e13360e02 respect default for post_to_sis in api
fixes SIS-1955

test plan
 - create an assignment with no post_to_sis
 - it should respect the default
 - create one with post_to_sis
 - it should respect what is set

Change-Id: I48a7b1403201d33b6d27371f1271f13fbc51496b
Reviewed-on: https://gerrit.instructure.com/84391
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2016-07-11 16:48:36 +00:00
Simon Williams 2674c00f41 api: specify all allowed include values for Course#show
fixes CNVS-30336

test plan:
- check the normal and live api docs for courses
- make sure include[] documentation is correct for:
  - List your courses
  - List courses for a user
  - Get a single course

Change-Id: I1a1c99219f1bc6f1c3fa8d1c1b74e6628a582998
Reviewed-on: https://gerrit.instructure.com/84593
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
2016-07-11 15:47:09 +00:00
Spencer Olson cdd029a5c3 add close_date column to grading_periods table
in addition, if no close date is provided on
creation of a grading period, the end date
will be used as the close date.

closes CNVS-26714

test plan:
* run the migration and verify it succeeds:
  $ bundle exec rake db:migrate
* open a rails console and verify the close_date
  attribute exists and it is a datetime:
  $ bundle exec rails console
  $ GradingPeriod
* verify:
  1) you can create a grading period with an end
     date but without a close date. the close date
     will get set to the end date that you provided.
  2) you can create a grading period with a unique
     end date and close date. the close date must
     be on or after the end date. if you attempt to
     create a grading period with a close date that
     is before the end date, it should fail.

Change-Id: I1a180af4eb8c23703e3844d2e93159010f0c9e58
Reviewed-on: https://gerrit.instructure.com/84340
Tested-by: Jenkins
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2016-07-11 15:03:39 +00:00
Transifreq f3f6466a0a update ru translation
Change-Id: I72c4ec3db22914b8e4ecdfc3573590a39f26204c
2016-07-11 05:26:06 -06:00
Transifreq 5ef3a18b0b update pt-BR translation
Change-Id: Ib5cc58f33c354e53ddf5963197834ab4d8c17263
2016-07-11 05:25:02 -06:00
Transifreq 40f32b97ad update pl translation
Change-Id: I61e7c14517725179703825de6f5639a183f2794c
2016-07-11 05:23:06 -06:00
Transifreq febdc92e80 update nb translation
Change-Id: I0572e429b86ea878f9230640e1b43625a5403046
2016-07-11 05:20:30 -06:00
Transifreq da7212e75d update es translation
Change-Id: Id9a006bd4966a90ece3cf1f897ff73d3e9641e18
2016-07-11 05:14:09 -06:00
Transifreq 7f10b2c647 update da translation
Change-Id: If034055ee1516df10f16bbe2754fcc249a996156
2016-07-11 05:10:13 -06:00
Transifreq 99d84dabe0 update ar translation
Change-Id: If304acf83964b0dd819cc3d85fbc7ef21fd74fc6
2016-07-11 05:09:11 -06:00
Transifreq dd5af96959 update nl translation
Change-Id: I737373b1eca5d70bba5f5ddb45213a437fc7fee0
2016-07-10 05:21:24 -06:00
Transifreq df260ccd07 update zh-Hant translation
Change-Id: I0abc5b8656c4770f5ddc5a6405fa73268234b5a6
2016-07-09 05:29:31 -06:00
Transifreq e9b2d6f4c2 update zh-Hans translation
Change-Id: Iaf9a901c4e5af660231e91da0495540f3b7d006f
2016-07-09 05:28:25 -06:00
Transifreq 3ec7ade25a update nl translation
Change-Id: I4dbd38d9af8fa5bc68a1a6910ecc000c9a20e7ca
2016-07-09 05:21:24 -06:00
Transifreq 65f178518e update ja translation
Change-Id: Ibec7023e0bfa9195bb2aee8a8ac750dc1e372a38
2016-07-09 05:18:02 -06:00
Transifreq 5f3fbfadf4 update es translation
Change-Id: Ifd0eacf4464ad79f5a6fecdb09134edbf9fae203
2016-07-09 05:13:58 -06:00
Alex Boyd 08e88bf7f2 nuke appointment_availability_description i18n key
Fixes CNVS-30383

Test plan:
 - Make sure the notification settings page still works

Change-Id: Ia45b5ff0577745eb749e870d8a7adf6dc3fffd22
Reviewed-on: https://gerrit.instructure.com/84731
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins
Product-Review: Robert Lamb <rlamb@instructure.com>
QA-Review: Robert Lamb <rlamb@instructure.com>
2016-07-09 00:42:16 +00:00
Nick Pitrak b22896f138 fix flash message appearing as normal html in IE and Edge
due to a bug fix for JAWS that involved removing and reapplying
attributes to the screenreader alert container, text for alerts
were being shown in the page as plain html in Internet Explorer
and Edge.  in addition to fixing this issue, the flash
notifications code was refactored and tests were written for it.

fixes CNVS-29411

test plan:
- create a course if necessary
- navigate to the Settings page
- click the Update Course Details button
- ensure an alert appears that reads "Course was successfully updated"
- wait 15 seconds
- click the Update Course Details button again
- ensure an alert appears that reads "Course was successfully updated"
- ensure that plain html does not appear at the upper left corner
  of the page
- navigate to the Announcements page
- click the Add External Feed button
- submit the form with an invalid character in the url (; works)
- ensure that an alert shows above the form field and at the top
  of the page
- wait 15 seconds
- submit the form with the same invalid data
- ensure that an alert shows above the form field and at the top
  of the page
- ensure that plain html does not appear at the upper left corner
  of the page

Safari/VoiceOver test plan:
- open the Settings page in Safari and VoiceOver
- click the Update Course Details button
- ensure that "Course was successfully updated, Close" is read
- click multiple times and ensure that the alert is read every time
- open the Announcements page in Safari and VoiceOver
- click the Add External Feed button
- submit the form with an invalid character in the url (; works)
- ensure that "div is not a valid url slash div" then "Oops! The last
  request didn't work out.  Development Only.  Details. Close" is read
- click multiple times and ensure the alert is read every time

Firefox/NVDA test plan:
- open the Settings page in Firefox and NVDA
- click the Update Course Details button
- ensure that "Alert! Course was successfully updated, Close" is read
- click multiple times and ensure that the alert is read every time
- open the Announcements page in Firefox and NVDA
- click the Add External Feed button
- submit the form with an invalid character in the url (; works)
- ensure that "Alert! div is not a valid url slash div" then "Oops!
  The last request didn't work out.  Development Only.  Details.
  Close" is read
- click multiple times and ensure the alert is read every time
- note that on multiple clicks, reads of previous alerts is acceptable
- also note that being interrupted by an "Alert!" is acceptable

Internet Explorer/JAWS test plan:
- open the Settings page in Internet Explorer and JAWS
- click the Update Course Details button
- ensure that "Alert! Course was successfully updated, Close" is read
- click multiple times and ensure that the alert is read every time
- open the Announcements page in Internet Explorer and JAWS
- click the Add External Feed button
- submit the form with an invalid character in the url (; works)
- ensure that "Alert! div is not a valid url slash div" then "Oops!
  The last request didn't work out, Development Only, Details,
  Close" is read
- click multiple times and ensure the alert is read every time
- note that on multiple clicks, reads of previous alerts is acceptable
- also note that being interrupted by an "Alert!" is acceptable

Change-Id: Ia38ddff903691e09414e80a7a27b6e3ff3b35e8b
Reviewed-on: https://gerrit.instructure.com/80475
Tested-by: Jenkins
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Pierce Arner <pierce@instructure.com>
2016-07-08 23:05:11 +00:00
Brad Humphrey 11fd111a56 allow content-items to display full screen in new tabs
fixes PLAT-1656

Change-Id: I3d8a870881e22494fd3f05b97fc45dad33e6de98
Reviewed-on: https://gerrit.instructure.com/84742
Tested-by: Jenkins
Reviewed-by: Andrew Butterfield <abutterfield@instructure.com>
QA-Review: Nathan Mills <nathanm@instructure.com>
Product-Review: Brad Humphrey <brad@instructure.com>
2016-07-08 22:29:24 +00:00
Joel Hough 49dcc0f225 make very long react modals scroll properly
fixes CNVS-29793

test plan
- have many folders in a course (enough to make the modal you
 open later exceed the height of the browser window)
- open a file "Move" modal from the file list
- ensure that the modal's title is visible and that a scrollbar
 appears next to the modal

try out some other react modals since this is a global change.
it looks like there's some in the external apps tool, one for the
 theme editor, and another for conditional release editing.

Change-Id: I82b71876fdaba0b5034832e4bcceafaa89c0a1c3
Reviewed-on: https://gerrit.instructure.com/84316
Tested-by: Jenkins
Reviewed-by: Steven Burnett <sburnett@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2016-07-08 20:45:18 +00:00
Deepeeca Soundarrajan f6c6bfef21 spec: Add spec for submission comments
Change-Id: Ie0843c5c237e3fb17554c47fef498a5640b0bd0f
Reviewed-on: https://gerrit.instructure.com/84545
Tested-by: Jenkins
Reviewed-by: Robert Lamb <rlamb@instructure.com>
Product-Review: Robert Lamb <rlamb@instructure.com>
QA-Review: Robert Lamb <rlamb@instructure.com>
2016-07-08 19:13:00 +00:00
Rob Orton eb7b11e705 handle attachments on user split
fixes CNVS-29150

test plan
 - user with attachments
 - merge into different user
 - split users
 - attachments should be restored to original users

Change-Id: Ia5696718e2bdbdae7ee47ed0916af99daee4b5b9
Reviewed-on: https://gerrit.instructure.com/79908
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
Reviewed-by: John Corrigan <jcorrigan@instructure.com>
QA-Review: Benjamin Christian Nelson <bcnelson@instructure.com>
Product-Review: Ian Hoerner <ian@instructure.com>
2016-07-08 17:24:11 +00:00
James Williams 89ef99767a round whole integers when displaying values for formula questions
refs #CNVS-29480

Change-Id: Iacf70d606ceb2d1e768c8491f1e30f3fee1c6c2c
Reviewed-on: https://gerrit.instructure.com/84653
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2016-07-08 16:39:14 +00:00
James Williams 65d3249d9b extend external content migration framework for selective export
closes #CNVS-30349

Change-Id: Ia9e314f6495cf89127cf55ad38a28c5dc1791d10
Reviewed-on: https://gerrit.instructure.com/84594
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-07-08 16:07:06 +00:00
James Williams 479759dfc8 structure for importing/exporting external service content
services can be integrated to be told when a course export
(or course copy) occurs and can send custom data to be
saved in the package

the data can use keys with the format '$canvas_TYPE_id'
where TYPE is a canvas object (e.g. 'assignment')
where the values are ids for objects in the source course
so when the package is imported, the saved data will have the
ids translated to the new copied objects, thus preserving
relationships between objects

closes #CNVS-30161

Change-Id: Iee5400c45d6189305b8626219dbe9aef345fea9e
Reviewed-on: https://gerrit.instructure.com/83531
Reviewed-by: Dan Minkevitch <dan@instructure.com>
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-07-08 16:06:10 +00:00
Michael Hargiss 5319140f41 spec: move assignments specs into their own directory
Test Plan:
- pass Jenkins

Change-Id: I557b9d35dd10d09ed5f2406bef9a9b5dca88c417
Reviewed-on: https://gerrit.instructure.com/84642
Tested-by: Jenkins
Reviewed-by: Alex Ortiz-Rosado <aortiz@instructure.com>
Product-Review: Michael Hargiss <mhargiss@instructure.com>
QA-Review: Michael Hargiss <mhargiss@instructure.com>
2016-07-08 15:56:11 +00:00
Pam Hiett 6e12b46bfa fix background gradient color for mobile login
Fixes: CNVS-30257

test plan:
- using xcode and mobile simulator
- go to the login for canvas and compare the background
  color with that of the image on the jira ticket (the one
  with the giant parent wording is the one to match)

Change-Id: If777deb3d1ba523530e8375537e77b21e1df915e
Reviewed-on: https://gerrit.instructure.com/83955
Product-Review: Brandon Pluim <bpluim@instructure.com>
Tested-by: Jenkins
Reviewed-by: Chris Hart <chart@instructure.com>
QA-Review: Pedro Fajardo <pfajardo@instructure.com>
2016-07-08 15:55:59 +00:00
Nathan Mills 22e0545562 fix old collaboration lti edit
fixes PLAT-1644

test plan:
you should be able to edit a office365 collaboration using the old UI

Change-Id: I5fc1e796786f3ec18bd7f4160b2598b05fe2c2e0
Reviewed-on: https://gerrit.instructure.com/84583
Tested-by: Jenkins
Reviewed-by: Andrew Butterfield <abutterfield@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Nathan Mills <nathanm@instructure.com>
2016-07-08 15:50:01 +00:00
Jeremy Stanley ac546d6de5 consistent discussion sorting
test plan:
 - discussions should appear in the same order on
   chrome as they do in other browsers--
   sorted by most recent post, and then by
   creation order (descending) for discussions
   with no posts

fixes CNVS-30158

Change-Id: I0dfeed656295107df4f943a901fdeed80f65fab6
Reviewed-on: https://gerrit.instructure.com/83795
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2016-07-08 15:49:36 +00:00
Transifreq d95ce75c96 update es translation
Change-Id: I460b6c213ad5900b278a0f212a8824af6d0d3097
2016-07-08 05:15:02 -06:00
Transifreq 73dc3d8aa9 update de translation
Change-Id: I8980765426b0554c59c57e3b7f2b68e7b4b0631a
2016-07-08 05:12:03 -06:00