Commit Graph

22225 Commits

Author SHA1 Message Date
Brian Whitmer c22a1be428 context_message_participants getting recreated
on every save all the participants get duplicated, which
is causing slow loads on messages with lots of recipients.

this commit backgrounds the create process in case
there are a lot of participants to add, and stops using
find_or_create which for some reason was failing to find
correctly.

fixes #4014

Change-Id: I3f03793994999faf2bb424581f45adeb328eb28d
Reviewed-on: https://gerrit.instructure.com/2602
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-03-10 15:14:36 -07:00
Brian Palmer 1cb74645c5 move account loading into the middleware
This will allow things outside of controller actions, like the soap
endpoint, to use this information and ensure that account-specific
request settings are set properly.

refs #3760

Change-Id: I85284d42b3206ff362c4aee6a998737ab89fc4b7
Reviewed-on: https://gerrit.instructure.com/2579
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-03-10 14:41:24 -07:00
Ryan Shaw 47aba744fd didnt have a background for .video links
Change-Id: I7380e2e3fcf3ca636f62cfd98cc89112aacdd4d5
Reviewed-on: https://gerrit.instructure.com/2585
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-10 12:21:47 -07:00
Ryan Shaw 3caaf5d97f fix table borders not being preserved across page saves in tiny
Change-Id: I83d6d7b29c554b2d3d6d99f51b7f4cd35744f98e
fixes: #3916
Reviewed-on: https://gerrit.instructure.com/2528
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-10 12:20:16 -07:00
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
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
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 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
Zach Wily 9077560f50 make urls protocol-relative for ssl; refs #3761
Change-Id: I54ddf3a00a0e88caab3cfd5e1cae632b8942ee55
2011-03-08 15:17:35 -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
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
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
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
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 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
Brian Whitmer 41c9f12988 enforce term/course/section start and end dates
before we were recording these values but not doing
anything about it.  This commit starts scheduling
delayed_jobs to activate/conclude enrollments
in the background when dates pass.

it does not conclude/publish courses/sections
automatically, though.  if we want that to be
automated based on dates then I think we should
do that in a separate commit.

fixes #3356

Change-Id: Id94356fbc5b82196dd041fdb250607a7633cee9f
Reviewed-on: https://gerrit.instructure.com/2431
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-01 13:47:12 -07:00
Brian Whitmer 98c6d03cc9 speed improvements for files page
there's was a lot of unnecessary database calls going
on, should be a little faster now.

fixes #3939

Change-Id: I9a43e0d801bc632d16248ad92b7c9ff16d1673eb
Reviewed-on: https://gerrit.instructure.com/2484
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-01 13:21:03 -07:00
Brian Palmer 62f22d9df7 optimize group loading on courses#show page
Change-Id: I8db43095d2b6f71822624dc2b3134caa1f8748f4
Reviewed-on: https://gerrit.instructure.com/2480
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-01 11:49:31 -07:00
Ryan Shaw 3ada5ea514 fix unclosed paren that made quizzes not work in speedGrader
fixes: #3919

Change-Id: If43e00d1553572ddf3e5aa140292636e5e988051
Reviewed-on: https://gerrit.instructure.com/2461
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-28 14:19:43 -07:00
Bracken Mosbacker 52aa6fb4a8 don't show feedback for deleted assignments
closes #2993

Change-Id: I896f32b6b84419fe839b8c2b576119b0cd23aeff
Reviewed-on: https://gerrit.instructure.com/2361
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-02-28 10:50:23 -07:00
Jon Jensen f3df3c4665 fix assignment group hiding, closes #3800
Change-Id: I4a7ebbdec04aa06991a3be580a793993139b5dbe
Reviewed-on: https://gerrit.instructure.com/2444
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-28 09:28:33 -07:00
Ryan Shaw a114f8073d allow deleting sub-accounts that had "deleted" courses.
Change-Id: Ie91990416ea1dae4a3287af227616faa9b073714
fixes: #3794
Reviewed-on: https://gerrit.instructure.com/2423
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-28 08:54:15 -07:00
Zach Wily 46157ee57c fix html escaping in facebook app
Change-Id: I914be9d6eb4dcc7b3635f174cb9e57dcfe04060d
Reviewed-on: https://gerrit.instructure.com/2460
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-28 08:30:00 -07:00
Zach Wily 470963c56e fix "fill in multiple blanks" question types; fixes #3912
This was leftover from the removal of OpenObject from the quizzes.

Change-Id: I586c55133eefdc76f9c77d58d1bae3f339628264
Reviewed-on: https://gerrit.instructure.com/2450
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-25 21:37:56 -07:00
Jon Jensen 86b062bf61 wimba integration, fixes #2989
added wimba web conferencing support, moved dimdim config into plugin
settings, fixed a few web conferencing ui issues

Change-Id: I6b36b0e594a9f296d14cd35bec02186478bcbd13
Reviewed-on: https://gerrit.instructure.com/2343
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-25 14:35:14 -07:00
Jon Jensen 820fa03212 when changing contexts, don't blank the message form, closes #3865
Change-Id: Id1733e2002f8ce76bb21d2d2f521dd65c9b58da0
Reviewed-on: https://gerrit.instructure.com/2424
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-25 14:34:47 -07:00
JT Olds 34263ed8de making download public
Change-Id: I88a7d076faf306c935f71153908f6de29f6770da
Reviewed-on: https://gerrit.instructure.com/2436
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-24 17:20:45 -07:00
Brian Palmer 202effa992 escaping of enrollments in course drop down, fixes #3907
Change-Id: If995936a602f9e0fb43bf756d52c2522731d7947
Reviewed-on: https://gerrit.instructure.com/2433
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-24 15:31:08 -07:00
JT Olds 96e746c31e making other import types supported via plugins
Change-Id: I689c374060fbfcc89eb79b918ea2db283c6eb99c
Reviewed-on: https://gerrit.instructure.com/2425
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-24 15:15:53 -07:00
Brian Palmer 4e05ce3524 breadcrumbs are now escaped
Change-Id: Ice45457db7597c0d0e2da46b062ba02e17c843a7
Reviewed-on: https://gerrit.instructure.com/2427
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-24 13:03:35 -07:00
JT Olds 77b31810c6 hide wiki pages marked hidden from students
closes #1865

