be nicer in add_foreign_key_if_not_exists to retry partially created FKs

Change-Id: I4feb4871456a0307e87fb9ac5eff623997c23102
Reviewed-on: https://gerrit.instructure.com/24535
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
treesame commit of origin/stable/2013-09-14

Treesame-Commit-Id: 3b6790d8cf364dd73b6873987b743125d6d38109
treesame commit of origin/stable/2013-09-14

Treesame-Commit-Id: 002ca9be2a859e990b18cf2837c4c2bf51c70bb2
treesame commit of origin/stable/2013-10-05

Treesame-Commit-Id: 24eb4e853d22a22166c5cce312c1d9534e6250f1
updated en.yml
treesame commit of origin/stable/2013-10-26

Treesame-Commit-Id: f1c574ab3834287ce3d7c683974abaa480f4031a
Updated ja translation
Updated ar translation
Updated pt translation
don't load quiz submission history when there are too many submission attempts

fixes CNVS-9022 ... kinda

Test plan:
  * open a quiz in the speedgrader that has more than 150* quiz
    submission attempts
    * or you could Setting.set('too_many_quiz_submission_versions' to
      something smaller than 150
  * you shouldn't see older quiz attempts in the dropdown, but the
    speedgrader should load

Change-Id: Ie4bd1d9a7dfd5e0e05538937f86d6c7975ccec5e
Reviewed-on: https://gerrit.instructure.com/25691
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
undelete outcome alignments that were erroneously deleted

when the rubric data was an array of HashWithIndifferentAccess instead of
just Hash (which happens when the rubric is copied to another course), it
didn't have the comma in front of learning_outcome_id that was expected in the
FixOutOfSyncOutcomeAlignments data fixup.

fixes CNVS-9021

test plan:

*** before checking out this ***
- create a new learning outcome
- create rubric with the learning outcome
- import the rubric into another course using "Import Content" in course
  settings
- add the rubric to an assignment
- note the id of the outcome you added to the rubric
- in the console, run the following command:
  `ContentTag.where(:learning_outcome_id => <LO_ID_HERE>).
    update_all(:workflow_state => 'deleted')'
- go to the outcome page and it will not list any alignments
- set up some other outcome alignments that are active, and others that are
  deleted, that you would not expect to change

*** checkout the commit ***
- make sure delayed jobs ar running, and the UndeleteSomeOutcomeAlignments job
  is not in the failed jobs list
- go to the first outcome page again, it should correctly list the alignments
  (meaning they were restored) that you manually deleted from the second
  course (the one you imported into) but not the original. This is okay, and
  it's because we deleted all the outcome's alignments in the console.  In
  real data, only the alignments from the copied course would have been deleted.
- other alignments should not be touched

Change-Id: I524cc6a86483ea8beb6809fcc14653ef3ca711df
Reviewed-on: https://gerrit.instructure.com/25648
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cameron Matheson <cameron@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
add de and pl translations

test plan:
* change your user settings to Deutsch and Polski, and verify that the
  new translations appear properly

Change-Id: Ia7a3decc10dbc85e987cae136818d8c982dc8e0f
Reviewed-on: https://gerrit.instructure.com/25832
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
fixes user merge with conflicting context_module_progressions

also fixes logger as undefined method

refs CNVS-8896
refs CNVS-8901
closes CNVS-9119

test plan
 - have a course that has modules with progression rules
 - two users enrolled in the course
 - advance in the module progression
 - merge the two users
 - merge should work

Change-Id: Id047ea5bec6ca1fa2f2319c89caa4b1985277ff4
Reviewed-on: https://gerrit.instructure.com/25767
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
include state standards in learning outcome reports

fixes CNVS-9204
refs CNVS-8921

test plan
- import a state standard
- have an outcome result for the state standard (graded item tied to outcome)
- run learning_outcome_results report
- run student_competency_report
- reports should have result

Change-Id: I8c39f235022b8f4d0a642a9364b7082e313d9c4e
Reviewed-on: https://gerrit.instructure.com/25849
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
set scribd user per env

test plan:
 * upload a scribdable file
 * file should render with scribd
 * file owner should be canvas-(env)
 * files with other owners should render
 * files with other owners should be able to be deleted

Change-Id: I7ffe6ac84573b8dfd804995e4edd49aba019c516
Reviewed-on: https://gerrit.instructure.com/25918
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
Tested-by: Rob Orton <rob@instructure.com>
fix sorting on agenda view

the results of the events and assignments api request were not
being properly merged into a sorted list.

fixes CNVS-9037

test plan:
 - create a bunch of days that contain only events.
 - interleave a bunch of days that contain only assignments.
 - verify that the agenda view is sorted correctly.
 - verify that "load more" works properly.

Change-Id: I7f5c203149bb854496e64af053170b50361b7a96
Reviewed-on: https://gerrit.instructure.com/25641
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Braden Anderson <banderson@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
spec: clean up javascript specs

* vddDueColumnView was never used
* window's beforeunload wouldn't trigger the second time for me
  (both chrome and phantomjs)
* be nicer about retrying specs when run with a custom matcher
* some specs need ENV.PERMISSIONS to exist
* no more vddDueTooltipView
* don't completely overwrite ENV in your spec ಠ_ಠ
* don't start tests before specs are loaded, but don't use
  QUnit.stop() before QUnit has loaded.  instead, don't let it autostart,
  and wait to call QUnit.start() until both are loaded.

Change-Id: Ib89cc9f2bd2c27a04f72e8dc1261953a7a640a46
Reviewed-on: https://gerrit.instructure.com/24795
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
additonal user_settings options for conference plugins

adds the option for a text field, and adds the ability to add new
new options to the members section of the edit/new dialog

refs PS-799

test plan
* enable the webex plugin (must include this gerrit g/25892)
* create a conference, adding external email addresses

Change-Id: I54ddbd3fcf5e1567c8be03b4a127a30fc43205f6
Reviewed-on: https://gerrit.instructure.com/25894
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Adam Phillipps <adam@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
Reviewed-by: Braden Anderson <banderson@instructure.com>
bump webex to 0.3

fixes PS-799

test plan:

* you can use external emails in webex conferences

Change-Id: I3c0ec2e964c3d9861d0176e1ac18d4d2c73ee291
Reviewed-on: https://gerrit.instructure.com/25898
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Adam Phillipps <adam@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
Reviewed-by: Brandon Broschinsky <brandonbr@instructure.com>

Conflicts:
	Gemfile
Updated zh translation