Commit Graph

19597 Commits

Author SHA1 Message Date
Colleen Palmer 1f0fba3482 Add max-width to canvas layout container
fixes: CNVS-27360

This caps our nui Canvas layout to 1366px wide

Test Plan:
- Go to a page in canvas and stretch your browser window beyond 1366px;
you should notice that the content does not stretch the full width
- ACCEPTIONS: if there is a full-width app, these settings do not apply
- Go to Calendar or Conversations (these are full-width apps), you will
notice they still take up the full browser window
- Legacy is not affected by this change

Change-Id: I19c3257f4ff73e3c9432d78daf303384e558f8c0
Reviewed-on: https://gerrit.instructure.com/73155
Tested-by: Jenkins
Reviewed-by: Pam Hiett <phiett@instructure.com>
Product-Review: Pam Hiett <phiett@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
2016-03-04 19:44:34 +00:00
MFairbourn b4d26e0036 spec: change p3s to p2
Change-Id: I740f6194abeae892011697f15a7b66237eeaca88
Reviewed-on: https://gerrit.instructure.com/73754
Reviewed-by: Pedro Fajardo <pfajardo@instructure.com>
Tested-by: Jenkins
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2016-03-04 19:29:16 +00:00
Ethan Vizitei 2999576bdc RCE resiliant to consul failure
closes CNVS-27666

this stops us from getting a page error in cases
where consul is suddenly gone and we don't have a
cached value for a CDN endpoint.

Users will get an error in their js console,
and the textarea will display with no editor chrome.

TEST PLAN:
 1) point your consul.yml to a fake host
 2) with the feature flag for RCE on, go to eportfolios
    and try to edit one
 3) you should still be able to play with the form, even though
    you won't have an editor

Change-Id: Ia5a1e4b9e243e2c10cdc12726a26f6a0eb2e0d1f
Reviewed-on: https://gerrit.instructure.com/73545
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Ethan Vizitei <evizitei@instructure.com>
2016-03-04 18:48:34 +00:00
James Williams 39f8a9bdec prevent conversation participant caching problems
test plan:
* add recipients to a conversation through the api
* the "audience" should always be updated to show the new
 recipients

closes #CNVS-26732

Change-Id: I28924725339cf780d3b41cde05684a1282fa9c3d
Reviewed-on: https://gerrit.instructure.com/73648
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams  <jamesw@instructure.com>
2016-03-04 17:58:46 +00:00
James Williams cbebcd01c1 fix export/import of folders starting with "."
test plan:
* create a course with a folder starting with a period
* add a file to the folder
* export the course to a file
* import the package into another course
* the file and folder should have copied over

closes #CNVS-27696

Change-Id: I01ce679d3efce815140186a02449d49aa1cc82e0
Reviewed-on: https://gerrit.instructure.com/73624
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-04 17:49:56 +00:00
MFairbourn aaf2835a92 spec: add specs for inline editing of context module items
Test Plan:
- Specs pass
- verify Test IDs

Change-Id: I3c46f356edd066da86d4d820582cfffc3c69718d
Reviewed-on: https://gerrit.instructure.com/73652
Reviewed-by: Pedro Fajardo <pfajardo@instructure.com>
Tested-by: Jenkins
Product-Review: Matt Fairbourn <mfairbourn@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2016-03-04 17:46:52 +00:00
James Williams 2dc71b7700 show pointer cursor in calendar agenda view
test plan:
* hovering over an event in agenda view should show
 a pointer mourse cursor

closes #CNVS-27691

Change-Id: Ibe764ceff748cc810727790a25315c9f9524e317
Reviewed-on: https://gerrit.instructure.com/73628
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-04 17:17:04 +00:00
James Williams 76538ec8a7 fix mark as done button alignment on assignments
test plan:
* create a module with an assignment
* add the assignment as a "must mark as done" requirement
* as a student, visit the assignment from the modules page
* the "Mark as Done" button should be aligned with the
 "Submit Assignment" button

