Commit Graph

43508 Commits

Author SHA1 Message Date
Paul Strong 17e8f969f9 Fix user account associations not being updated properly on rare occasions.
User account associations were not being updated properly when updating pseudonym accounts multiple times.

Without this fix user account association updating breaks when the pseudonym account gets updated multiple times in a row
For ex.

    pseudonym.account = account1
    pseudonym.save
    pseudonym.account = account2
    pseudonym.save

 After running the code above the update_user_assocations code would update the user association to point to the first account instead of the second account.

Change-Id: I0f2666458cd9b1e54afb52d26e2b4ec858dccd26
Reviewed-on: https://gerrit.instructure.com/2589
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-09 16:34:08 -07:00
Zach Wily 0c50014ffe capitalize the plugin author names
Change-Id: I77bbbbbf68b7e5bc30b9e50d36a5b1937a966a5d
Reviewed-on: https://gerrit.instructure.com/2561
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-09 13:51:19 -07:00
Jon Jensen cd987e4074 fix gradebook loading bug
Change-Id: I0aaab22e2869451bdf4ccf7613d2027a61d06a32
Reviewed-on: https://gerrit.instructure.com/2571
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-09 13:44:28 -07:00
Brian Whitmer 1e4598d030 ungraded items not showing in gradebook, fixes #4001
Change-Id: If2283b3930fcf812e0d37aa7712d571f17d715b1
Reviewed-on: https://gerrit.instructure.com/2577
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-09 13:43:25 -07:00
Brian Whitmer e91184e1c5 quiz preview broken, fixes #3999
Change-Id: I4bbc851d3188ab03021e9509b24ed18e5eead9b2
Reviewed-on: https://gerrit.instructure.com/2574
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-09 13:42:32 -07:00
Brian Whitmer 2b958579f5 quiz essay questions not getting marked as answered, fixes #3998
Change-Id: I9920047f56592267335860e9cecb64879aaa5ee4
Reviewed-on: https://gerrit.instructure.com/2575
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-09 12:54:00 -07:00
Jon Jensen ec51f1dfe2 policy/signature auth for local uploads instead of session cookie fu, refs #3762
Change-Id: I64c6446c36c253235b86ba9edfc411a20c2812fc
Reviewed-on: https://gerrit.instructure.com/2546
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-09 12:11:34 -07:00
Brian Whitmer d6e9f03968 rubrics getting deleted incorrectly
a rubric should only be deleted once it's not
being used anymore.  It should only be unbookmarked
from a given context when it's not being used in
that context anymore.

fixes #3309

Change-Id: Icb8a79baeb0c0ec2195b7e19b1d9768eadfeb97e
Reviewed-on: https://gerrit.instructure.com/2518
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-03-09 11:29:08 -07:00
Brian Palmer 65ed7cb284 fix dev mode reloading in qti exporter plugin settings
Change-Id: Ia8e2a6b03e43f83bc0e29ba490283bf224250eb9
Reviewed-on: https://gerrit.instructure.com/2555
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-09 10:13:21 -07:00
Brian Palmer 8a14ca3b0d api doc readme, and explanation of auth and other api basics
refs #3956

Change-Id: I74b2fc8308c595ca3fb38bea5305d545b42329af
Reviewed-on: https://gerrit.instructure.com/2537
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-03-09 10:13:08 -07:00
Brian Palmer f846e8b71e concrete support for http basic auth, specifically for the API
closes #3956

Change-Id: I8743aecef7126122ba57c06c8469300c5bc08ac7
Reviewed-on: https://gerrit.instructure.com/2536
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-03-09 10:13:00 -07:00
Brian Palmer a38de575fd require SSL for all API requests, refs #3956
An API request is defined as any path beginning with /api

Change-Id: I715a0b63bbe1d6025cab9cf5b2f1bd062b321eab
Reviewed-on: https://gerrit.instructure.com/2562
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-03-09 10:12:49 -07:00
Brian Palmer 8327ebac27 refactor the rest api docs, refs #3956
I removed the api_routes plugin, since the code is currently too tied to
canvas to be pulled out into a generic plugin anyway. The yardoc
templates now live in doc/templates, and I've done some major cleanup
and refactoring -- they don't have much in common with the default YARD
templates anymore, and they work much better as API documentation.