Change-Id: I582d566fd83575e70502dd682ca0347a436e194c2
Reviewed-on: https://gerrit.instructure.com/2422
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-02-24 10:12:41 -07:00
Ryan Shaw a8443755bc dont show media comment both inline and in modal dialog
fixes #3887

Change-Id: I2ada94bdcd79332ef0d0fb6a98ee7459e18f6693
Reviewed-on: https://gerrit.instructure.com/2405
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-24 09:38:12 -07:00
Zach Wily ba7b585193 fix escaping in faculty notes, refs #3888
Change-Id: Ia5ff98778570059bab62b64152285dd68b734024
Reviewed-on: https://gerrit.instructure.com/2419
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-24 07:07:00 -07:00
Brian Palmer 099fe50e72 don't strip tags on plain text discussion entries, fixes #3892
The format_message call takes care of escaping HTML entities.

Change-Id: Ifb6f890903ee00c8098ee8596d4b66d18a2b9054
Reviewed-on: https://gerrit.instructure.com/2418
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-23 16:29:37 -07:00
Zach Wily ba6e8d8b64 fix escaping in autocompleted course search, refs #3888
Change-Id: I4e778bca558bff3aac0f5582653468c6d6a8b5fa
Reviewed-on: https://gerrit.instructure.com/2416
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-23 16:22:34 -07:00
JT Olds 1f9894cb98 improving anonymous survey anonymity
* speed grader now requires hidden student names on anonymous surveys
 * quiz moderation no longer presents student names
 * anonymous surveys no longer provide a list of students who have not taken
   the survey

closes #3793

Change-Id: I7d48766600522b36379e8ae6d2a72486d2ce3ed7
Reviewed-on: https://gerrit.instructure.com/2407
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-23 16:11:13 -07:00
Brian Palmer 9b627b0e6e break SIS error/count reports into partials, fixes #3889
Change-Id: I2811b01392c2320654e237f1840b918bc58dedc6
Reviewed-on: https://gerrit.instructure.com/2412
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-23 14:54:27 -07:00
Zach Wily 16eecfd4dc fix escaping in messages, refs #3888
It's unnecessary to html unescape the subject and body anymore, as they are
already unescaped.

Change-Id: I10b13805a42c677e1309983c77f1aa62e56e8578
Reviewed-on: https://gerrit.instructure.com/2413
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-23 14:37:42 -07:00
Zach Wily 0858d4e337 fix escaping issues with quizzes
Since plaintext fields are stored raw in the database, a lot of the previous
escaping/unescaping behavior in quizzes has changed.

Change-Id: I299fa7979a30b1efa8944c6df7150b82980c47c5
Reviewed-on: https://gerrit.instructure.com/2403
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-23 14:08:29 -07:00
Zach Wily 3ebda084fe fix a lot of html escaping issues
These issues arose from a change in the way we are storing plaintext fields in
the database. Previously they were stored html escaped, and now they're not.
Fixed areas include:

 * folder names in file manager
 * new course sub-account dialog
 * grading rules for assignment groups
 * event titles in calendar
 * content locks page
 * outcomes inside rubrics
 * course listing while writing feedback
 * copying file between contexts in file mgr
 * sis import screen logs
 * file upload options in wiki sidebar

Change-Id: Iab8c8deb81fdfd9062570288218db4180204a497
Reviewed-on: https://gerrit.instructure.com/2406
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-23 12:25:34 -07:00
Brian Palmer 17b89a1751 add support for using sendmail for outgoing mail, closes #3880
This involved some refactoring, since we were using
ActionMailer::Base.smtp_settings[:domain] for generating "From"
addresses.

Change-Id: I6cac6d48971d396a56e07314e042b63a0081a4b6
Reviewed-on: https://gerrit.instructure.com/2398
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-23 08:41:50 -07:00
Brian Whitmer fd8154dc3e problem with facebook registration
missed a rescue in the case where there's not currently
a valid facebook session.

fixes #3867

Change-Id: Ia524dcd93be48e7a4e57866a414096437a0632d3
Reviewed-on: https://gerrit.instructure.com/2359
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-22 20:23:09 -07:00
Brian Palmer 4115014102 deliver messages to all recipients in one job, closes #1
If any individual message delivery fails, we'll reschedule it as its own
individual job.

Change-Id: I51ae5941fd001c61e6c6b708185ff12585d0a49f
Reviewed-on: https://gerrit.instructure.com/2390
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-22 16:23:58 -07:00
Ryan Shaw df166bfe4e move no-js and ie6 warnings out of app.html.erb
did this because it was a waste to send it to
every single page view.
plus I hated seeing it in the firebug and web
inspector

fixes: #3874

Change-Id: I3e25cb78cddf9f8f897c81014bb07ca77ccfc361
Reviewed-on: https://gerrit.instructure.com/2363
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-02-22 10:35:41 -07:00
Ryan Shaw c289d36384 make it so screenreaders dont say "blank" all the time
it was because image_tag("blank.png") would put
a alt tag of "blank" on the image, which the screenreader
would always read.

fixes zendesk 5589

Change-Id: Ifbd200e17d40d6a5f45208f1adb6b49835ce3c5d
Reviewed-on: https://gerrit.instructure.com/2365
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-22 10:13:23 -07:00
Brian Whitmer 0b6e4da151 kaltura pluginified
round one in moving all the yml files to the plugins system instead

Change-Id: Id255c15d14d27bce232606ece6bd00eb7e094749
Reviewed-on: https://gerrit.instructure.com/2339
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-02-21 12:32:43 -07:00
Brian Whitmer e797890421 notification alerts date formatting
the notification settings were poorly formatted, which
was making the start and end times get saved
incorrectly.

Change-Id: I7aae061d823a18f44e00a1e52806df1a26ed3807
Reviewed-on: https://gerrit.instructure.com/2353
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-18 16:09:53 -07:00
Brian Whitmer e495aad662 instructors can't download locked files
if a teacher locks a file and tries to go to the
file details page, it says "hasn't been unlocked
yet", when really it should let them download
since they're a teacher.