closes #CNVS-26858

Change-Id: Icfe28e801910acf42fb479219ae5f15330d56f3a
Reviewed-on: https://gerrit.instructure.com/73671
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-04 17:08:04 +00:00
James Williams dceededaab remove account_id from course create api doc parameters
not actually a request parameter

also fixes a weird sentence in the update parameter

closes #CNVS-27492

Change-Id: I8bef4d1f1c965ee4892bd72369213f32dbfec371
Reviewed-on: https://gerrit.instructure.com/73489
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-03-04 13:43:45 +00:00
James Williams 59da4d7789 add memory and disk limit to mini magick image processor
closes #CNVS-27122

Change-Id: I5286bb00e62bd03cd4cf4a81a8285cba977e5fc4
Reviewed-on: https://gerrit.instructure.com/73482
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-03-04 13:22:18 +00:00
Transifreq e959a47680 update tr translation
Change-Id: I759c7cd2f404e05cc1e43887624b287328af125f
2016-03-04 05:26:02 -07:00
Ethan Vizitei 4deba32c28 use a fallback cache for catastrophic outages
closes CNVS-27667

if consul goes down, we want to use the most recent value
for each key checked until it recovers.  This will only help
active processes, new procs won't have a cache to pull from,
but partial failure is preferable to total outage.

TEST PLAN:
 1) store some stuff in consul
 2) ask for it through "DynamicSettings"
 3) abruptly kill the consul process
 4) ask for the same value
 5) instead of a failure, you should get the value returned
     when consul was up

Change-Id: I3f57b70d4d8db7a4051c4a68906ddc5d616bb34e
Reviewed-on: https://gerrit.instructure.com/73505
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Ethan Vizitei <evizitei@instructure.com>
2016-03-04 03:13:36 +00:00
Cody Cutrer f278d24cc7 ensure strong_params flag is inherited
Change-Id: I92d01c1ca9b84f93d1dfdc95c4e1c7c020a373c9
Reviewed-on: https://gerrit.instructure.com/73662
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins
2016-03-04 00:49:51 +00:00
Davis McClellan c77e406b4c Fix mobile quiz eligibility for multiple sections
fixes CNVS-27408

test plan:
- Create a quiz.
- In the availability dates, select one student or section and have
  the quiz be open for that student for some time.
- Add another availability lock and select 'Everyone'. It will be
  'Everyone Else' and have the availability time set to either in
  the past or in the future.
- Take the quiz as the student through the api.
- Ensure that the student is able to answer questions.

Change-Id: I4117632be45a4f743c25363a5f255a90cc7c301a
Reviewed-on: https://gerrit.instructure.com/73668
Tested-by: Jenkins
Reviewed-by: John Corrigan <jcorrigan@instructure.com>
Reviewed-by: Ryan Taylor <rtaylor@instructure.com>
QA-Review: Michael Hargiss <mhargiss@instructure.com>
Product-Review: Jason Sparks <jsparks@instructure.com>
2016-03-03 23:19:07 +00:00
Amber Taniuchi 7a8ade9863 spec: fix test_id's and add more tests for Grading section
Test Plan:
- pass Jenkins
- check for syntax errors
- make sure new test_ids match up to an existing test case in TestRails

Change-Id: I319cf76334a0e6f3a719e3ea6ced3ea8bbfa2718
Reviewed-on: https://gerrit.instructure.com/70549
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-03-03 22:42:14 +00:00
Derek Bender 1a90f51716 Revert "Add missing submission comments in speedgrader"
This reverts commit 37ea2c4e9b.

closes: CNVS-27473
closes: CNVS-27456

