Commit Graph

2892 Commits

Author SHA1 Message Date
Transifreq 75d87a3939 Updated en-GB translation
Change-Id: I3602e5f87afabb00f11c776abdca85ac8877f2b1
2015-07-16 05:16:14 -06:00
Transifreq 4fb2170f1b Updated en-AU translation
Change-Id: I6f21b153e037959245908be9983a47c6a1d3989c
2015-07-16 05:14:40 -06:00
Transifreq a07a5b4255 Updated de translation
Change-Id: Ie115991a70bd92d0b39e0dc4f768ef206c98a5fb
2015-07-16 05:13:05 -06:00
Transifreq e4539367d4 Updated da translation
Change-Id: I5d172356894d208b6bfef38048f8a77f2a61dd5d
2015-07-16 05:11:24 -06:00
Transifreq 5962c41a1f Updated ar translation
Change-Id: I5a883934cbb5edf210bde0387e3d7c53c67ed1e6
2015-07-16 05:09:52 -06:00
James Williams 384c26013c rails4: fix invalid utf8 removal on old serialized attributes
refs #CNVS-21596

Change-Id: I7888abfd6b36a7b685b6d89859d64bc1af72725e
Reviewed-on: https://gerrit.instructure.com/58387
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2015-07-15 19:52:36 +00:00
James Williams c962545198 drop local_filename from attachments
Change-Id: I7fc2426b53b64abeb7a487d31f07f3eecbfbf60c
Reviewed-on: https://gerrit.instructure.com/58400
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2015-07-15 14:30:55 +00:00
Transifreq 7377c2970b Updated tr translation
Change-Id: I96b8612951be571fc81002d6d14f527d14cb020c
2015-07-15 05:32:18 -06:00
James Williams b973a898ea rails4: update to 4.0.13
also revert "rails4: fix stale collection proxies"

refs #CNVS-21596

Change-Id: I7dd3d7d5e6ddb3c5fca17555b0e0ec347e6bfa75
Reviewed-on: https://gerrit.instructure.com/58381
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2015-07-14 20:09:47 +00:00
Transifreq 0b03bf7f90 Updated tr translation
Change-Id: Ie2b08deddf8f20ef84384b25d775125cdc934bb4
2015-07-14 05:35:44 -06:00
Transifreq 69e4d675ac Updated pt-BR translation
Change-Id: I26bf039d700730dd2435b3a84a5957953123f675
2015-07-14 05:31:16 -06:00
Transifreq c5b6c1c22d Updated pl translation
Change-Id: Id507117292522ab5d180d26fd577a583fbc72a1d
2015-07-14 05:28:05 -06:00
Cody Cutrer fcd944d600 explicitly reference functions from extensions in their correct schema
fixes CNVS-21362

test plan:
 * make sure you have pg_collkey installed
 * test user search
 * it shouldn't asplode

Change-Id: I911d57ea950679b3e26390c140149c528eae0a2d
Reviewed-on: https://gerrit.instructure.com/56969
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2015-07-13 23:02:57 +00:00
James Williams 62851d8fe5 rails4: more misc model spec fixes
refs #CNVS-21596

Change-Id: I28cfeb917e29562734542d201148ad636d23cba1
Reviewed-on: https://gerrit.instructure.com/58170
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2015-07-13 15:24:49 +00:00
James Williams 7d9ec1e2a0 rails4: fix stale collection proxies
fixes a problem with appointment groups that
can cache a broken association scope in a before_save

refs #CNVS-21596

Change-Id: I8965999b80c26f8d303681c1cf2214c45f23f39d
Reviewed-on: https://gerrit.instructure.com/58050
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2015-07-13 15:23:47 +00:00
James Williams 7c98e9c0da rails4: fix find_in_batches_with_temp_table
also multi-column plucking

refs #CNVS-21596

Change-Id: I0cceae6bf95a25c32ef4957977d8ce2b4719d0ef
Reviewed-on: https://gerrit.instructure.com/58044
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2015-07-13 15:23:03 +00:00
James Williams 70328c3083 rails4: fix unscopecallbacks
current_scope in rails4 is shared on base_class

refs #CNVS-21596

Change-Id: Ib4c8e61c2cbe7ef492988b90769930811a76761b
Reviewed-on: https://gerrit.instructure.com/57980
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2015-07-13 15:22:38 +00:00
Matthew Wheeler 794a19dfe2 Instrumentation for Incoming Mail Processing
Fixes CNVS-20436

This does two things:
1) Reports to StatsD each time a message
   is processed
2) Every 5 minutes, reports the unprocessed size
   of each incoming mailbox

Test Plan:
Regression test incoming mail processing. Will
want to check the basic cases of incoming messages
still being processed properly.

Smoke test the new Instrumentation delayed job.
1) Setup incoming mail processing by adding a 
   config/incoming_mail.yml with the right content
   - Wheeler can tell you what the file
     should contain. (not shown because passwords)

2) Start canvas jobs 
     `bundle exec script/delayed_job run`