fixes #3578

Change-Id: I42ea29d2803b8fa96fd50afd0adfdcf614702760
Reviewed-on: https://gerrit.instructure.com/2342
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-18 16:05:14 -07:00
Brian Whitmer 7ac30914a4 make the textarea bigger for quiz questions
fixes #3791

Change-Id: Icbc5d002ada74c00bc072a0c225d6433d3a7f73f
Reviewed-on: https://gerrit.instructure.com/2288
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-18 16:04:57 -07:00
Bracken Mosbacker b40e07c394 add option to copy course settings during content import
closes #3837

Change-Id: I6b3e40f5dade814d0c567d26f02d0d37d271fe7e
Reviewed-on: https://gerrit.instructure.com/2349
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-02-18 15:11:10 -07:00
Zach Wily bad6e8480c make sure we set the updated_at attribute
Change-Id: I1064523c3028f39311c10f4435237910cd2a52fd
Reviewed-on: https://gerrit.instructure.com/2351
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-18 14:55:22 -07:00
Ryan Shaw 5718b9520b allow showing only a certain section in gradebook
if they can only see 1 section (possibly the default section),
they do not get the option to change it.

they can only change sections they are allowed to see

the setting is stored in $.store.userGet and is keyed
off of the course too so it will be remembered for a
given user/course/browser combo.

if the page loads and tries to show only a section,
but that section does not have anyone in it, or they
cant see anyone in it, it will alert() reload to show
all sections.

fixes #3653

Change-Id: Ie6de238ac8e1d5367ae8ab961aaa0fcc1ca66c1e
Reviewed-on: https://gerrit.instructure.com/2324
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-18 14:15:03 -07:00
Ryan Shaw 37b74ecc04 embed flash, dont load in iframe so wmode is set
Change-Id: I07dbdbdda9a5e53bb47ed91d15af4d665081af03
fixes: #3541 "Flash file blocks Feedback window"
Reviewed-on: https://gerrit.instructure.com/2209
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-18 13:50:19 -07:00
JT Olds 148e66ac68 supporting designer/observer imports and make course_id optional
now one of course_id/section_id is required for enrollments, but not both

Change-Id: I4ebd19ac05988bf3eeffcb846d8bc1fafce73b40
Reviewed-on: https://gerrit.instructure.com/2316
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-18 13:25:29 -07:00
Ryan Shaw 25e7d81ba5 show flash mime icon in full-files
Change-Id: Id0015afa6da488111e51527cf7633b04374f07a1
Reviewed-on: https://gerrit.instructure.com/2208
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-18 10:57:49 -07:00
Ryan Shaw eb8c0bb9d9 changing assignment type deleted assoc. topic
...if the assignment was a discussion topic.

Change-Id: I5279ae402486a1255a4d5b5a7b59017c9fae3fc5
fixes: #3743
Reviewed-on: https://gerrit.instructure.com/2202
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-18 10:57:39 -07:00
Brian Whitmer eee2627610 invalidate caches for account alerts
there's still going to be up to a 3 minute delay on alerts
showing up on a user's dashboard, since we don't touch all
the users for an account when an alert changes, but if a
user closes the alert it should go away forever like it's
supposed to now.

Change-Id: I6461836ad126c4646a496734e84c89305f873f2d
Reviewed-on: https://gerrit.instructure.com/2344
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-18 09:59:31 -07:00
Brian Whitmer 781cea7d94 zip importer shouldn't fail on slow uploads
Used to fail after 10 empty ajax responses.  Changed to
not count it as a bad request unless it's already had
at least one good request.

fixes #3838

Change-Id: I5d41f52ca302f779507e2e93a03ebac342b97e2b
Reviewed-on: https://gerrit.instructure.com/2311
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-17 17:30:31 -07:00
Brian Whitmer b99263ed72 fix outcome details to show correct numbers
On the outcomes page if you clicked "show details" for an
outcome, it would always say "0 artifacts" even if there
were artifacts.  The problem is it wasn't actually looking
for artifacts, it was looking for something else.  Also
fixed the pageless code on the outcome details page to
correctly do an infinite scroll.

fixes #3823

Change-Id: I6e0fd06ea70e5915ee5cdef23d4851ecd6a285fc
Reviewed-on: https://gerrit.instructure.com/2318
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-02-17 17:13:28 -07:00
Brian Whitmer 47a1fdcf5d make quiz pages more efficient
On large quizzes there were problems both while
taking and editing the quiz because of all the DOM
elements.  Part of the solution was using more event
delegation, and part was rendering smaller
partials when editing quizzes with lots of questions,
and then loading the full details of only the
questions that the user wants to edit/view.

fixes #3771
fixes #3817

Change-Id: I73aabe79323c1879d7fc8985d1709751271730f2
Reviewed-on: https://gerrit.instructure.com/2290
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-17 15:48:06 -07:00
Jon Jensen fe6b152e9c fix key collision issue in context_url, fixes #3832
Change-Id: I1d6cffef605cc6767357d0308ccb28778f92852e
Reviewed-on: https://gerrit.instructure.com/2299
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-17 13:20:28 -07:00
Jon Jensen f78189f2d2 don't return uninitialized var (that we don't even use), closes #3672
Change-Id: I164f6a5bd978da8d3cab81bb2e850e73b4196ea7
Reviewed-on: https://gerrit.instructure.com/2303
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-17 13:20:21 -07:00
Jon Jensen 7a8d68bc9d don't allow deletion of true/false answers. also hide question_comment ui, since it's redundant. closes #2997
Change-Id: Iff5a480e0d7a3992a7f4bdf36223dbed17c66435
Reviewed-on: https://gerrit.instructure.com/2306
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-17 13:20:14 -07:00
Jon Jensen 70c69c38e3 tweak user_url for non-admins so that it goes to profile page, closes #3810
Change-Id: I28c8bb4fdc4c7985b9f42f6c598bee1b5131c754
Reviewed-on: https://gerrit.instructure.com/2312
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-17 13:20:05 -07:00
Jon Jensen 14d70f9da3 auto mark-as-read when replying from the dashboard, closes #3822
there's already logic to flag the ContextMessage as read when you read (or
reply to) an InboxItem... just added the inverse to the models, plus a
read call to the controller when replying