Change-Id: I34060221cd4567eda92e1ec0a3a1767d6884dbb9
Reviewed-on: https://gerrit.instructure.com/73607
Tested-by: Jenkins
Reviewed-by: Cameron Matheson <cameron@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
QA-Review: KC Naegle <knaegle@instructure.com>
2016-03-03 20:53:36 +00:00
James Williams f3b6532803 fix keyboard shortcut modal hotkeys firing during html editing
test plan:
* create a discussion topic
* click "Reply" to open a discussion reply editor
* click on "HTML Editor"
* make sure that entering "," and "<" and "?" all work
 and do not open the keyboard shortcut dialog

closes #CNVS-27510

Change-Id: If0800433dfe013dcdfa160a22fb6099a3ed46f9e
Reviewed-on: https://gerrit.instructure.com/73631
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Reviewed-by: Andrew Butterfield <abutterfield@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2016-03-03 20:30:01 +00:00
Spencer Olson 7707758cf2 speed_grader_json: load quizzes faster
this should provide a significant speed
boost to speed_grader_json for quizzes
by squashing a few N+1s (the most significant
N+1 being for Quiz loading). also made a tweak
to submission permission checks that should
improve performance.

closes CNVS-27323

test plan:
- create a quiz with submissions
- verify you can open the quiz in
  speedgrader

Change-Id: If069c52440e5981c872f57723e30d0d0665ec8ad
Reviewed-on: https://gerrit.instructure.com/73490
Reviewed-by: Cameron Matheson <cameron@instructure.com>
Tested-by: Jenkins
QA-Review: KC Naegle <knaegle@instructure.com>
Product-Review: Spencer Olson <solson@instructure.com>
2016-03-03 20:05:58 +00:00
James Williams 64bb692a70 don't record enrollment activity for activity_stream_summary
calls from new ui dashboard shouldn't count

closes #CNVS-27723

Change-Id: I904fcdff9728f0ba89b02821e897fed0990563ba
Reviewed-on: https://gerrit.instructure.com/73629
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-03 20:00:56 +00:00
James Williams 2d6bcf9ad7 fix SIS course importer audit logging
shouldn't log "Published" event when it isn't publishing

closes #CNVS-27689

Change-Id: Ie8580e29e68c228ebe749513a20e3e670ee323d1
Reviewed-on: https://gerrit.instructure.com/73486
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-03 20:00:39 +00:00
Cody Cutrer d9372669e6 spec: improve reliability of ttl refresh checking
Change-Id: I999f1a1117069349ad82883470f88263f1c94c27
Reviewed-on: https://gerrit.instructure.com/73468
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-03 17:04:34 +00:00
James Williams 9e1a4ed682 only show active users to students in group roster
test plan:
* enroll two students in a course and add them
 to a group
* they should be able to see each other in the
 group roster
* inactivate one of the students
* they should no longer be visible in the group
 roster to the other student
* they should still be visible to the admin

closes #CNVS-27441

Change-Id: Ia4addb3d269a6bc84bbc08815ebf7d666512179e
Reviewed-on: https://gerrit.instructure.com/73284
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-03 16:50:46 +00:00
James Williams 84f0e8d9f7 remove old always-on features
closes #CNVS-27699

Change-Id: I5af3d9915fef4189204283ca87cafc540ed3eed4
Reviewed-on: https://gerrit.instructure.com/73566
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-03 16:50:13 +00:00
Ethan Vizitei 71245b86a5 Don't die if consul data is missing
closes CNVS-27672

This could stop all API requests from working
if consul suddenly catastrophically loses it's data.
With the patch in place, we'll still fail for
requests that need that data to decrypt (JWT), but regular
access tokens will still work ok.  This is better than
total system failure.

TEST PLAN:
 1) connect to consul, but put no data in it (particularly no
signing/encryption secrets)
 2) hit canvas with an API request using a regular access token
 3) it should not blow up

