Commit Graph

157 Commits

Author SHA1 Message Date
Brian Palmer 8d76be0b8c hiding stream items on the dashboard, closes #4387
This is permanent, if a stream item is updated it doesn't re-appear on
the dashboard. This is done by marking the stream item instance as
hidden, which means adding the hidden field to the two indexes.

Change-Id: Ifa544cef4ea2d46f4214e8317af4c9e3baed76eb
Reviewed-on: https://gerrit.instructure.com/3603
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-17 07:57:01 -06:00
Ryan Shaw ffefcc6005 fix selenium test that was throwing errors
I don't know if/how this test was working in the
past but i cannot get it to work on my local firefox
or on the selenium xp vm on bob. error thrown:

Selenium::WebDriver::Error::UnhandledError Exception:
com.google.common.collect.Maps$TransformedEntriesMap
cannot be cast to java.util.List
(java.lang.ClassCastException)

Change-Id: I679fc33f8dd02480a6cda4d92aed3320b8061290
Reviewed-on: https://gerrit.instructure.com/3675
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-16 14:16:19 -06:00
JT Olds 0af7ccee09 don't reset the account id if the course already has one and one wasn't provided
Change-Id: Ib0c33bd880b597968fd0eda31d29ae64939e299b
Reviewed-on: https://gerrit.instructure.com/3628
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-16 14:16:13 -06:00
Brian Palmer ace397540a support sis ids in the canvas apis, closes #4386
Change-Id: I2ae2a447f3950d09257b9ff6498326ec89c8bed8
Reviewed-on: https://gerrit.instructure.com/3621
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-05-16 13:25:07 -06:00
Zach Wily ac4d74082a add an alternate login url for CAS
This alternate url can be used for strange setups where someone wants to wrap
their CAS login in an iframe. When logging in via this method, the iframe will
be exited after returning from the CAS server.

Change-Id: I53561f824451a8b7319c4a821aaada9a459e6226
Reviewed-on: https://gerrit.instructure.com/3669
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-16 08:24:16 -06:00
JT Olds 08ab2a604c always reset section account on sis import
Change-Id: I91c50b23f8349b878ec3ef6714ee04d399e5c0a5
Reviewed-on: https://gerrit.instructure.com/3671
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-16 08:23:32 -06:00
Brian Palmer 97662bffec clean up spec
Change-Id: I990d419b37424b071ff8f14e556ad4f16d8d5893
Reviewed-on: https://gerrit.instructure.com/3661
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-16 08:09:04 -06:00
Brian Whitmer cc81de2d43 better support for disabling plugins
There wasn't a good way in the interface to
disable a plugin other than the manually go through
and empty out all the text fields.

refs #4194

Change-Id: Ia095160323c907a43fb98f4f3fe85f1babf7eebc
Reviewed-on: https://gerrit.instructure.com/3544
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-05-14 23:52:04 -06:00
Brian Palmer 61b2e0684c fix safefiles accessing the user context for submission attachments
Change-Id: I3d55f3848485f58a197b949a9761fb165d8ce838
Reviewed-on: https://gerrit.instructure.com/3660
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-14 09:23:03 -06:00
Brian Palmer b657f4e959 generate an error report for all errors, not just some of them
refs #4487

This consolidates our ErrorReport class with our ErrorLogging mechanism,
it's all in ErrorReport now and you call ErrorReport.log_error or
ErrorReport.log_exception to both create an ErrorReport object, and call
the hooks similar to what ErrorLogging did so that plugins for other
error handling mechanisms can be injected.

ErrorReport has a category field now, similar to how ErrorLogging used
to take a type. the /error_reports UI can filter by category.

The plugin interface was designed with Hoptoad integration in mind, but
it should be pretty general.