Change-Id: Ie3c22cd4e81bbbb4f8a1d88412c6c6fd33e45dc3
Reviewed-on: https://gerrit.instructure.com/2329
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-17 13:19:56 -07:00
Brian Whitmer 7b840846bc clean up observer linking
observers can now be linked from either the course
details page or the user details page inside a course.
Fixed some bugs in this and made the code a bit
cleaner.

refs #3315

Change-Id: I004bc11d823fffcc76ab5b74ee235979248cae4d
Reviewed-on: https://gerrit.instructure.com/2263
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-02-17 13:15:32 -07:00
Brian Whitmer 629805db3c recaptcha plugin
also some UI fixes for the plugin page

Change-Id: I161c458756c20e034c29d4515801fd9f6427aa53
Reviewed-on: https://gerrit.instructure.com/2093
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-02-17 13:00:19 -07:00
Bracken Mosbacker b866a18699 fix wiki_page reference for module importing
closes #3843

Change-Id: I7cc3270f3a5766b8ad8fe7f1e2991396f2fff85c
Reviewed-on: https://gerrit.instructure.com/2313
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-17 10:40:18 -07:00
Ryan Shaw 6b8aea2725 fix html escaped string
Change-Id: I8c8f5a0b87ef77950a810ec71183a3966e264685
Reviewed-on: https://gerrit.instructure.com/2203
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-17 10:14:55 -07:00
Brian Whitmer 23404fe1c1 account-level notifications
account admins can create "Alerts" from the account
settings page that show up as sticky messages on the
user dashboards.  The alerts stay until the end_at
date, or until the user clicks the "close" link.  If
you add an alert to the site_admin account then it's
considered a global alert and will go to all root
accounts.

fixes #3738

Change-Id: I47e6eaf717145af24d847d4387e0ad5c36800094
Reviewed-on: https://gerrit.instructure.com/2293
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-16 21:34:05 -07:00
Bracken Mosbacker 840f365981 added undated assignments to assignments index page
closes #2187

Change-Id: I53d71c4c99a4889b7fb4f4736637dc166aad5e8f
Reviewed-on: https://gerrit.instructure.com/2319
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-16 15:17:17 -07:00
Brian Whitmer a862fda727 let observers message teachers if enabled
by default observers don't have messaging permission.  Now
you can give them messaging permission, but if they don't have
roster access then they can only message the teachers.  If
they are also granted roster access then they can message
anyone in the course.

refs #3315

Change-Id: Ic9d867a964d3231fedd97547dadd645a6eb85308
Reviewed-on: https://gerrit.instructure.com/2265
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-16 14:35:53 -07:00
Brian Whitmer f9f5790ff3 add 'import content' link to course settings page
Change-Id: I7663a539a0657b8f64ac90e343944cf8e5dd2884
Reviewed-on: https://gerrit.instructure.com/2211
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-02-16 14:35:30 -07:00
JT Olds 003aa6a1bf adding link to sis import docs
closes #3829

Change-Id: I68c215ef8f4ce11f22b2f156b691fa8284342e78
Reviewed-on: https://gerrit.instructure.com/2308
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-16 14:22:59 -07:00
Brian Palmer 5b4abbe76c spec fixes -- db:test:reset could fail depending on load order
Change-Id: I8b9622f5106a7834fd2925f8893d9be1207bda74
Reviewed-on: https://gerrit.instructure.com/2309
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-02-16 12:47:51 -07:00
Brian Whitmer 2f3f70b339 better flow for updating plugin settings
also added option for plugins to provide validation on
their settings page.  I need this for some of the
more complex settings we'll have to put together
as we move stuff from yml files to settings.

Change-Id: I78e6e3cd423e7ef7e15eafae86db8337f605be3a
Reviewed-on: https://gerrit.instructure.com/2247
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-16 12:30:18 -07:00
Brian Whitmer ee56f631b9 revising conferences open/closed logic
this logic didn't make sense to me, and it was obviously
broken, so I rewrote it.  These are the new assumptions
for web conferences:

- when the first participant joins a conference, we set
  started_at, start_at and end_at
- once nobody is using the conference anymore and end_at
  has passed, or it is more than 15 minutes past
  end_at, we set ended_at
- if ended_at is set and has passed, the conference is
  considered closed
- if ended_at is not set and a user tries to join an
  inactive conference, don't let them unless they're
  authorized to resume the conference
- conferences are resumable by those with permission, but
  only until the end_at date, after that it's all over

fixes #3827

Change-Id: I3f7474c314a99f0fd5a2b7f9222216d2fc3168a1
Reviewed-on: https://gerrit.instructure.com/2304
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-16 10:54:47 -07:00
JT Olds 4351cff8dd enable sis import for the default account
closes #3830

Change-Id: Ia82f02c97f2bf34ca7e944a5a6749bbc89a98f72
Reviewed-on: https://gerrit.instructure.com/2305
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-15 17:59:22 -07:00
Ryan Shaw 96b0b820eb style the "File Uploads For" iframe and handle swf's
2 things:

1. styled the file uploads for: thing so that it
is not so ugly.

2. if anything in the file list is a swf, when
they click it embed it inline with wmode: opaque
so that it doesn't appear on to of everything
(like the students dropdown in the speedGrader)

Change-Id: Ifcc1044d5256269f1f8b5549f1fb51fde088dba8
fixes: #3497 and zendesk #4562
Reviewed-on: https://gerrit.instructure.com/2192
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-15 17:04:41 -07:00
Bracken Mosbacker e1a3350d7e ensure that deleted courses also delete enrollments
closes #3833

Change-Id: I21efa68116b7a250e9b0e9c2df2dd5dfd45a736e
Reviewed-on: https://gerrit.instructure.com/2301
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-15 16:48:17 -07:00
Brian Whitmer f9d40283da question banks questions showing up without names
If there are too many questions in a bank we show
just a summary for each question instead of the full
question to help render faster.  With the OpenObject
fix it appears that we lost the names of the
questions on the teaser partial.