Change-Id: Ia435814929968373f22ab8d120153368267a3f32
Reviewed-on: https://gerrit.instructure.com/73492
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Ethan Vizitei <evizitei@instructure.com>
2016-03-03 16:46:46 +00:00
Jon Jensen 950c81185d spec: abort runner on Errno::ENOMEM
ABORT_ON_CONSISTENT_BADNESS doesn't catch it if it happens during driver
setup. rather than retrying 10 times, just bail and hope that the other
test-queue nodes will have better luck

test plan:

1. see earlier patchsets how test-queue runners stopped when they hit
   those, and other runners got the rest of the specs

Change-Id: I2bdfeafd8fbf5e1404952d92548f4ae62567575e
Reviewed-on: https://gerrit.instructure.com/73546
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
Tested-by: Jenkins
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2016-03-03 16:26:13 +00:00
Jeremy Stanley 19624509e1 suppress some notifications when a course is soft-concluded
test plan:
 - have a course in a term that has ended
 - ensure students do not receive notifications for
   1. wiki page changes
   2. grade changes
   3. being added to a student group

fixes CNVS-27538

Change-Id: I43bdf541fd79abdca41a2899987fb29dddc73fb5
Reviewed-on: https://gerrit.instructure.com/73456
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-03-03 16:21:32 +00:00
Colleen Palmer fce0284317 Font-size change in _external_tools.scss
refs: CNVS-25278

Test Plan:
- This is a 1 to 1 change. Font size will just be relative instead of
fixed sized (ie, rem instead of px)
- Go to [Course] > Settings > External Apps tab
- The top description area should now have no double border, and
better spacing between and around the description paragraph

Screenshot of changes: http://cl.ly/0z1V0J240P0d

Change-Id: I2126308cfefeb45d1b8ca0586a88e50982b4b095
Reviewed-on: https://gerrit.instructure.com/72484
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Product-Review: Jennifer Stern <jstern@instructure.com>
Tested-by: Jenkins
QA-Review: Myller de Araujo <myller@instructure.com>
2016-03-03 16:16:44 +00:00
Pam Hiett b10814286b [old ui] fix unread message count from breaking nav alignment
Fixes: CNVS-27527

test plan:
- as a user with the old ui and unread messages in your inbox
- navigate to the dashboard and look at the upper-right
  nav links - are they aligned?

  example: http://screencast.com/t/kQGa92JcxJE

Change-Id: Ic9cfb8520a1236ffe10524db16b2573a9ffb7074
Reviewed-on: https://gerrit.instructure.com/73002
Tested-by: Jenkins
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
Product-Review: Chris Hart <chart@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
2016-03-03 16:01:09 +00:00
Transifreq b8f917e03a update tr translation
Change-Id: I5727eca1e235c759ad7e9b5599b54bcc67e68a08
2016-03-03 05:27:48 -07:00
Transifreq 2fb9746e50 update he translation
Change-Id: I7fdcff769d36979db14e57d6ee6df554642fc25f
2016-03-03 05:16:38 -07:00
Transifreq 230286e98e update ar translation
Change-Id: I159694ac1dfefdae2d0a33bf1541909dd99ca48f
2016-03-03 05:09:12 -07:00
Pam Hiett e8b8acaee6 increase assignment upload title from 10px to 12px
Refs: CNVS-26581

test plan:
- as a user with the old and/or new ui
- if you already have turned in an assignment that required a file
  upload... navigate to the course assignment and click the
  "submission details" link from the right-hand side bar
- if you do not have any assignment submissions as a file upload
  as a teacher edit one of your assignments to a file upload
  for the submission type
- then as the student - submit that assignment and then view the
  submission details from the right

- example from new ui: http://screencast.com/t/kPCaBjenS

Change-Id: I04b46ce126ddd6b1794ab963c9ce52ff4e851864
Reviewed-on: https://gerrit.instructure.com/73296
Tested-by: Jenkins
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
2016-03-03 00:45:13 +00:00
Pam Hiett 9b1045a8d6 increase 10px font size throughout react_gradebook to 12px min
Refs: CNVS-26581

