Commit Graph

735 Commits

Author SHA1 Message Date
Cody Cutrer 7505e1d303 avoid force-reloading data from the database if possible
refs #3752

Change-Id: I7eb25aafd59ff1c785de2f318117336827e776cc
Reviewed-on: https://gerrit.instructure.com/3516
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-06 14:01:56 -06:00
JT Olds f382b24f50 course deleted in the ui should not come back through sis. fixes #4520
Change-Id: I60c56c75601df94242da3ca3031b2822858495f7
Reviewed-on: https://gerrit.instructure.com/3520
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-06 13:40:31 -06:00
Zach Wily 3cfac10191 fix cross-listing selenium spec (we don't support updating on blur)
Change-Id: Ia463ca5445efc45a5663703a1dc8b33a8df42896
Reviewed-on: https://gerrit.instructure.com/3524
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-05-06 13:34:33 -06:00
Zach Wily 85bfaa7633 support setting a profile for running firefox selenium tests
Change-Id: Ic5ca18ca432076c443b0b46e8e25e6480856509e
Reviewed-on: https://gerrit.instructure.com/3523
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-05-06 13:20:54 -06:00
JT Olds 128fc92e32 give plugins a way to inject alternate grade export formats
Change-Id: Icd4ddc52cc3190ba28fb1d93821642ef2b119a3c
Reviewed-on: https://gerrit.instructure.com/3323
Reviewed-by: JT Olds <jt@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-06 09:44:51 -06:00
JT Olds 9ab40ec477 course start and end dates. refs #4398
Change-Id: I1fe062fe1b54a8e387822e636e3c7ed3ece49c9c
Reviewed-on: https://gerrit.instructure.com/3494
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-06 09:37:33 -06:00
JT Olds 550965fa64 ensure the login_id credential checks allow a user to update information
Change-Id: I17f27b44e120c40ee525ebef43e710a904760799
Reviewed-on: https://gerrit.instructure.com/3493
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-06 09:37:17 -06:00
Brian Palmer b2fdda244f switch to a custom timeout exception class for delayed job timeouts
since this new class descends from RuntimeError, the current
SisBatch#process error handling will catch the exception.

closes #4416

Change-Id: I91ac80650a4a214c469185012523d8a078d7bd12
Reviewed-on: https://gerrit.instructure.com/3502
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-06 08:11:43 -06:00
Brian Palmer 020a92dcf3 make "imported qti files" folder hidden by default, closes #4440
Change-Id: Ifa82c83b459422bff192442025ee99f01262ef99
Reviewed-on: https://gerrit.instructure.com/3497
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-06 08:11:32 -06:00
Brian Palmer 55d4708035 preview files inline in speedgrader with local storage, fixes #4492
Change-Id: I56349cc57a2f16acdbe4a78f126cb4f0a47044bc
Reviewed-on: https://gerrit.instructure.com/3495
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-06 08:11:26 -06:00
Brian Palmer 6bec0722ad thumbnail support when using local storage, closes #4500
Change-Id: Ib11b2513e64179637ef3cce4f2bc4eb0b9c4cd68
Reviewed-on: https://gerrit.instructure.com/3492
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-06 08:11:18 -06:00
Zach Wily d0f166b3f6 set root account correctly when creating sub-accounts; fixes #4439
Change-Id: Ia5ad2afcd86763780c73a1bbbe408228c4166b88
Reviewed-on: https://gerrit.instructure.com/3488
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-06 07:42:21 -06:00
JT Olds 9b166d06f1 restricting the amount of data the sis batch api calls return
Change-Id: I886d565da973cf1d4a7f6aed26c172b57ad6cde4
Reviewed-on: https://gerrit.instructure.com/3501
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-05 16:36:45 -06:00
Cody Cutrer 5438cda25b avoid an extra db write for every user and enrollment created
refs #3752

Change-Id: Ie382a08245705df171d1e3056ff7a8fa4ff7b33b
Reviewed-on: https://gerrit.instructure.com/3506
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-05 16:15:50 -06:00
Cody Cutrer 2a0b0a64ac skip expensive copy if we're going to skip the broadcast anyway
refs #3752

Change-Id: I713696875406a7561da22ff65130297ecba8b800
Reviewed-on: https://gerrit.instructure.com/3508
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-05 16:15:12 -06:00
Bracken Mosbacker 35deefea7d don't try to mass-assign send_scores_in_emails
refs #4479

Change-Id: Idb7827429a10024b6261e3d93a7c7c43b3556f28
Reviewed-on: https://gerrit.instructure.com/3498
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-05-05 14:32:45 -06:00
JT Olds 24749e39b8 fix user root account removal. fixes #4458
Change-Id: Id6a2eb9efc796227ebe7a497731e6f9101a0340f
Reviewed-on: https://gerrit.instructure.com/3489
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-05 10:50:31 -06:00
Brian Whitmer f71b0b4808 reword peer reviews to be more clear
The verbiage said peer reviews were "due" at a certain
date, but the code was actually using that date to decide
when to *assign* the peer reviews.  This starts the
process of renaming that column.

fixes #4118

Change-Id: I1c476c97495de6fa0c76ff33658b37ffa02e9022
Reviewed-on: https://gerrit.instructure.com/2958
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Brian Whitmer <brian@instructure.com>
2011-05-05 09:41:39 -06:00
Jon Jensen 528e4aa6e0 let teachers see hidden files, fixes #4489
Change-Id: Ia5a6fb7f3fbe4465851a30440c5ed51c3773eb50
Reviewed-on: https://gerrit.instructure.com/3479
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-05-05 08:55:41 -06:00
Jon Jensen 488ada2bb0 initially blank the form on new messages and replies, fixes #7043
note that we still call fillFormData for replies. this just ensures we
don't bring along the previous body, attachments, recipients, etc.

Change-Id: I986813ae2f31dcaf55412c25073eff525431f1ad
Reviewed-on: https://gerrit.instructure.com/3484
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-05-05 08:55:35 -06:00
Brian Palmer 0c2a6b9037 fix mimetype detection
A typo "responds_to instead of respond_to" was throwing an exception,
which was getting swallowed by our rescue-all.

Change-Id: I38193ed8035cd656e6c03e81e7eee2419165212b
Reviewed-on: https://gerrit.instructure.com/3490
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-05 08:49:35 -06:00
Brian Palmer 249cb7491f filter out results without percentage, fixes #4490
Change-Id: I8a5076172c7fadfef44c0185652b91b4d3e83dd5
Reviewed-on: https://gerrit.instructure.com/3477
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-05-05 08:09:31 -06:00
Brian Palmer b53c8cae29 Attachment#open method
Refactor to use it in places where it makes sense. This eliminates all
the places where were were calling File.read or otherwise reading into
memory potentially large files just to write them back out.

Change-Id: I679ce9979933140340b30cc043540ca3f834097e
Reviewed-on: https://gerrit.instructure.com/3324
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-05-05 08:09:25 -06:00
Brian Whitmer e8c3410404 opt-in for grades in emails
Students can now opt-in to receiving actual scores
in email/sms/facebook notifications about homework
grades.  This ability can be manually disabled at
the root account level if necessary.

fixes #4479

Change-Id: I1b769bef140719578fa345ca519999a2834b00f8
Reviewed-on: https://gerrit.instructure.com/3473
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-04 22:57:14 -06:00
Brian Whitmer d1b4583a36 link to calendar event page instead of calendar on syllabus
fixes #4292

Change-Id: I15e62353de5e8903c19b077ee479b3b453eb1e2e
Reviewed-on: https://gerrit.instructure.com/3475
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-05-04 22:57:04 -06:00
Cody Cutrer 8f4e0687cf use named scope to avoid postgres warning
Change-Id: I9ef84d815ddf059ae0244977af250eb39d1b6c85
Reviewed-on: https://gerrit.instructure.com/3486
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-05-04 16:59:24 -06:00
Brian Palmer 1131f32899 provide anonymous_submissions flag in assignments api, closes #4392
Change-Id: I2ca239fc7bea827141270c2ced4f48bc888638ae
Reviewed-on: https://gerrit.instructure.com/3480
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-04 13:25:22 -06:00
Zach Wily c03ddcebec fix points tooltip not showing up for students; fixes #4493
Change-Id: I45fc57d60507b1a5407c231fc14fc4944d94cae4
Reviewed-on: https://gerrit.instructure.com/3478
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-04 13:06:10 -06:00
Brian Palmer 9545c16f0f don't force a due date for any quiz that has lock or unlock dates
fixes #4481

Change-Id: I9cbcb618d260be0cf1f06d57249bbca6c54d7e64
Reviewed-on: https://gerrit.instructure.com/3474
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-04 12:54:27 -06:00
Ryan Shaw c24b95d10e handle if there are no visible students in the speedGrader
before, the javascript would die because it is all
designed expecting there to be students.

Change-Id: I164d9cb7c3706b6afef810c9f054b3b367d9974b
Reviewed-on: https://gerrit.instructure.com/3463
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-05-04 12:43:21 -06:00
Ryan Shaw 3d416e6cb9 fix pageviews to_csv, fixes #4470
broke because there is no longer an Object#to_csv
but there is an Array.to_csv

Change-Id: I0569f5a6111ad18871c59b5674b535165273b4c9
Reviewed-on: https://gerrit.instructure.com/3464
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-04 12:43:12 -06:00
Cody Cutrer 49ced0d4b3 use a better link for collaboration invitations fixes #4452
The current link only worked for collaborations associated with
courses, not any type of group.  For groups, we need to use the full
collaboration ID in the URL, since there is no collaborations tab.
Also, we need to use base_ar_class, since it might by a
CourseAssignedGroup.

Change-Id: Idf215ce5c3d922bffb7c47cf17e0ff0dab21cab1
Reviewed-on: https://gerrit.instructure.com/3445
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-05-04 11:06:29 -06:00
Jon Jensen 8b78ba02d5 let students see outcome details, closes #4469
Change-Id: Ic1ae04eaabaf1077086c22a153da2bf31c395c35
Reviewed-on: https://gerrit.instructure.com/3472
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-05-04 11:02:36 -06:00
Jon Jensen 4aa735c6c3 ability to run file upload specs using local driver
Change-Id: If2894e45685d2998d73330be48fb2f361b3cd74c
Reviewed-on: https://gerrit.instructure.com/3400
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-05-04 10:56:10 -06:00
Brian Palmer dadbdb50c7 fix check for disabled respondus soap api plugin
Change-Id: I90e545be7ecbaf05027bc62d05e0e47471bca33b
Reviewed-on: https://gerrit.instructure.com/3460
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-04 08:37:14 -06:00
Brian Palmer 664b7306bd show account admin roles for site admin permissions, fixes #4465
Change-Id: I843e2786ac8f0d5f4def4bd1d64fef02ab762e52
Reviewed-on: https://gerrit.instructure.com/3453
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-04 08:37:05 -06:00
Zach Wily 37c68fcf7f fix error reordering assignments
+ binds tighter than ?, apparently.

Change-Id: I5eb77cbac90adb0f547b7cc795fecb6cdb0ad1f5
Reviewed-on: https://gerrit.instructure.com/3468
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-04 08:33:06 -06:00
Brian Palmer d6dd066e3d increase limit of content_migrations.migration_settings to 500kb
fixes #4477

long-term we should probably move a lot of this data out of this column.

Change-Id: Ib2bc853eb7c3fe4d3c79240d3a5a491c1b2e41fc
Reviewed-on: https://gerrit.instructure.com/3471
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-04 08:27:11 -06:00
JT Olds 337dbd5110 disable ui button by setting its function to nil
Change-Id: I93f46bfaabd62164d2a114a59400ae3d6776418e
Reviewed-on: https://gerrit.instructure.com/3329
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-05-03 17:25:43 -06:00
Bracken Mosbacker e3eac25235 allow posted_at to be set explicitly for discussions
close #4459

Change-Id: I19e0d018bf6db77be746a183886ac636d92b9d2c
Reviewed-on: https://gerrit.instructure.com/3467
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-03 16:47:28 -06:00
Cody Cutrer 6057f56dde fix links to inbox to messages you sent fixes #4468
Change-Id: I49ddbdd46fe993aee4284e3a853d22c2ca35340d
Reviewed-on: https://gerrit.instructure.com/3462
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-03 16:29:59 -06:00
Zach Wily 84467a4243 return 'canvas ok' in health check
Change-Id: If03b111a5b07943279fbbfa65e386ae78368a7c1
Reviewed-on: https://gerrit.instructure.com/3458
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-03 16:28:17 -06:00
Brian Palmer 6260f57d61 set kaltura default max file size to 500mb
Change-Id: I15e632b386db3354a09f41480f8f196d81fd9d2f
Reviewed-on: https://gerrit.instructure.com/3466
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-03 16:25:34 -06:00
Brian Palmer f2df61ab59 fix file sidebar loading in firefox, fixes #4467
turns out that in firefox, setTimeout(someFn) will pass a "lateness"
number value as the first parameter to someFn
http://benalman.com/news/2009/07/the-mysterious-firefox-settime/

therefore, first_time was always true and firefox looped forever for any
files sidebar with > 50 files

Change-Id: Iabb4981ae42eb810123df14cba9e837eb1f9f128
Reviewed-on: https://gerrit.instructure.com/3461
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-05-03 16:15:22 -06:00
Cody Cutrer 034ee9caf5 don't load unassigned members when it doesn't exist
i.e. when "No student have been added for this course"

Change-Id: I739a227999268d4bccd804e70ed6075ed32665d0
Reviewed-on: https://gerrit.instructure.com/3457
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-05-03 15:28:47 -06:00
Bracken Mosbacker 0ec46a596a make sure announcements are imported as announcements
Some of the migrators for external migrations separate
announcements from discussions. This just tags all those
announcements as such so they'll be imported correctly

closes #4463

Change-Id: I9379f679665a7414098eaa84860c4b399ea1fd50
Reviewed-on: https://gerrit.instructure.com/3452
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Bracken Mosbacker <bracken@instructure.com>
2011-05-03 14:57:51 -06:00
Zach Wily 7beaf4d764 fix update_account_associations job getting created for every imported user
Change-Id: Ia7dc8ca3912510114d88035e264e59ebb54fe086
Reviewed-on: https://gerrit.instructure.com/3446
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-03 14:26:18 -06:00
Cody Cutrer 7ba5d5e3b2 revoke access from prior users to deleted courses fixes #4460
Change-Id: I0b3531302b40415b5aa39574d02683511cb30002
Reviewed-on: https://gerrit.instructure.com/3448
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-03 14:23:07 -06:00
Zach Wily 5cf114b51e make plugins version display consistent
Change-Id: I5baf09e61d8b8f3a9ffb5cf1f7ceda741928491b
Reviewed-on: https://gerrit.instructure.com/3443
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-03 14:16:50 -06:00
Brian Palmer f407d5b95d enable full scribd support for local storage
Change-Id: Iaa6ea3dbaf2d6673fb8fa94850622c455a9a25e3
Reviewed-on: https://gerrit.instructure.com/3447
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
2011-05-03 14:13:51 -06:00