The styling is now a little bit more "canvas-like" now, too.

Change-Id: I80edd02e63d7815a292306741f2e8ea52872aae2
Reviewed-on: https://gerrit.instructure.com/2535
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-03-09 10:12:32 -07:00
JT Olds 65b6f07050 add cross-listed account id to associated course accounts
Change-Id: I2d54baf24c704825a23be3d3c33d2a2d1da28462
Reviewed-on: https://gerrit.instructure.com/2517
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-09 09:24:53 -07:00
Brian Whitmer 44088e0b3c show next/prev buttons on module wiki pages for unlogged users
even if a user isn't logged the next/prev buttons
should still show up... they do everywhere else

fixes #3929

Change-Id: I8415b17bcb00c3c8b5b845919f892ac13dc3c58e
Reviewed-on: https://gerrit.instructure.com/2470
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-09 09:05:29 -07:00
Zach Wily ea548f0df3 pass in an asset_string to user_content on faculty journal page; fixes #3993
I don't think objects or embeds will work on this page, but this will at least
make the page load.

Change-Id: I3c2062709885748010416340b6b8a1263b67f6c6
Reviewed-on: https://gerrit.instructure.com/2566
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-09 07:17:10 -07:00
Brian Whitmer 37e9a261ba spend less time in progress bar in gradebook
the gradebook page has a progress bar which currently
waits until all data for the gradebook is loaded before
hiding the progress bar and showing the datagrid.
Seems like it makes more sense to show the gradebook
sooner and just populate it as data comes in so at
least it's partly usable.  This is a minor change right
now, but it'll make it possible to do more lazy
loading of the gradebook in the future.

fixes #3955

Change-Id: Ie4f486bdc0dd1373d4119822ec706fcdbd329b2f
Reviewed-on: https://gerrit.instructure.com/2501
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-03-08 15:19:14 -07:00
Brian Whitmer c24c2da718 multiple formulas in equation questions getting messed up
It looks like all the formulas were getting concatenated
into a single formula on save.

fixes #3980

Change-Id: Ibefc62621b684de180ca15567694bda0f5a8221d
Reviewed-on: https://gerrit.instructure.com/2542
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-03-08 15:18:42 -07:00
Zach Wily 9077560f50 make urls protocol-relative for ssl; refs #3761
Change-Id: I54ddf3a00a0e88caab3cfd5e1cae632b8942ee55
2011-03-08 15:17:35 -07:00
JT Olds d46a843458 cross-list importing logic
Change-Id: I4aebf7a05a2231f039c6b197f43f1e5344621230
Reviewed-on: https://gerrit.instructure.com/2516
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-08 15:15:03 -07:00
JT Olds dd6185488d adding account field to course section model
Change-Id: I1a3d54c9f64612afc88da987e40e4974f2af71cd
Reviewed-on: https://gerrit.instructure.com/2515
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-08 15:14:49 -07:00
JT Olds 04165d74c1 cross list importing stub
Change-Id: Ifc755f3dacf23e6b0a8a3159b0c16bde1c4523ce
Reviewed-on: https://gerrit.instructure.com/2512
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-08 15:14:35 -07:00
Zach Wily ce0e068190 use resource_domain for kaltura thumbnails; refs #3761
Change-Id: I7bf236a0dccf1c8446708d9a0b5a9885d08d394e
Reviewed-on: https://gerrit.instructure.com/2550
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-08 15:14:32 -07:00
Zach Wily 3059f0e530 access scribd over ssl on https pages; refs #3761
Change-Id: Ic0ddebdcb73061c7da8cd7824648cee03e3f748d
Reviewed-on: https://gerrit.instructure.com/2549
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-08 15:14:22 -07:00
Zach Wily c4d2ea53a2 remove ssl_requirement; refs #3761
Change-Id: If8b11df39ea3b72f743d67a373473c63dc4b9d21
Reviewed-on: https://gerrit.instructure.com/2538
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-03-08 15:14:15 -07:00
Zach Wily 5c7b3f4dbb fix links in announcement notifications for student groups; fixes #3970
Change-Id: I73aa815e9da4154b3645a1ea95b11a4b78a6a910
Reviewed-on: https://gerrit.instructure.com/2532
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-08 15:11:18 -07:00
Zach Wily 90bebbc2c0 make sure attachment is thumbnailed after being uploaded directly to S3
Change-Id: I4c9a866606da6b9fa407ade9c198d9e5bb38296b
Reviewed-on: https://gerrit.instructure.com/2553
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-08 15:11:06 -07:00
Brian Palmer 0d58780258 submission comments aren't user content, they're pre-escaped
fixes #3972