test plan:
- as a teacher using the old or new ui
- navigate to a course that has users that have submitted assignments
  that have been graded so you can view gradebook
- click the grades sub-nav link
- from the gradebook view the following have been updated
  note: screen shots are from orig gradebook but look the same:
  - ko accessibility warning: http://screencast.com/t/2q5qqEqwfes
  - student section: http://screencast.com/t/sNQcjOecb4
  - secondary identifier: http://screencast.com/t/9BwHyVcbJI2C
  - slick header column: http://screencast.com/t/rp1InVw4Qmx3
  - assignment-points-possible: http://screencast.com/t/FAYK4WHMLO2
  - letter-grade-points: http://screencast.com/t/ZNDLWnbS

Change-Id: I7f51a2cecc9db0a8300dfbf9682120f653ddbb12
Reviewed-on: https://gerrit.instructure.com/73188
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
Tested-by: Jenkins
QA-Review: Myller de Araujo <myller@instructure.com>
2016-03-03 00:45:07 +00:00
Michael Hargiss 4db36a0c59 spec: downgrade to priority 2 for the sake of test coverage
will refactor with timecop in a future sprint

Test Plan:
- pass Jenkins

Change-Id: Ia98fd4ad50105a5d9552a34589829718bc9e2a94
Reviewed-on: https://gerrit.instructure.com/73560
Tested-by: Jenkins
Reviewed-by: Gentry Beckmann <gbeckmann@instructure.com>
Product-Review: Michael Hargiss <mhargiss@instructure.com>
QA-Review: Michael Hargiss <mhargiss@instructure.com>
2016-03-03 00:02:46 +00:00
Pam Hiett dc252f2eef increase syllabus due date/time font size from 10px to 12px
Refs: CNVS-26581

test plan:
- as a user with the old and/or new ui
- navigate to a course
- click the syllabus link from the course nav
- the last date to appear in the table should now be 12px/0.75rem
  - old ui: http://screencast.com/t/Sh5EZcPtl0Da
  - new ui: http://screencast.com/t/5Z9rXAHc

Change-Id: Ifadcdf313fad61acb08663acac69066803062938
Reviewed-on: https://gerrit.instructure.com/72915
Tested-by: Jenkins
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
2016-03-02 22:27:46 +00:00
Pam Hiett 8ef08d1d9d increase 10px font size throughout gradebook to 12px min
Refs: CNVS-26581

test plan:
- as a teacher using the old or new ui
- navigate to a course that has users that have submitted assignments
  that have been graded so you can view gradebook
- click the grades sub-nav link
- from the gradebook view the following have been updated
  - ko accessibility warning: http://screencast.com/t/2q5qqEqwfes
  - student section: http://screencast.com/t/sNQcjOecb4
  - secondary identifier: http://screencast.com/t/9BwHyVcbJI2C
  - slick header column: http://screencast.com/t/rp1InVw4Qmx3
  - assignment-points-possible: http://screencast.com/t/FAYK4WHMLO2
  - letter-grade-points: http://screencast.com/t/ZNDLWnbS

Change-Id: I2b19daf410bd3e10dc74ee999f9e8b1439f11262
Reviewed-on: https://gerrit.instructure.com/72841
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
Tested-by: Jenkins
QA-Review: Myller de Araujo <myller@instructure.com>
2016-03-02 21:56:16 +00:00
Ethan Vizitei def842ac8f remove unnecessary docker-compose config
secrets are in consul now
config/WEBPACK is the normal way to make webpack happen

Change-Id: I6624756afb74a0fa89ad7275520f7d7513468b12
Reviewed-on: https://gerrit.instructure.com/73539
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Product-Review: Ethan Vizitei <evizitei@instructure.com>
QA-Review: Ethan Vizitei <evizitei@instructure.com>
2016-03-02 21:43:11 +00:00
Jon Willesen fab45dee9e [cyoe] make canvas pull UI from conditional release service
this includes canvas configuration to point it at the service