Change-Id: I59f7a0d44cf4b6215ad13ff92d30e1d1af607b74
Reviewed-on: https://gerrit.instructure.com/3577
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-11 10:36:56 -06:00
Brian Palmer 03e9dc440b don't return duplicate courses from fast_all_courses, fixes #4485
Change-Id: Ic760ac9b83e3caa9867c89620a72aa4a816e3703
Reviewed-on: https://gerrit.instructure.com/3594
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-11 10:34:36 -06:00
JT Olds 1b900f660e update existing sis communication channel instead of creating new ones. fixes #4538
Change-Id: Idf6e03ee14b2f93e4393a36229305dcdb3da14e8
Reviewed-on: https://gerrit.instructure.com/3585
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-11 10:34:08 -06:00
JT Olds beb9b53c1d make sure a course made sectionless due to crosslisting gets marked deleted. fixes #4518
Change-Id: I28998d8d2159fc8875cda0c23b210c08b3a2f800
Reviewed-on: https://gerrit.instructure.com/3536
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-11 10:34:01 -06:00
Brian Whitmer 8dca8a0d19 update facebook integration to oauth 2
This should allow open source installs to now set up
their own Facebook apps if desired.  The facebooker
gem is no longer required and configuration now
happens in a plugin instead of a yml file.

fixes #4509

Change-Id: Iec76dc8c31f0ad0276e992319f368826baa4ccc5
Reviewed-on: https://gerrit.instructure.com/3545
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-10 16:18:23 -06:00
JT Olds 837b99828d enable account hierarchy modifications via the sis interface. refs #4521
Change-Id: Iea6e2abd6f2222e22ba67f2f0bfd91446d118e92
Reviewed-on: https://gerrit.instructure.com/3528
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-05-10 11:00:56 -06:00
Brian Palmer a563cc2e98 submission web snapshots with local storage, fixes #4531
the attachment has its context set to the submission, which we don't
handle as a context anywhere currently. Rather than try to shoe-horn the
submission into a context role, we allow using the /files urls without
any context at all (we still check permissions on the attachment of
course). this fixes some safefiles issues as well.

Change-Id: Iec12b02f16f01f795f70a6f4ed8a152b7661e000
Reviewed-on: https://gerrit.instructure.com/3557
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-09 17:06:14 -06:00
Bracken Mosbacker af08b162c3 handle submissions with no score correctly in grade calc
An assignment can have a submission but no score, if that
happened the calculator dropped those submissions for
the final_grade instead of using a score of 0

closes #4491

Change-Id: Ic49816c887aec001ecdd9d99412dc588e2c891e6
Reviewed-on: https://gerrit.instructure.com/3552
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-05-09 15:34:53 -06:00
Zach Wily 3d116c6434 send teacher notifications of submission comments before assignment is submitted; fixes #4516
Change-Id: I81d932790e82065160351349ada13ac4cd1994e1
Reviewed-on: https://gerrit.instructure.com/3513
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-06 21:04:03 -06:00
Zach Wily 6b403d6aa9 fix local detection for file uploads tests
Change-Id: I3357e39ee3a05f5a370f1f40805adac9358e191f
Reviewed-on: https://gerrit.instructure.com/3530
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-06 21:03:48 -06:00
Brian Palmer 4ae436f253 fix file upload selenium tests
there was hidden brokenness that i exposed in a recent change

Change-Id: I02712d099a662bba672a2f1cc340b90d6164f177
Reviewed-on: https://gerrit.instructure.com/3529
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-06 15:03:56 -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 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 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
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 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
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
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
Brian Palmer 2cb69ae0d7 use user host url for summary message links, fixes #4455
Change-Id: Iddfd3b9c72cd9367b5bcb22928de3adfe795c4e8
Reviewed-on: https://gerrit.instructure.com/3440
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-03 13:27:16 -06:00
Cody Cutrer 39588b17be include account_users in user_account_associations. fixes #4451
Change-Id: I9a24ab4f5612a66fc2c59c28211de28a88b61dad
Reviewed-on: https://gerrit.instructure.com/3427
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-03 12:27:09 -06:00
Jon Jensen 28f7856fe7 fix single-quote escaping
gsub replacements need extra backslashes thanks to capture groups.
'\\\'' is the equivalent of $', which matches the string after the
previous match. so:

 "'foo'".gsub(/'/, '\\\'') -> foo'foo
 "'foo'".gsub(/'/, '\\\\\'') -> \'foo\'