Change-Id: Iab0a673462dc23626bb63637d1ece90d15aa4a5e
Reviewed-on: https://gerrit.instructure.com/2289
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-15 16:46:59 -07:00
Brian Whitmer 90e8f0e5be open_object quiz fixes
- @stored_params was sometimes a hash but everything was still
expecting an open_object
- missed a place where the code now failed on nil

fixes #3804

Change-Id: I1b74dadc5956314ebbf1da0baa0dd2d41940aad7
Reviewed-on: https://gerrit.instructure.com/2283
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-15 16:46:27 -07:00
Brian Whitmer d3a7f7131b context cache not getting invalidated on module item reorder
fixes #3803

Change-Id: Ia7311bf1c00ea93b7f31f510e47edcd74bb3efd1
Reviewed-on: https://gerrit.instructure.com/2282
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-15 16:46:16 -07:00
Brian Palmer 22db8d35d9 translate youtube URLs into embedded players for modules, fixes #3811
The more general issue of sites setting X-Frame-Options still remains.
See #3834.

Change-Id: Ia659f85aa30877d1e7a7ce351d5856809a034d7d
Reviewed-on: https://gerrit.instructure.com/2300
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-15 16:17:05 -07:00
Brian Whitmer ba802b72f2 allow up to four decimal places for numeric questions
fixes #3802

Change-Id: Ibba5f72dc27e76614801aba90bac23222d468028
Reviewed-on: https://gerrit.instructure.com/2275
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-15 14:34:15 -07:00
Brian Whitmer d16e161a4e students couldn't initiate conferences, even if authorized
fixes #3797

Change-Id: I8efe888865815b4ef02e9bc30c03b7469102606e
Reviewed-on: https://gerrit.instructure.com/2271
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-02-15 14:33:54 -07:00
Bracken Mosbacker d7e99aa39b properly handle an assessment with no questions on import
Change-Id: I14b1f4075e564e7553e29486d6ad0820e49039f9
Reviewed-on: https://gerrit.instructure.com/2294
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-02-15 11:06:57 -07:00
Zach Wily 025098d64a don't call datetime_field multiple times on this field
The real fix for this is to make datetime_field idempotent, but that might be
a little trickier. This changes fixes this one specific case though.
(datetime_field was being called multiple times on the date field, which
caused it to include the date twice in the submitted value, which caused ruby
to misinterpret the pm.)

fixes #3818

Change-Id: Ifd24f202d25d7c2431409c1c7c3d285c81d7d990
Reviewed-on: https://gerrit.instructure.com/2292
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-14 07:29:10 -07:00
Brian Whitmer c493884e7c rename communication preferences to notification preferences
both names were actually being used, this will make it
consistent.

fixes #3781

Change-Id: I6ef6c791d4dca5d2934fa83fd6afaf4b5b9625a5
Reviewed-on: https://gerrit.instructure.com/2267
Reviewed-by: JT Olds <jt@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-11 23:36:21 -07:00
Brian Whitmer 96e57d560a make sure parent observers can see linked student grades
refs #3315

Change-Id: I6cd929384d7a3da4b8fc0f865508b880f6631e56
Reviewed-on: https://gerrit.instructure.com/2264
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-11 23:35:53 -07:00
Brian Whitmer 2af6f465cd quizzes now have hard deadline if due_at is set
due_at used to mean "the time after which you could no
longer start taking a quiz" but that's not really what
"due at" means.  We changed it instead to now mean what
it implies, "the time at which all quiz attempts must
be completed."

So if you start taking a 4-hour quiz one hour before
it's due, you'll only get one hour to take it.

The other part of this is fixing the timer to support
switching from counting up to counting down.  When an
assignment is untimed but due, say, two months from now,
we should count up on the timer.  When we get close to
the due date, though, this should change to a countDOWN
instead.  Right now this switch is set to happen at
12 hours from the due date, and will flash a notice
saying "12 hours left".

fixes #3727

Change-Id: I1eec558de61e2500da88f4127b7e691e7aa5c205
Reviewed-on: https://gerrit.instructure.com/2182
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-11 22:22:58 -07:00
Brian Whitmer 15f6d0e1b8 ip filtering for quizzes
Teachers can specify an IP filter for a quiz, which
means students are only allowed to take the quiz
when their current computer's IP address matches
the specified filter.  The initial request to start
taking the quiz and any subsequent requests to
backup or submit the quiz attempt must all come
from a valid IP address.

Admins can pre-define named filters
so that teachers don't have to manually enter
filters all the time.  They can instead find them
from a provided list.

Change-Id: I59b6d8ddd31409fc9bd150ed695935ad2f458f86
Reviewed-on: https://gerrit.instructure.com/2167
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-11 22:16:47 -07:00
Brian Whitmer 89f5934bae quiz moderation
- added a moderation link on the quiz page
- moderators can see current quiz results for students
- moderators can add time to a current quiz attempt
- moderators can manually unlock a quiz for a student,
  which means the student can take the quiz even if
  it's locked for everyone else
- moderators can give a student extra time for every
  subsequent attempt of a quiz
- moderators can give a student extra attempts on a quiz
- moderators can also update these settings for multiple
  students at the same time

Change-Id: I31c34097fc6e19d8c6e377a6059568e591ffbab8
Reviewed-on: https://gerrit.instructure.com/2166
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-11 22:08:42 -07:00
Zach Wily 1a20361135 fix page error when cached_attachments on a submission_comment is nil
Change-Id: I5f5febd81e27d8ee41e418cd4749094556ccd525
Reviewed-on: https://gerrit.instructure.com/2287
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-11 20:58:19 -07:00
Brian Palmer 5eba17d471 correctly show nil-scored pass/fail assignments as complete in grade summary
fixes #3784

Change-Id: If086be02e754728e76f17d8145dfcf2347b19818
Reviewed-on: https://gerrit.instructure.com/2272
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-11 16:39:27 -07:00
Bracken Mosbacker 03647b5152 require ssl for quiz import page
Change-Id: Id78204b142d0a74609cf2f75820e3eae567991c4
Reviewed-on: https://gerrit.instructure.com/2278
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-11 15:59:55 -07:00
JT Olds 461419d3a8 disable unnecessary tabs for site admin account
my justification for removing all these tabs (i could be wrong)

 * courses: the site admin account shouldn't have any
 * users: users in the site admin account are kinda useless if they aren't
          account admins, which you can configure in the settings tab
 * statistics, outcomes, rubrics, sub-accounts, faculty journal,
          terms, authentication, and sis import all make more sense in other
          account tabs