refs: CYOE-43 CYOE-50

not testing controller or ui because they are proof-of-concepts
and will not be production code. they're hidden by a feature
flag and will be replaced before the feature flag is released.

test plan:
 - browse to the conditional release service stub interface
 - in canvas, enable the conditional release feature flag
 - configure canvas with a conditional_release.yml file that
   points to the conditional release service
   - see conditional_release.yml.example file
 - start canvas and the conditional release service
 - as a teacher, go to the course settings page
 - click on the conditional release button in the right sidebar
 - see the conditional release stub interface show up in canvas

Change-Id: I61f3817a4a6d534a39ef4d981044901a135e1caa
Reviewed-on: https://gerrit.instructure.com/73108
Tested-by: Jenkins
Reviewed-by: Michael Brewer-Davis <mbd@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Jon Willesen <jonw@instructure.com>
2016-03-02 21:26:11 +00:00
Jeremy Stanley 6159ac7cc0 limit passwords to 255 characters with canvas auth
test plan:
 - for a user using canvas auth, attempt to change the password
   (Account | Settings | Edit Settings | Change Password check)
   to something longer than 255 characters.
   * you should get an error message.

fixes CNVS-25677

Change-Id: Ie0b75d8d5e7de1ee1d34b6fe46ec1616165a8bbc
Reviewed-on: https://gerrit.instructure.com/73535
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2016-03-02 21:18:19 +00:00
James Williams e5d788bd93 make validated e-mails on profile page not links
test plan:
* validated e-mails listed under the "Ways to Contact"
on the user settings right side should not be
non-functional links

closes #CNVS-25966

Change-Id: I7fe9811f59ff65bb82feb28c1d7c5b5f07f8f82b
Reviewed-on: https://gerrit.instructure.com/73252
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2016-03-02 21:11:03 +00:00
Jeremy Stanley 859a27dbc9 add all the missing alt text
iow, don't let image_tag generate alt text badly

test plan: (T_T)

fixes CNVS-27489
fixes CNVS-27043

Change-Id: I52dfe7703f57074df61358262f195161cd34c32f
Reviewed-on: https://gerrit.instructure.com/73334
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2016-03-02 20:27:36 +00:00
Cody Cutrer f1c1a3b407 don't remove STI classes from ActiveRecord::Base.all_models
it prevents clearing schema caches. it was likely intended to
prevent truncating the same table multiple times in spec_helper,
but we haven't used all_models for that in a long time

Change-Id: Ife47ea6c565c1334c3049f91e3012b7e1f1de0f7
Reviewed-on: https://gerrit.instructure.com/73406
Reviewed-by: Brad Horrocks <bhorrocks@instructure.com>
Tested-by: Jenkins
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2016-03-02 20:03:03 +00:00
Rob Orton faf315abed properly scope report to an account
fixes CNVS-27480

test plan
 - run lti report on a sub account
 - it should only contain lti tools from sub_account

Change-Id: I4f70326b0da296c30c2fed039be27c900347afb8
Reviewed-on: https://gerrit.instructure.com/72897
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2016-03-02 19:16:49 +00:00
Simon Williams 260691f1d1 i18n: add hebrew (crowd-sourced)
There have been some inconsistencies in date and time formats. However,
by standardizing our own translation config files on 24 hour time
formats and including the Hebrew Geresh symbol (׳) in our day and month
name abbreviations we have found a configuration that seems to work well
(or at least consistently).

closes CNVS-26264

test plan:
- enable translations locally and set your language to hebrew
- make sure both ruby and javascript translations work
- check a datetime field specifically

Change-Id: I07128071fb89d7129a1fbdc1e0c446866850f3f5
Reviewed-on: https://gerrit.instructure.com/69911
Reviewed-by: Rob Orton <rob@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Tested-by: Jenkins
Product-Review: Simon Williams <simon@instructure.com>
2016-03-02 19:10:58 +00:00
Tyler Pickett 3bba37137e Remove node_modules volume
We're removing this volume for now because it ends up getting the wrong
permissions making it impossible for a fresh install to work properly.