Change-Id: If579316ac7665d5eb56b00eb93443c72e48d6d56
Reviewed-on: https://gerrit.instructure.com/3413
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-05-02 15:51:16 -06:00
Brian Palmer f72caba51c only list each user once when filtering account users by term, refs #4400
Change-Id: I7406a9aa01cc649bb1bb6b3b8954e468dd03d2be
Reviewed-on: https://gerrit.instructure.com/3406
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-30 20:25:47 -06:00
Brian Palmer dac5bdf0ce handle repeated qti imports of the same filename better, closes #4411
Change-Id: I61d67d5005b9073e5c937611014f0929e45562d1
Reviewed-on: https://gerrit.instructure.com/3367
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-29 12:33:31 -06:00
JT Olds 4c6c9056d1 be more paranoid when looking up users for sis
Change-Id: I4129ba2d687ba8d9cb6cdb363711635a6e443955
Reviewed-on: https://gerrit.instructure.com/3353
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-29 09:49:01 -06:00
Brian Palmer 38e8304c40 make kaltura errors on import non-fatal, closes #4395
And show non-fatal errors to the importing user.

Change-Id: Ib1c28a3bedb0d7f0805c483721cf569db40d72c9
Reviewed-on: https://gerrit.instructure.com/3328
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-29 09:30:54 -06:00
Brian Palmer cee38eb579 filter users by enrollment term in account section, closes #4400
Change-Id: I42f006e7e90faf9f6c1b0e72678e12410bd2e321
Reviewed-on: https://gerrit.instructure.com/3359
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-29 07:59:55 -06:00
Brian Palmer 186fd8486b only export media objects that are used in RTE fields by the export
closes #4388

Change-Id: I24ae7f6dc0fef5c552c7eab43c76533a164b57f9
Reviewed-on: https://gerrit.instructure.com/3312
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-28 07:52:20 -06:00
Cody Cutrer d5c439b0c2 grade publishing results importer
Change-Id: I5279b8dadc9084858099b4b55aaf2dc8ef632a9a
Reviewed-on: https://gerrit.instructure.com/3134
Reviewed-by: JT Olds <jt@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-27 16:45:49 -06:00
Zach Wily 6ea2a8875d make cross-listing selenium spec more robust
For some reason the click event on the other element isn't always triggering
the change event on the course id field. Hitting enter in the box more
reliably triggers it.

Change-Id: I33f465f05e0a7394dae1e515cdbda4a2917206a5
Reviewed-on: https://gerrit.instructure.com/3300
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-27 09:21:54 -06:00
Brian Palmer 3e3407be2b fix intermittent scribd spec failures
Change-Id: I7f3bd691cf0bdf0d24957253a747766172378c74
Reviewed-on: https://gerrit.instructure.com/3297
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-27 09:01:40 -06:00
Bracken Mosbacker 961657a763 add calendar events to export/import
closes #4373

Change-Id: Ia7a771321da0542e393df64578d568d0111a08a3
Reviewed-on: https://gerrit.instructure.com/3282
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-26 12:28:31 -06:00
Zach Wily e10c1cc2f5 fix indenting of imported modules; fixes #4375
Change-Id: Ibbf3466424e58e41e47691fcbd6e548450d47e15
Reviewed-on: https://gerrit.instructure.com/3264
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-25 23:47:53 -06:00
Zach Wily 0416648787 fix cross-listing selenium test
it wasn't clearing out a text field before typing, and it had a race condition
relying on the browser being slow.

Change-Id: I9024da2a67da99e1aef4486e156a13effd35e2dd
Reviewed-on: https://gerrit.instructure.com/3261
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-25 23:47:38 -06:00
Bracken Mosbacker 40eba041a9 export all files with filename instead of display name
module content tags will rename a file if there is a
title set

closes #4343

Change-Id: I4e90921b8dab62b452f599135d683515bd342ba1
Reviewed-on: https://gerrit.instructure.com/3260
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-25 21:02:03 -06:00
Brian Whitmer 3beb896b50 interface for manual crosslisting
Sections can be manually cross-listed into another
course.  Teachers/admins can use the search tool to
find a course, or manually enter it's id/sis_id
to select it as a destination.  Cross-listed sections
and also be manually un-cross-listed.

fixes #3759

Change-Id: I65ac76c80e7cf2703ba3c5d4c63801b6b7a348a1
Reviewed-on: https://gerrit.instructure.com/3173
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-25 16:25:05 -06:00
Cody Cutrer 98e68f9e4b export/import modules links. closes #4313
Change-Id: Ib4d789cf69a8492de958e2e2b68a3c85bf2fe8b5
Reviewed-on: https://gerrit.instructure.com/3254
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-25 16:21:47 -06:00