3) Watch /error_reports for any new error reports.
   You should see none. 


Change-Id: Ia737906cedb67e183fec0f41571e002883c058c8
Reviewed-on: https://gerrit.instructure.com/57892
Reviewed-by: Joel Hough <joel@instructure.com>
Tested-by: Jenkins
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Matthew Wheeler <mwheeler@instructure.com>
2015-07-10 11:55:02 +00:00
Transifreq 6f1dac69a4 Updated sv translation
Change-Id: Iffa913a2bed439421c55aa9e3be615fca60bfcf3
2015-07-10 05:28:43 -06:00
Benjamin Porter 49a779c715 Outcomes Import API: Add endpoint to query migration issues
The content migrations for outcomes importing are not scoped to an account
or a course, since the academic benchmarks standards are imported globally
per shard.

Fixes CNVS-21782

Test Plan:

    1.  Kick off an outcomes import task
        - curl -H 'Authorization: Bearer <api-key>'
            --data 'guid=<some-guid>'
            'http://<canv-domain>/api/v1/global/outcomes_import'
    2.  Query it through this endpoint and make sure it works
        - curl -H 'Authorization: Bearer <api-key>'
            'http://<canv-domain>/api/v1/global/outcomes_import/migration_status/<migration-id>'

Change-Id: I8ff3a5206bb7aa5f97d615912c60341fedcaf855
Reviewed-on: https://gerrit.instructure.com/58034
Tested-by: Jenkins
Reviewed-by: Cameron Sutter <csutter@instructure.com>
QA-Review: Michael Hargiss <mhargiss@instructure.com>
Product-Review: Benjamin Porter <bporter@instructure.com>
2015-07-09 16:50:10 +00:00
James Williams 3c532c13a3 rails4: include root in json
turn back; it's too late to change now

refs #CNVS-21596

Change-Id: Ia2ed649e9ee700219479cee7aab48c51fe4d6c4b
Reviewed-on: https://gerrit.instructure.com/58052
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
Tested-by: Jenkins
2015-07-09 16:48:55 +00:00
Transifreq 56a867e396 Updated zh_Hant translation
Change-Id: Ie51f4482eebea1a9d0526c59becb522a6f2071ad
2015-07-09 05:34:43 -06:00
Transifreq 3fac971529 Updated zh translation
Change-Id: Ibc2a19c3dcbfffe56494dcf6536a372ced34718e
2015-07-09 05:33:11 -06:00
Transifreq 5094cb68fc Updated tr translation
Change-Id: Ie092780082038c242a377bdf1cdac653e9cf4b87
2015-07-09 05:31:37 -06:00
Transifreq f2bd4bff36 Updated sv translation
Change-Id: Ia2e938d2f54ea557d8572daf6857e6eee3606714
2015-07-09 05:30:09 -06:00
Transifreq c921f0656a Updated ru translation
Change-Id: I7c02a3422d84177033f817725e0256b81e001dc8
2015-07-09 05:28:36 -06:00
Transifreq cc67a173db Updated pt-BR translation
Change-Id: Ice5484bf4e86ced3e929bf31eadbcf69f88d90ba
2015-07-09 05:27:04 -06:00
Transifreq bbdfbe7887 Updated pt translation
Change-Id: Ia9fc41e1f494fe947c1dc13065c386d69de5b990
2015-07-09 05:25:36 -06:00
Transifreq 621e0a8a34 Updated pl translation
Change-Id: I491be2aa1fbd5fe330c1df8a2752090f4e30fad3
2015-07-09 05:24:06 -06:00
Transifreq ea69349dc3 Updated nl translation
Change-Id: If91c1352b8dbd442070607ad6d002e2257843958
2015-07-09 05:22:37 -06:00
Transifreq 22e680cbc7 Updated nb translation
Change-Id: If2fcd4220cd0b5f167ae1b20e6937c4f64c84a44
2015-07-09 05:21:06 -06:00
Transifreq cb209a8129 Updated ja translation
Change-Id: Id88011d7bd45f9290fd7f2b9e7c77a418a666412
2015-07-09 05:18:22 -06:00
Transifreq 06e4644051 Updated fr translation
Change-Id: Ia9398cc2232edc288db837a72f51d6d407a45997
2015-07-09 05:16:49 -06:00
Transifreq 672195b8be Updated fa-IR translation
Change-Id: I813263ba95ae975e465bb794a766a8a049978272
2015-07-09 05:15:20 -06:00
Transifreq 0bd856b8a1 Updated es translation
Change-Id: I09a39559a51270fe4571819a35751fa5281554f7
2015-07-09 05:13:50 -06:00
Transifreq 874ac44a09 Updated en-GB translation
Change-Id: I7ea294323e3815cc7a2cd8e61b3916eaf33b4243
2015-07-09 05:12:21 -06:00
Transifreq da4986440d Updated en-AU translation
Change-Id: Id722259c9cbddd6cd69e58788adc96e71abaa66e
2015-07-09 05:10:51 -06:00
Transifreq 94300a8f10 Updated de translation
Change-Id: I3c1421676f2817776fd270f50032ad967d096b6e
2015-07-09 05:09:21 -06:00
Transifreq 15789a7174 Updated da translation
Change-Id: I05715363cfd3992c38353db5942b3dd59c0c18a4
2015-07-09 05:07:51 -06:00
Transifreq 0c2007e09b Updated ar translation
Change-Id: I5d7fe268d2e678a2366d309c4c97cdf110dff33f
2015-07-09 05:06:22 -06:00
Brandon Broschinsky eb216c52c7 peer reviews api
refs: PFS-2071, PFS-2072, PFS-2073, PFS-2074