Change-Id: I9e08510722bf7bcc8b87c04fce697d5ba26f299b
Reviewed-on: https://gerrit.instructure.com/73495
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Tested-by: Jenkins
Product-Review: Tyler Pickett <tpickett@instructure.com>
QA-Review: Tyler Pickett <tpickett@instructure.com>
2016-03-02 18:16:54 +00:00
James Williams 0373e72d3a relock associated module when assignment overrides change
test plan:
* create a course with two sections
* create an assignment that is only assigned
 for one course section

* create two modules and make the first a prerequisite
 for the second
* add the assignment as a requirement for the first

* add a student in the other course section
* the second module should be unlocked for them since
 they can't see the required assignment

* edit the assignment to be assigned to the other
 course section
* revisit the modules page as the student
* the assignment should be visible and the second module locked

closes #CNVS-27470

Change-Id: I366592d11302362b7d92019f211915ce2c29266e
Reviewed-on: https://gerrit.instructure.com/73076
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-02 18:03:10 +00:00
Ryan Shaw b0a6ea48df remove the 'when' bower module, nothing used it.
the only thing that was using this were some specs
for moderatedGrading. since we only run our qUnit
tests in modern browsers that have native `Promise`
support, we don't need to polyfill it there

whenJS(someVal) is exactly the same as Promise.resolve(someVal)
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/resolve

test plan:
moderatedActionsSpec should pass


Change-Id: Ia0f8d24f8452bf0aafce8b11e4e36dad9e472797
Reviewed-on: https://gerrit.instructure.com/73243
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Tested-by: Jenkins
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2016-03-02 17:27:59 +00:00
Ethan Vizitei ff9633ffac add phantom js support as an avenue for js test runs
keep it commented for now to be optional

Change-Id: I2b64b11aac72b6da74401e9c8391a844a620c387
Reviewed-on: https://gerrit.instructure.com/72407
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Tested-by: Jenkins
Product-Review: Ethan Vizitei <evizitei@instructure.com>
QA-Review: Ethan Vizitei <evizitei@instructure.com>
2016-03-02 16:58:32 +00:00
Spencer Olson aa123fc7dc use default sort settings if custom sort is invalid
in the gradebook, we should default to sorting by
assignment group if the custom sort setting is
invalid. we normally do default to sorting by
assignment group if the custom sort setting is
invalid, but a regression was introduced in
696f099e7c

closes CNVS-27545

test plan:
- enter a rails console and find a teacher for
  one of your courses
  $ bundle exec rails console
  $ course = Course.find(1)
  $ teacher = course.teachers.active.first

- set the teacher's gradebook sort settings to
  an invalid custom sort (it is invalid if it
  does not have a customOrder property)
  $ teacher.preferences[:gradebook_column_order] =
    { course.id => { "sortType" => "custom" } }
  $ teacher.save!

- log in as the teacher above and go to the
  gradebook for the course above

- verify the gradebook loads

Change-Id: I84a4d620c2cc1c4fe38d383cd0db254e30e9d245
Reviewed-on: https://gerrit.instructure.com/73448
Reviewed-by: Derek Bender <djbender@instructure.com>
Tested-by: Jenkins
QA-Review: KC Naegle <knaegle@instructure.com>
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
2016-03-02 16:32:30 +00:00
Tyler Pickett 9bb9a55f49 Move development image to instructure/ruby-passenger
Change-Id: I81272405edf9078cc5016840216b60964a08e201
Reviewed-on: https://gerrit.instructure.com/72573
Reviewed-by: Tyler Pickett <tpickett@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Jenkins
Product-Review: Tyler Pickett <tpickett@instructure.com>
QA-Review: Tyler Pickett <tpickett@instructure.com>
2016-03-02 14:41:01 +00:00