Commit Graph

26579 Commits

Author SHA1 Message Date
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
Zach Wily b9f8fc8dfb fix escaping in gradebook (Hide All on group), refs #3888
Change-Id: I74323aa57875b1da1838715874af56e8b850b7f0
Reviewed-on: https://gerrit.instructure.com/2414
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-23 16:22:27 -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 bec0621928 escape student names in speed grader drop-down, fixes #3890
Change-Id: I9ac4ade75db819c8e32dddc67c3aa8d8b4e58536
Reviewed-on: https://gerrit.instructure.com/2415
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-23 15:26:01 -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 98bf5f0674 fix escaping submission comments in speedgrader, refs #3888
Change-Id: I5866a1029bee2f44d3a7caf5700944b729a6a417
Reviewed-on: https://gerrit.instructure.com/2411
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-23 14:09:05 -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 39db2a2199 html escape assignment titles in gradebook importer, refs #3888
Change-Id: Ia13827f3ef8c28c18c74b57093a5ed219e67a88e
Reviewed-on: https://gerrit.instructure.com/2408
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-23 14:05:48 -07:00
Brian Palmer 8868162722 set HostUrl email config options on each request in dev mode
refs #3880

Change-Id: If5647283b2018c457ac77fb61320eb384423806e
Reviewed-on: https://gerrit.instructure.com/2410
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-23 14:02:43 -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 Palmer fc4a866af8 continue to raise on serializing an unsaved model to a delayed job
This capability got lost in the move to native YAML serialization.

refs #1

Change-Id: Id7ea4d635f74732d793c53f0fd34304730ade978
Reviewed-on: https://gerrit.instructure.com/2402
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-23 08:32:37 -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
Brian Palmer b86fb7fd83 YAML dump Class and ActiveRecord::Base objects natively, refs #1
This fixes a long-standing issue with not being able to properly
serialize AR objects that are in arrays or other data structures. Now
that we're using native YAML methods for doing the serialization, rather
than dumping specially-formatted "LOAD;N" strings, it works properly.

I've left the load_for_delayed_job stuff in for now, for backwards
compatibility with jobs already in the queue.

Change-Id: I109f364b91c4becc8fc17ea1d9f041eb3c18281f
Reviewed-on: https://gerrit.instructure.com/2389
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-22 16:23:40 -07:00
Bracken Mosbacker 2f9e0088fc don't create stream items for deleted objects
There was a race condition where the delayed job
for creating stream items hadn't run yet and an
object (like an announcement) was deleted, this
would create a stream item pointing to a deleted
object

closes #3699

Change-Id: I59cd5ac80b752e689098bbecb74243b6913de1a4
Reviewed-on: https://gerrit.instructure.com/2379
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-22 13:06:12 -07:00
Zach Wily 6b4c68c81f upgrade to latest rails_xss, fixes #3875
There was a bug where data passed to content_for via a string and not a block
was being marked as "html safe" when it hadn't been escaped.

Change-Id: I679281d1a767841b8f4d90ebbb8f8ca61a2a07f4
Reviewed-on: https://gerrit.instructure.com/2374
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-22 10:53:54 -07:00
Brian Palmer 250d846d66 more selenium config options, and run the web server in-process
Change-Id: I08b31b89951ebc9328836ee75c4a943ab8d4010d
Reviewed-on: https://gerrit.instructure.com/2358
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-02-22 10:37:29 -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 bf99eea7e3 clean up sequence footer js
while I was tyring to find the cause of a zendesk
ticket I had to grock this, while I was at it I DRY'ed
it up a little.

Change-Id: Ib95a55031625dfaa635f8b3ca2a4d6c1b6224283
Reviewed-on: https://gerrit.instructure.com/2364
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-22 10:13:59 -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
Zach Wily 558e85ac96 be sure to escape all chars that need html escaping in fillTemplateData
fixes #3872

Change-Id: I9e02184a798b78f090b6cc41a3dd4f21f5f7b665
Reviewed-on: https://gerrit.instructure.com/2373
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-22 09:33:21 -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 Palmer 7bafbd0dab raise on serializing an unsaved model object to a delayed job, refs #1
Right now we serialize the AR object without an id, and fail later when
trying to perform the job, since we can't find the object without an id.
This change will make it a lot easier to track down these kinds of errors.

Change-Id: I89d7fb45182f6624bd7fee9b01c1294112a0ba8b
Reviewed-on: https://gerrit.instructure.com/2354
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-21 08:45:40 -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
Ryan Shaw 24f7cd2ca1 fix bugs with showing 1 section in speedGrader
fixes: #3853

Change-Id: I0ea031fd331d9cf206af273c7aaccd7dc26ecee9
Reviewed-on: https://gerrit.instructure.com/2348
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Mark Suman <marks@instructure.com>
2011-02-18 15:03:46 -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
Bracken Mosbacker e288d16e7f ensure the correct submission is show in the left frame
closes #3789

Change-Id: Ie10646ad7bcced77e83e9ea33e399395aae7d265
Reviewed-on: https://gerrit.instructure.com/2347
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-18 13:07:28 -07:00
Brian Whitmer e462888999 editing files in chrome on the files page
Chrome on a Mac doesn't support sendAsBinary, so this
code was failing.

fixes #3788

Change-Id: Id3475adf38a7a0df9e4aaa1cb17165bfe52a91e1
Reviewed-on: https://gerrit.instructure.com/2323
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-02-18 12:10:28 -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