**Test Plan
PFS-2071
1. Create course with assignment, teacher and two students
2. setup peer reviews on assignment
3. As student 1 create a submission
4. As student 2 peer review submission, leave comments
5. execute the following api courses/:course_id/assignments/:assignment_id/peer_reviews
6. As account admin all information should be shown
7. As teacher all information should be shown
8. As student should see all information
9. Repeat above but set anonymous peer reviews on assignment
10. As account admin all information should be shown
11. As teacher all information should be shown
12. As student should see comments but all reviewer
information should not be shown
13. include the following include parameters, include[]=submission_comments,
include[]=user make sure additional information is shown according to parameter.

PFS-2072
1. Follow setup from PFS-2071
2. execute a get on the following api
   /api/v1/courses/:course_id/assignments/:assignment_id/submissions/:submission_id/peer_reviews
3. validate that only peer reviews for the given submission are shown

PFS-2073
1. Follow setup from PFS-2071
2. execute a post on the following api, including a user_id parameter
   /api/v1/courses/:course_id/assignments/:assignment1_id/submissions/:submission_id/peer_reviews
3. validate that user from user_id parameter is added as a reviwer on the submission

PFS-2074
1. follow setup from PFS-2071
2. execute a delete on the following api, including a user_id parameter
   /api/v1/courses/:course_id/assignments/:assignment1_id/submissions/:submission_id/peer_reviews
3. validate that user from user_id parameter is removed as a reviewer on the submission

(cherry picked from commit 91744bbcd5a81be968139b1f68b65c3e9eaa7b4a)

Change-Id: Ic09a16956cddb2f113625ff61bc733503d713abb
Reviewed-on: https://gerrit.instructure.com/56936
Tested-by: Jenkins
QA-Review: Adam Stone <astone@instructure.com>
Reviewed-by: John Corrigan <jcorrigan@instructure.com>
Product-Review: Brandon Broschinsky <brandonbr@instructure.com>
2015-07-08 21:18:59 +00:00
James Williams cda5cc88e9 rails4: use unscoped instead of with_exclusive_scope
with_exclusive_scope is deprecated

refs #CNVS-21596

Change-Id: I5f7d2744f8084a032100b54cf0d34118373e59ce
Reviewed-on: https://gerrit.instructure.com/57812
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2015-07-08 13:02:57 +00:00
James Williams 0eb88fe7b0 rails4: add to_yaml for TimeWithZone
refs #CNVS-21596

Change-Id: Ic27fed7ce841b439476e65932dd52f8fec38e37b
Reviewed-on: https://gerrit.instructure.com/57814
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2015-07-08 12:58:50 +00:00
James Williams 0b4f879ecb rails4: set active_record.whitelist_attributes to false
refs #CNVS-21596

Change-Id: Ie7c46ac6d5f7bac068eeeb6ca7ec971b414ed8e2
Reviewed-on: https://gerrit.instructure.com/57856
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2015-07-07 20:30:31 +00:00
James Williams 99f94e2f44 add date based restriction options to sis grade export endpoint
test plan:
* create courses with assignments retrievable through the endpoint
 created in g/54418
* should be able to use the start_at and end_at arguments
 (should be in the API documentation)
 to restrict the list of course_ids to courses that lie
 within those dates

refs #SIS-1124

Change-Id: I8cce47beb062d52ce29e6728cc3e6170ad1e411a
Reviewed-on: https://gerrit.instructure.com/56370
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2015-07-07 14:10:34 +00:00
Transifreq d2718bc197 Updated nl translation
Change-Id: Ibb9914b9231e396b69244360c55b8e14162c8978
2015-07-07 05:24:18 -06:00
Transifreq 1fcf301bb7 Updated es translation
Change-Id: I0e9b30ba96d44330b953ea473b488be5604c6e59
2015-07-07 05:15:52 -06:00
Transifreq b3fa363fc2 Updated en-GB translation
Change-Id: Ifc7cc508b0059119d0e4584c37e4ca272c02bfd1
2015-07-07 05:14:22 -06:00
Transifreq 60f475e0d0 Updated en-AU translation
Change-Id: I109831451fbe67e456d8f5b1f5bb926514dd6056
2015-07-07 05:12:52 -06:00
Transifreq 7f63820ec7 Updated ar translation
Change-Id: I583e44e10b034f784ae6c9643558bb961694db99
2015-07-07 05:08:35 -06:00