Change-Id: I4c05f722bc840fde9db521666320f58a56cb8757
Reviewed-on: https://gerrit.instructure.com/2534
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-07 12:43:16 -07:00
Zach Wily 9a2caed5c4 call user_content for quiz content on quiz stats page
Change-Id: If9bd36d297e2c4a95ba38577c83a1af30805fb5b
Reviewed-on: https://gerrit.instructure.com/2529
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-07 07:22:11 -07:00
Brian Whitmer 01fa3bfff1 gradebook improvements
- got rid of a bunch of rescue statements
- gradebook remembers hidden columns
- attendance columns are hidden in the gradebook
  by default, with option added to show them

refs #3263
refs #3264

Change-Id: I786ad2c8d6795d4de3f6d279cde601d95d77091a
Reviewed-on: https://gerrit.instructure.com/2500
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-03-04 17:29:39 -07:00
JT Olds b69ae6e248 fixing direct-to-s3 tests - requires a separate server process
or an attachment.rb/attachment_fu rewrite. this is easier

Change-Id: I1140e089671bbefb973cef5a0859976ef367d802
Reviewed-on: https://gerrit.instructure.com/2499
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-03-04 13:24:47 -07:00
Ryan Shaw d46070e330 switch to using selenium 2 (webdriver)
local file storage tests work, s3 tests fixed in
https://gerrit.instructure.com/2499

Change-Id: I1281be4343d4fe554733db3519a90e0f88bbd545
Reviewed-on: https://gerrit.instructure.com/2446
Reviewed-by: JT Olds <jt@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-04 13:24:40 -07:00
Zach Wily b14e961e11 make sure the key in the S3 policy is encoded correctly; fixes #3963
Change-Id: I44b4bcf80254d7a6bfc79baf816b9d9d549a73db
Reviewed-on: https://gerrit.instructure.com/2521
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-04 07:08:22 -07:00
Brian Whitmer 0dab8d51cb sort syllabus items alphabetically
..after sorting by datetime

fixes #3950

Change-Id: Ie5f44086464484ef67bbec267e9569428c270bb2
Reviewed-on: https://gerrit.instructure.com/2497
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-03-03 16:13:05 -07:00
Zach Wily 1b721fbfe9 remove trailing comma
Change-Id: I3eefc93df3a09196b692afe0b4265012597038b3
Reviewed-on: https://gerrit.instructure.com/2513
Reviewed-by: JT Olds <jt@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-03 13:35:27 -07:00
Brian Whitmer bb4205c917 really big images aren't getting auto-sized on quizzes
there's a user_content enhancement that tries to prevent
giant images from messing up the page layout, but it
wasn't working for quiz content.

fixes #3300

Change-Id: I3a7c0dec84fe0bb552c5a90b5ec2fb7c53c599fc
Reviewed-on: https://gerrit.instructure.com/2498
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-03-03 12:11:35 -07:00
Brian Whitmer 8ba6787e01 allow decimal fudge points for quiz submissions
fixes #3932

Change-Id: I802e441db315ae31b28bc3e0b52ac4f3f38d8c49
Reviewed-on: https://gerrit.instructure.com/2494
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-03-03 12:10:55 -07:00
Brian Whitmer 974745822b don't allow deleting an assignment group that still has assignments
if you try to delete an assignment group that still has
active assignments in it, it'll pop up a dialog where you
can choose either to delete the assignments in the group
or move assignments in the group to another group.

fixes #3403