the settings and permissions tabs are needed though, though everything but
account-level permissions are disabled

closes #3702

Change-Id: I4516b62ad57600870d9139ba19837325a39665f1
Reviewed-on: https://gerrit.instructure.com/2246
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-11 13:31:27 -07:00
tom metge 28dbe009ff fix sqlite compatibility for delayed_jobs-related queries
Change-Id: I13004a50207401c4b8a990dce5cfa2ec3871a102
Reviewed-on: https://gerrit.instructure.com/2256
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-11 12:56:46 -07:00
Brian Palmer d8f9ee6174 revert an explicit permission to the proper default
In /accounts/*/role_overrides

The value was being saved correctly, but the UI was incorrect and super
confusing. It'd always show a bold "explicit" green checkmark, rather
than the semi-transparent check/cross depending on the actual default.

refs #3711

Change-Id: Ide0a0603b6c820ea0ec94646c4327239d980b09c
Reviewed-on: https://gerrit.instructure.com/2194
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-11 12:54:21 -07:00
JT Olds dc1cc82a9c test file uploads from homework submissions page
Change-Id: Ifdaf61db104cf06f9edfbdc80eca6133a258886a
Reviewed-on: https://gerrit.instructure.com/2101
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-11 10:50:20 -07:00
JT Olds a1698d6009 flash s3 uploading
Change-Id: I479dc752d707ef6b52f7efb5e4e43514c2dbe15e
Reviewed-on: https://gerrit.instructure.com/2098
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-11 10:50:07 -07:00
JT Olds cdb522a281 non-flash direct-to-s3 changes
Change-Id: I1147b249c887a2034e499e1b22d633f7813a716f
Reviewed-on: https://gerrit.instructure.com/2097
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-11 10:49:53 -07:00
JT Olds ba735d41b6 direct-to-s3 server side changes
Change-Id: Ie7b415b84f403c98d82f0e67212ae2e7b051b67d
Reviewed-on: https://gerrit.instructure.com/2096
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-11 10:49:47 -07:00
Brian Palmer e09161c808 don't push empty hashes onto the rubric rating data, fixes #3654
Change-Id: Ic2ac3d2fdc0e68786a9f372da25dc3b56b878451
Reviewed-on: https://gerrit.instructure.com/2244
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-11 08:34:17 -07:00
Bracken Mosbacker 8fee9b2e55 use ssl on the migration page
Change-Id: If9eabcc2167e6343a32625c9dcba6c2381d1e716
Reviewed-on: https://gerrit.instructure.com/2249
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Zach Wily <zach@instructure.com>
2011-02-10 14:57:58 -07:00
Brian Whitmer 893aa8af13 deleted users showing up in the groups list
...and possibly other places as well.  Seems like the
default should be to not include deleted users in
any result set.

fixes #3741

Change-Id: I87caaaa2ea69f303e20cbbd259663411b4a9ce89
Reviewed-on: https://gerrit.instructure.com/2201
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-10 13:26:44 -07:00
Zach Wily f3e702a264 fix image/file upload section in eportfolios, fixes #3756
It looks like at some point we switched from an "upload" to an "attachment"
section type, which broke this

Change-Id: I49f1a45ad5b39acd00376504962b9841264d4bd0
Reviewed-on: https://gerrit.instructure.com/2227
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-10 12:34:07 -07:00
JT Olds 4a96bd6b9e this is going into the database, and it probably shouldn't
Change-Id: I490f31aa3d44189712c3992437740c6003416c6d
Reviewed-on: https://gerrit.instructure.com/2214
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-10 12:26:31 -07:00
Brian Palmer 520fb21130 remove legacy stream item support, closes #3647
Change-Id: I9c6d5d02726eb523672c413a81112b17d82fc62c
Reviewed-on: https://gerrit.instructure.com/2229
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-10 09:52:45 -07:00
Brian Palmer e988de9906 remove old stream items with a periodic job, refs #3647
Change-Id: I4d66747016f5ce13d02ea413e362153633f0362a
Reviewed-on: https://gerrit.instructure.com/2228
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-10 09:52:38 -07:00
Brian Palmer 87b37e72d4 flush the role_override cache on each request, fixes #3711
Once we're storing these permissions caches in a shared memcache
cluster, we can flush them only when they've actually been invalidated.
But until then, we have to flush on each request, in case a role
override was changed on a different app server.

Change-Id: I4479605b96a4fcf36a686033939be4a158aa9699
Reviewed-on: https://gerrit.instructure.com/2224
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-10 09:52:24 -07:00
Bracken Mosbacker 2a38ddd91d fix qti plugin reload errors in development mode
Change-Id: Ia76b870d84e766dfa79992cfb854dc6383115abb
Reviewed-on: https://gerrit.instructure.com/2234
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-02-09 18:43:03 -07:00
Brian Whitmer 065134fe9b saw some errors in error_stack... didn't know these lines could raise errors
Change-Id: I6c6b49cb72168a743a6b8e95091479bed7b6254f
Reviewed-on: https://gerrit.instructure.com/2223
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-09 17:26:33 -07:00
Brian Whitmer 48723be3ea facebook plugin generating invalid urls
the default url for facebook authorization calls wasn't getting the
"http://" part sometimes, which is obviously a problem.

Change-Id: Iabc51056f81d8c427ffcbad8f20d215cfd724025
Reviewed-on: https://gerrit.instructure.com/2222
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-02-09 17:00:27 -07:00
Zach Wily fc710970c2 fix accounts not getting their root account set properly
When the "Manually Created Courses" account was getting created, it wasn't
getting its root_account set properly. In fact, it looks like only
sub-accounts 2-levels deep were getting it set correctly all the time. This
was causing courses in those accounts to have the wrong root account, making
it so admins couldn't access them.

fixes #3749

Change-Id: I3eead0fd66e3127bfc713f991d26f6d304b0e782
Reviewed-on: https://gerrit.instructure.com/2217
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-09 07:24:56 -07:00
Bracken Mosbacker f70fb147c2 use the quiz question value from the assessment if present
closes #3746

Change-Id: Id391ba65749860fede1e4fc16b0a8969f497eedd
Reviewed-on: https://gerrit.instructure.com/2215
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-02-08 15:58:39 -07:00
Brian Whitmer bab11f5bbf module headings weren't getting copied on course copy
fixes #3588

Change-Id: I1873451425ddba8615d86cdbd80faab3f7c45fe5
Reviewed-on: https://gerrit.instructure.com/2210
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-08 15:12:35 -07:00
Bracken Mosbacker fe77c3e0c8 on import don't overwrite wiki front page if it exists
closes #3736

Change-Id: Ie59c96caceb73981763b815ea9e91d17e0a3542a
Reviewed-on: https://gerrit.instructure.com/2185
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-08 14:31:32 -07:00
Brian Palmer 39cca91ab4 update delayed_jobs and list most popular job types in UI
closes #3740

Change-Id: I08085fac1f4dba5aaadf61d2d55269a7085d8094
Reviewed-on: https://gerrit.instructure.com/2197
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-08 14:12:52 -07:00
Ryan Shaw 7cf02d37ea add vertical-gradiant sass mixin, works in ie7
Change-Id: I86e685a30b7a01379b26daae0ebda0c2f4eb4d8d
Reviewed-on: https://gerrit.instructure.com/2191
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-08 13:41:18 -07:00
Ryan Shaw b537ccc4dc add utility css class to center blocks horizontally
Change-Id: I6599617e9a223fa5ff4ac7319bfa5138f1a60361
Reviewed-on: https://gerrit.instructure.com/2190
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-08 13:41:05 -07:00
Bracken Mosbacker 8efe72a0d7 cleaner external urls when importing
This also prevents blank wiki pages from being created
when there are unsupported import types

closes #3739

Change-Id: I6c1aa7f34de07db83d6c45d134c5e967dc7506d9
Reviewed-on: https://gerrit.instructure.com/2195
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-02-08 13:31:34 -07:00
Brian Whitmer 6ee9726e56 assignment grading fixes
- if you change the points possible for an assignment, the
  'grade' column for submissions is no longer accurate.
  This fix makes sure the grade column stays up to date (but
  does not update any old versions of the submission)
- if you have a letter grade assignment, we should accept
  lowercase versions of the grade if there's not an exact
  match.

Change-Id: I6277c9a216e23bd068fc0381cac1da2e9d718d1a
Reviewed-on: https://gerrit.instructure.com/2193
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-08 12:59:57 -07:00
Brian Palmer ad438b6234 add the default enrollment term on root acct creation
fixes #3730

Change-Id: I912f1381eeb0e8eba0ac4869f37e655e3f25b4bb
Reviewed-on: https://gerrit.instructure.com/2186
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-08 12:47:42 -07:00
Brian Whitmer 0f08e32df2 rss 1.0 != rss 2.0
looks like guid and date are not defined on rss 1.0 feeds

fixes #3720

Change-Id: I361e0d3dae44f3085e135a9ddf6bbb52b18f1bae
Reviewed-on: https://gerrit.instructure.com/2173
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-02-08 12:43:01 -07:00
Brian Whitmer c54670da94 update cached turnitin data when redirecting to originality report
Turnitin has no way to register callbacks when a submission's
originality score changes.  However, teachers are able to
modify originality scores for submissions by marking certain
sources as being ignored when checking for originality.  If a
teacher does this then the data we've cached will get out of
date.

We don't really want to have to regularly poll for updated
info, so this will just schedule a background job to check
for updates whenever someone goes to view the full
originality report.  There will still be plenty of time
when the data it out of sync, but it at least gives a
way in the UI to update the data.

Change-Id: Ia8cc814a2e9cf5ec140d3fd22acedfbb00da1b8a
Reviewed-on: https://gerrit.instructure.com/2163
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-08 12:42:51 -07:00
Ryan Shaw a5eeb2b784 add flash (swf) mime-type
Change-Id: Ie643288ebd54961193b1b721f8c8ce7f4d7ff63e
Reviewed-on: https://gerrit.instructure.com/2189
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-08 09:29:23 -07:00
Bracken Mosbacker 11f5e44e49 allow migrations to work across job servers
migrations were previously limited to being on the same
job server, now the exported data is uploaded back to
canvas and downloaded again for the importing step

closes #3519

Change-Id: I24deaf4bc1811c4b66b1a2cf79f311ffc1fa9906
Reviewed-on: https://gerrit.instructure.com/2178
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-07 15:07:49 -07:00
Brian Whitmer 00124e9566 publish multiple quizzes at the same time
When we import quizzes from another system we leave
them all unpublished so the teacher can review
the import results before publishing.  This adds
a "Publish Multiple Quizzes" button that will,
well, publish multiple quizzes -- at the same time.

fixes #3636

Change-Id: I9b762da0e938a0b2e1986e3bdb9a216dd5bc7142
Reviewed-on: https://gerrit.instructure.com/2175
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-07 15:00:36 -07:00
Bracken Mosbacker c917bc8c1b fixed copying replies for discussion topics
closes #3733

Change-Id: I1e6a5082c5edbbbb90a01ea8ff56f36e774bd58f
Reviewed-on: https://gerrit.instructure.com/2181
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-07 14:47:58 -07:00
Bracken Mosbacker a44c9acb27 external migration data will be deleted once imported
refs #3519

Change-Id: I2ecd672365f696f3467414d429a15151b181fc50
Reviewed-on: https://gerrit.instructure.com/2177
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-07 14:42:50 -07:00
Bracken Mosbacker 157750bf3f fixed a couple course dropdown encoding problems
Change-Id: I159320adaeaa2a0fce7192191905e4100ca3b636
Reviewed-on: https://gerrit.instructure.com/2180
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-07 14:25:22 -07:00
Brian Palmer d8e0e10a13 retain the grade if another submission API PUT is made without one
fixes #3718

Change-Id: I04868f68defcccf11cc51a40ca65047a2e38d935
Reviewed-on: https://gerrit.instructure.com/2169
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-04 15:54:18 -07:00
Brian Palmer 663ed5bf86 don't return deleted assignments in the assignment group API
fixes #3709

Change-Id: Ie684cc868454215941363959e0bfac9be4d90860
Reviewed-on: https://gerrit.instructure.com/2161
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-04 13:56:13 -07:00
Brian Whitmer d3092fd878 turnitin fixes
- javascript syntax error
- fix turnitin link on grade_summary page
- added url for student turnitin report view
- ruby syntax error in submission partial

Change-Id: I9d47159bbe68b003b546040c686f02c56e0dafd2
Reviewed-on: https://gerrit.instructure.com/2156
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-04 09:45:58 -07:00
Brian Whitmer 50975465af turnitin tweaks
- use real emails for students in turnitin when available
  (requested by iParadigms)
- add note to assignment details page to say it's a
  turnitin assignment
- add turnitin score icons to student grades page
- better logging if any errors happen during API calls

Change-Id: I0e1096583f600439245d975a178c7638d6c40fa3
Reviewed-on: https://gerrit.instructure.com/2137
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-03 15:42:39 -07:00
Brian Palmer 99a6260b09 change zip generation priority and fix repeated requests
The zip filename was wrong, so we weren't finding the previous entry,
and the javascript was asking for a compile each time.

Change-Id: Idd6bae2add07ec67c6f1f62cfe103dd036e57e8a
Reviewed-on: https://gerrit.instructure.com/2149
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-03 14:13:02 -07:00
Brian Whitmer 426e08fe12 add equella settings to the account UI
It was configurable on the console before, but this adds it
to the account settings page as well.  Sub-accounts are
able to set their own equella settings.

Change-Id: I76d909dcf9d581760c815a369793d86264148a1c
Reviewed-on: https://gerrit.instructure.com/2132
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-03 13:56:39 -07:00
Brian Palmer 4f38867a4b only infer the due at on assignment/quiz creation, fixes #3698
Change-Id: Id0336ba184dc80dca7c3a41aef62ffb0d66cdc75
Reviewed-on: https://gerrit.instructure.com/2143
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-03 13:15:15 -07:00
Ryan Shaw 8a57e6891b only require name and email for new teacher reg
more can be handled in a plugin.

Change-Id: Ie8525625f8846c2312d15fab352850a6901744b6
Reviewed-on: https://gerrit.instructure.com/2142
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-03 13:11:03 -07:00
Zach Wily af5511b953 remove unused accessors
Change-Id: Id69b4e47453a11f227ae116427d7bc89edb6628c
Reviewed-on: https://gerrit.instructure.com/2115
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-03 10:40:07 -07:00
Zach Wily 9356c9dd0e always trigger the new_teacher notifications for plugins
Previously we were only sending it if registration approval was required. Now
we send it no matter what.

Change-Id: I64aed1b7132555ffa73fd94194a1c4afe9dd63c9
Reviewed-on: https://gerrit.instructure.com/2103
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-03 10:38:58 -07:00
Ryan Shaw c0a4463176 More simple footer links
Change-Id: I33908099d5b532e7932b63cfb375ff9f3ce75804
Reviewed-on: https://gerrit.instructure.com/2141
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-02-03 10:24:15 -07:00
Brian Whitmer a044d4d9b2 don't hide course setup checklist
We used to hide it by default in any setting where we knew the
wizard would pop up.  But because we're storing a setting in
localStorage now we can't be sure it shouldn't be there.

Change-Id: I8bba90001a300e76d467c99f25747cf246fe3933
Reviewed-on: https://gerrit.instructure.com/2136
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-03 08:42:22 -07:00
Brian Whitmer 77702d6327 start logging asset accesses again
This was accidentally removed.

fixes #3691

Change-Id: I3c10e9de5555a4d93e851d757e6f39fb95b8dbf1
Reviewed-on: https://gerrit.instructure.com/2133
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-02 15:22:26 -07:00
Zach Wily 4d2f128779 update link to getting started youtube video
Next we will be extracting all this Instructure-specific stuff into a plugin
so this page is generic for Canvas CV.

Change-Id: I46200fb27a9c434d3b1983674043f6413b23a041
Reviewed-on: https://gerrit.instructure.com/2128
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-02-02 11:19:23 -07:00
Bracken Mosbacker 2c715be51f Fixed the account authorization config disappearing
This was cause by the new default escaping behaviour

Change-Id: I5a6dc181dee5b8eaa2d94545f15c3f2a9903f059
Reviewed-on: https://gerrit.instructure.com/2126
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-02 10:59:30 -07:00
Brian Whitmer 496cc7306b eportfolio content being accessed with strings instead of hashes
When we sanitize eportfolio content we set the keys to be
symbols instead of strings.  Since we just recently started
sanitizing we're actually going to have some symbol
keys and some string keys, so I've added a
.with_indifferent_access call.

fixes #3198

Change-Id: I928a5ea575158aa871e13733637bb1cc98108c75
Reviewed-on: https://gerrit.instructure.com/2118
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Zach Wily <zach@instructure.com>
2011-02-01 22:31:50 -07:00
JT Olds f0b9d21cfd fixing broadcast mailboxes and corresponding tests
Change-Id: Ic0c064379198b6eeb985c6771d03c8fdbebcf746
Reviewed-on: https://gerrit.instructure.com/2117
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: JT Olds <jt@instructure.com>
2011-02-01 17:36:33 -07:00
Brian Whitmer b2c595575e this link wasn't accessible
Change-Id: Ic9f65387458effa80dbcdaf42becf8ed8c015cca
Reviewed-on: https://gerrit.instructure.com/2092
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Brian Whitmer <brian@instructure.com>
2011-02-01 15:41:05 -07:00
JT Olds e04faaf1c9 get phone home call info for quick starts
Change-Id: I4aff73355b6ef35ee7be15930b04bd85805987b0
Reviewed-on: https://gerrit.instructure.com/2110
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
Tested-by: JT Olds <jt@instructure.com>
2011-02-01 14:44:27 -07:00
Brian Whitmer 8b8173dcc9 Initial commit.
closes #6988138
2011-01-31 18:57:29 -07:00