Change-Id: Ie7bc0617ac5b639c946e347950e7d550b27ca384
Reviewed-on: https://gerrit.instructure.com/2495
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-03 11:05:33 -07:00
Zach Wily 2e0dc082a0 fix error when user is not logged in
Change-Id: I1437a8cc2b3f36d5d74758afe2223748e179a5a6
Reviewed-on: https://gerrit.instructure.com/2503
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-03 10:57:48 -07:00
Brian Whitmer 56d16cfbda put user name in breadcrumb on quiz history page
if it's not the current user, put the user's name in
the breadcrumb on the quiz history page instead of
just "History".

fixes #1261

Change-Id: I71f413aec3e405f59e32ff35ac1de19f22110ab3
Reviewed-on: https://gerrit.instructure.com/2464
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-03-03 10:54:26 -07:00
Ryan Shaw f20e8cb2d9 fix calendar event xhr being canceled by window.location
also did a code cleanup while I was at it
fixes #3697

Change-Id: I5bd161bda243a33aa1666fce48d6f58dfca061e4
Reviewed-on: https://gerrit.instructure.com/2150
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-03 10:38:40 -07:00
JT Olds 584300e2ec update password functionality typo
closes #3949 (github issue 10)

Change-Id: I40415f036a61de04a7432773eecaa6ba4c58fa9b
Reviewed-on: https://gerrit.instructure.com/2492
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-02 10:06:26 -07:00
Brian Palmer ba79806c56 show quiz submissions that need manual grading in assignments needing grading
Fixes #3920

Change-Id: I548b913809b463c2c7b2804357d3e48193529048
Reviewed-on: https://gerrit.instructure.com/2489
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-01 15:59:55 -07:00
Brian Palmer faaf0f6eb7 optimize group policy checking on /dashboard
This is super performance sensitive, so we're throwing best practices
out the window a bit here. Hopefully someday we can integrate this into
our security framework better and remove this duplication of logic.

Change-Id: I845db50ffab02769d91272fdc0ce3825d9a670c1
Reviewed-on: https://gerrit.instructure.com/2488
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-01 14:59:44 -07:00
Brian Whitmer 1794792ca6 get rid of 'publish grades' in gradebook dropdowns
we no longer support this functionality, but the option
never got removed.

fixes #3944

Change-Id: Id68be09ea0f7636873dd641e608f31c74caf68fa
Reviewed-on: https://gerrit.instructure.com/2477
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-01 14:59:23 -07:00
Brian Palmer ba20f27352 optimize get_all_pertinent_contexts, especially for /calendar
By scoping the finds to the user, we can avoid a lot of grants_right
lookups and the associated db queries. This is especially helpful for
users who belong to a lot of groups or courses.

Change-Id: I31e22ecddf9456734d6c1297d776a8353e43a526
Reviewed-on: https://gerrit.instructure.com/2486
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-01 14:45:04 -07:00
Brian Whitmer dbe9fd9a6b don't let unlogged users access /accounts
fixes #3899

Change-Id: I45edd0cd4ccfe6676ddc9e62aab570f9f090de47
Reviewed-on: https://gerrit.instructure.com/2468
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-01 14:21:30 -07:00
Brian Whitmer 4f2829da0b on quiz instructions page, "always available" isn't lined up
fixes #3047

Change-Id: Ie5b02bdd70cffb4ac1ce3c070552d6509b7a9453
Reviewed-on: https://gerrit.instructure.com/2465
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-01 13:58:08 -07:00
Brian Whitmer fd8b51a083 change 'record media' on assignment submission to be a button
the link really was kind of hard to find

fixes #3227

Change-Id: Ia6ee04e944336f60cd2061ec9a44194c46511e31
Reviewed-on: https://gerrit.instructure.com/2476
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Mark Suman <marks@instructure.com>
2011-03-01 13:55:11 -07:00
Brian Whitmer 02cb5c4d92 default attempt limit on quizzes should be higher than 1
fixes #3469

Change-Id: Ic2646b868d46c7c3a428e47435baeb5e8f8269ef
Reviewed-on: https://gerrit.instructure.com/2466
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Mark Suman <marks@instructure.com>
2011-03-01 13:55:04 -07:00