Commit Graph

360 Commits

Author SHA1 Message Date
Jon Jensen d6e5502ac2 fix html escaping issues in the gradebook and elsewhere, fixes gh issues #18 and #21
Change-Id: Ie803a8b8b435e58f7062b616836f811549c84822
Reviewed-on: https://gerrit.instructure.com/3903
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-27 12:42:25 -06:00
Jon Jensen d209434b0a make jquery.ui.dialog escape titles by default, fixes gh issues #19 and #20
Change-Id: I11f4193510f0332b42540c315ec8fae028d58eb8
Reviewed-on: https://gerrit.instructure.com/3873
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-26 09:57:51 -06:00
Jon Jensen 00f4fe6e92 updated mathquill, fixed cursor reset bug. closes #4486
Change-Id: I8f39cb77e0c27a182937e96942250e9931fa6faf
Reviewed-on: https://gerrit.instructure.com/3844
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-05-26 09:57:19 -06:00
Brian Whitmer 7d04f28592 cancel link takes two clicks for new quiz questions
When cancelling out of creating a new quiz question,
it previously took two clicks to hide the form.

Change-Id: I0ff5ecc3b23ff5c2d716c5143d751bdb3070502a
Reviewed-on: https://gerrit.instructure.com/3820
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-05-25 20:58:08 -06:00
Cody Cutrer 326f249679 allow reports to have parameters. refs #4315
Change-Id: I03e6a846f3d2dea38e662e4c784d218ed63499db
Reviewed-on: https://gerrit.instructure.com/3858
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-25 19:39:12 -06:00
Bracken Mosbacker 45d6fd5153 fix non-file upload content imports
refs #4356

Change-Id: I24b07943dd140970e3bd9eef44e2689b65dfc808
Reviewed-on: https://gerrit.instructure.com/3855
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-05-25 12:55:10 -06:00
Brian Whitmer de4007dddb don't show missing word question type
The option will still appear for existing quiz questions
that are set to that type, but no other questions will
be able to be created or changed to be "Missing Word"
questions anymore.

fixes #4091

Change-Id: Idc327fcce798f5d7f74583d7703954556edcf87d
Reviewed-on: https://gerrit.instructure.com/3819
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-05-24 10:20:27 -06:00
Cody Cutrer 55b17fb50a dropdown for quickly moving a student to a different section
fixes #4101

Change-Id: I56cfef5a7227da3b1aedf8eb7b7918b3e3ec4a78
Reviewed-on: https://gerrit.instructure.com/3802
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-23 16:33:27 -06:00
Brian Palmer 0af3ad5ebd add sis batch mode to sis import ui, refs #4397
Change-Id: I6ec00a0eb7919119d6143bbac011eba4098d250b
Reviewed-on: https://gerrit.instructure.com/3779
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-23 15:57:30 -06:00
Jon Jensen 88331658fd direct-to-s3 quiz and course content imports, fixes #4356
Change-Id: I9b507b92af2ebc6e169f2e3e34f89fa71ac0bb1c
Reviewed-on: https://gerrit.instructure.com/3258
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-05-23 08:44:43 -06:00
Ryan Shaw 1ae02291f0 fix tiny resizer
(also added a selenium test for loading the file
tree tab async)

Change-Id: Ia39172e349b9cb977fb43c051e598b35dd62c155
Reviewed-on: https://gerrit.instructure.com/3023
Tested-by: Selenium <selenium@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-23 08:16:42 -06:00
Ryan Shaw 99344bc5c5 dont resize elastic textarea on every keyup in IE. fixes: #3991
Change-Id: I61dd44376f88045a2af0b552c6a76e9047d9d424
Reviewed-on: https://gerrit.instructure.com/2672
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-23 08:14:01 -06:00
Brian Whitmer 70e984bff6 grading standards improvements
- can attach a grading standard to a course
- interface for managing standards at the course
  and account level
- added final grade to gradebook page
- added final grade to student grades page
- added final grade to gradebook csv export

fixes #3868

Change-Id: I555b9f66b621d8967e893e50a671748267da9373
Reviewed-on: https://gerrit.instructure.com/3025
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-21 19:20:34 -06:00
Jon Jensen 019a9aaa6e fixed an equation editor bug
there was an issue where if you inserted equations into multiple
textareas on a page (e.g. two or more quiz questions), it would
usually only save the first one correctly (it depended on where
the caret was when the first one was inserted)

Change-Id: I8973dbe3a2f9f043a1616a9d24b5f15f757a2fdc
Reviewed-on: https://gerrit.instructure.com/3770
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-20 22:09:29 -06:00
Brian Palmer d87c33d91d modify user_content strategy, fixes #3676
user_content will now work for any arbitrary RTE field, no matter if it
came from a column, a string nested three levels deep in a serialized
column, whatever.

let's call this technique "controlled XSS injection"

Change-Id: I56eed1f9b546ac7849dc60faa0f2b3801231131e
Reviewed-on: https://gerrit.instructure.com/3704
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-19 15:46:56 -06:00
Cody Cutrer 84e520cfc6 fix "message students who". fixes #4596
Change-Id: Ifb267731944873244bd5adb8958a0df614f5b546
Reviewed-on: https://gerrit.instructure.com/3713
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-19 13:25:51 -06:00
Brian Palmer 935ab6f4ac Merge "Merge branch 'delayed_jobs'" 2011-05-19 13:17:18 -06:00
JT Olds 8da5e4e23c don't display 'out of' when we don't need to. fixes #4580
Change-Id: I13b7c835675890f6b84bdacc1f3fe946622abc7e
Reviewed-on: https://gerrit.instructure.com/3683
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-05-19 13:04:01 -06:00
Brian Palmer 68a1e6d29f Merge branch 'delayed_jobs'
Change-Id: I7a9f1eae3d6177e61e53a48ea5818203f82067bf
2011-05-19 13:02:58 -06:00
Brian Palmer da2c6b922e improved periodic jobs support, refs #4226
periodic jobs are no longer run as a separate worker process, and will
be processed by all job nodes. now there's no longer a concept of a
"master" job node, all job nodes are equivalent.

Change-Id: I7110872c7895453adfea5401d15db504dd73a850
Reviewed-on: https://gerrit.instructure.com/3686
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-19 10:51:12 -06:00
Brian Palmer 26032f2046 new jobs admin area
and some work on delayed_jobs refactoring

refs #4226

Change-Id: I21a91a44368e77aef4a75e0d30cefe252a901691
Reviewed-on: https://gerrit.instructure.com/3640
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-19 10:49:37 -06:00
Ryan Shaw b27b03556e scale equella iframe to fill modal window
Change-Id: I3824387dcb85332928f6e88da79137b4cdad81af
fixes: #4186
Reviewed-on: https://gerrit.instructure.com/3579
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-05-19 10:28:08 -06:00
Zach Wily a09cba4f63 remove duplicate css rule that confuses IE
Change-Id: I7d064a5e4d4f0551ddc5f5b10ec2830e458cf0cf
Reviewed-on: https://gerrit.instructure.com/3690
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-18 08:53:42 -06:00
Brian Palmer 8d76be0b8c hiding stream items on the dashboard, closes #4387
This is permanent, if a stream item is updated it doesn't re-appear on
the dashboard. This is done by marking the stream item instance as
hidden, which means adding the hidden field to the two indexes.

Change-Id: Ifa544cef4ea2d46f4214e8317af4c9e3baed76eb
Reviewed-on: https://gerrit.instructure.com/3603
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-17 07:57:01 -06:00
Zach Wily 0709430f8a fix the tinymce button layout problem on wiki pages
Change-Id: I8fec6409abf0747eb63f66a1a4428fe8fd6cb43e
Reviewed-on: https://gerrit.instructure.com/3679
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-16 20:54:40 -06:00
Ryan Shaw 79c9d21c17 get rid of a useless image
Change-Id: Ia4cb03c86a1ee8dba6e72ea68d912b273a14964b
Reviewed-on: https://gerrit.instructure.com/3573
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-05-16 09:13:03 -06:00
Brian Whitmer cc81de2d43 better support for disabling plugins
There wasn't a good way in the interface to
disable a plugin other than the manually go through
and empty out all the text fields.

refs #4194

Change-Id: Ia095160323c907a43fb98f4f3fe85f1babf7eebc
Reviewed-on: https://gerrit.instructure.com/3544
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-05-14 23:52:04 -06:00
Zach Wily 751223feea load google jsapi with protocol relative url; fixes #4536
Change-Id: I50de8d8cdd8f66a7d9fb7b3f8e7305b40fefd215
Reviewed-on: https://gerrit.instructure.com/3655
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-05-13 22:19:42 -06:00
Ryan Shaw f624d59e0a fix inline files shown too high, make prettier
this also refactors out the functionality of
filling the viewport with an element (but leaving
room for anything above or below that element).

also, I styled the Iframe container so it looks a
little better.

Change-Id: I608f745d01f09d6091a3f8ee04f43314c25feaf8
fixes: #4078
Reviewed-on: https://gerrit.instructure.com/2737
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-11 15:18:25 -06:00
Brian Palmer eeea2a97f0 tweaks to javascript error logging, refs #4487
Change-Id: I065a9c637456d3bffef083c16ca4a0d1be75ec8d
Reviewed-on: https://gerrit.instructure.com/3600
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-11 14:47:23 -06:00
Brian Palmer b657f4e959 generate an error report for all errors, not just some of them
refs #4487

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

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

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

Change-Id: I59f7a0d44cf4b6215ad13ff92d30e1d1af607b74
Reviewed-on: https://gerrit.instructure.com/3577
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-11 10:36:56 -06:00
Brian Palmer 123b23c73e ignore js errors from javascripts in other domains, refs #4487
Change-Id: I7b18977d1434daa001b7b56a235a7bec884c5ccc
Reviewed-on: https://gerrit.instructure.com/3576
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-11 10:20:01 -06:00
Brian Palmer 4465b1fc7b create error report locally on javascript errors, refs #4487
Change-Id: I2cb09c7f7d9a5ffe9d5286da36da9ddbc999ed86
Reviewed-on: https://gerrit.instructure.com/3575
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-11 08:47:49 -06:00
Brian Whitmer cfaa71f36d missing student_message_icon.png
Change-Id: I5c9754ba760ef123b6f1c832047b0c442800431f
Reviewed-on: https://gerrit.instructure.com/3587
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Zach Wily <zach@instructure.com>
2011-05-10 21:48:31 -06:00
Brian Whitmer f7bfe2e24c fix facebook_success.html hash parsing
Change-Id: Id6ab4fd938bd9bad37059d664924e812d896e0dd
Reviewed-on: https://gerrit.instructure.com/3586
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-10 21:20:09 -06:00
Brian Whitmer 8dca8a0d19 update facebook integration to oauth 2
This should allow open source installs to now set up
their own Facebook apps if desired.  The facebooker
gem is no longer required and configuration now
happens in a plugin instead of a yml file.

fixes #4509

Change-Id: Iec76dc8c31f0ad0276e992319f368826baa4ccc5
Reviewed-on: https://gerrit.instructure.com/3545
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-10 16:18:23 -06:00
Brian Whitmer 88ab4e28b6 "full details" link not working for newly created events
refs #4292

Change-Id: I129fd98b74f7808e64610a6a5ab49c76f67182f8
Reviewed-on: https://gerrit.instructure.com/3476
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-09 15:53:38 -06:00
Zach Wily 67749626c7 audio/video recorders in one swf file
We've made modifications to Kaltura's swf recorder that will
allow it to record either just audio or audio and video, with
both options now available from the same swf file.  I've also
made some additional tweaks to the UI to help clean things up
in this interface.

Also included a fix for enabling storing to Kaltura over SSL.

Change-Id: Ia30b407ea1f0b049f7553d11195fceee75f23e7a
Reviewed-on: https://gerrit.instructure.com/3404
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-08 10:30:27 -06:00
Zach Wily 5a895d66c6 Merge branch 'dev/ssl'
Conflicts:
	app/controllers/files_controller.rb
	app/controllers/users_controller.rb
	app/views/files/show.html.erb
	config/environments/development.rb
	lib/kaltura/kaltura_client_v3.rb
	public/javascripts/full_files.js
	public/javascripts/instructure.js
	public/javascripts/media_comments.js
	public/javascripts/speed_grader.js
	public/javascripts/tool_inline.js
	vendor/plugins/ssl_requirement/lib/ssl_requirement.rb

Change-Id: I987cc015d43cffd4b6738030d893a27de7c434ba
2011-05-07 08:03:22 -06:00
JT Olds 9ab40ec477 course start and end dates. refs #4398
Change-Id: I1fe062fe1b54a8e387822e636e3c7ed3ece49c9c
Reviewed-on: https://gerrit.instructure.com/3494
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-06 09:37:33 -06:00
Jon Jensen 488ada2bb0 initially blank the form on new messages and replies, fixes #7043
note that we still call fillFormData for replies. this just ensures we
don't bring along the previous body, attachments, recipients, etc.

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

Change-Id: I164d9cb7c3706b6afef810c9f054b3b367d9974b
Reviewed-on: https://gerrit.instructure.com/3463
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-05-04 12:43:21 -06:00
Jon Jensen 8b78ba02d5 let students see outcome details, closes #4469
Change-Id: Ic1ae04eaabaf1077086c22a153da2bf31c395c35
Reviewed-on: https://gerrit.instructure.com/3472
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-05-04 11:02:36 -06:00
JT Olds 337dbd5110 disable ui button by setting its function to nil
Change-Id: I93f46bfaabd62164d2a114a59400ae3d6776418e
Reviewed-on: https://gerrit.instructure.com/3329
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-05-03 17:25:43 -06:00
Brian Palmer 6260f57d61 set kaltura default max file size to 500mb
Change-Id: I15e632b386db3354a09f41480f8f196d81fd9d2f
Reviewed-on: https://gerrit.instructure.com/3466
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-05-03 16:25:34 -06:00
Brian Palmer f2df61ab59 fix file sidebar loading in firefox, fixes #4467
turns out that in firefox, setTimeout(someFn) will pass a "lateness"
number value as the first parameter to someFn
http://benalman.com/news/2009/07/the-mysterious-firefox-settime/

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

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

Change-Id: I739a227999268d4bccd804e70ed6075ed32665d0
Reviewed-on: https://gerrit.instructure.com/3457
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-05-03 15:28:47 -06:00
Zach Wily 8178f69165 revert "disable autopreview; switch to open source video widget"
We're keeping the rtmphost though. Turns out that you just need red5 0.7.0 for
this to work. (Newer versions are broken).

This reverts commit f58bfcd4d4.

Change-Id: I002c0e8633b91fce8539b3b5d5156419f8a3eff4
Reviewed-on: https://gerrit.instructure.com/3405
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-30 23:30:00 -06:00
Brian Whitmer 404de4d0e9 use .delegate instead of .bind for header link hovers
This will make it easier for anyone who wants to add more
menu items to the list on their own to also support hovers.

Change-Id: Ia6fdb551b32d5f65c92e71f1dd38750182e7d7d2
Reviewed-on: https://gerrit.instructure.com/3253
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-29 18:06:54 -06:00
Zach Wily f58bfcd4d4 kaltura: specify rtmp url; disable autopreview; switch to open source video widget
Previewing seems to be broken against open source kaltura installations, so
it's being made not-automatic until we can fix it. This required switching to
the open source widget, since the one we were using didn't honor the
autopreview flag.

Change-Id: I12a248c1f467ddc5cf5ce2b29e7008109e0fa1ba
Reviewed-on: https://gerrit.instructure.com/3365
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-29 10:18:20 -06:00
Brian Palmer 2515dbca3b fix in-line file editing in the file browser
The big AJAX refactor in jquery 1.5 removed this httpSuccess helper

Change-Id: I376ed167911caa507f8155b6899438348af96e25
Reviewed-on: https://gerrit.instructure.com/3338
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-29 07:59:43 -06:00
Cody Cutrer 93d36519e9 fix for grade publishing ui
* Don't show if it's not enabled
 * Don't show error if it's never been published before

Change-Id: Ia4d04c0a59cbef26b9f3327bcbdae33ae7d33af5
Reviewed-on: https://gerrit.instructure.com/3349
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-28 14:55:28 -06:00
Cody Cutrer a443d3cf4b allow a description or description partial for account reports
Also set up styles and auto-hide-and-link for a table of example output.

refs #3903

Change-Id: I6071b3eb3fc3d7d762041b1a6e0c67914d5a7eb4
Reviewed-on: https://gerrit.instructure.com/3030
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-04-28 13:12:42 -06:00
Brian Palmer b918e7eebb Revert "disable ui button by setting its function to nil"
This reverts commit bb30d35190.

Change-Id: Iaa2a7394e3a4e4e491363e8429e84acd61ebd23d
Reviewed-on: https://gerrit.instructure.com/3327
Tested-by: Selenium <selenium@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-28 08:33:46 -06:00
JT Olds bb30d35190 disable ui button by setting its function to nil
Change-Id: I162974063a483babc2520e61f78131d2c6e02ce4
Reviewed-on: https://gerrit.instructure.com/3316
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-04-27 16:45:56 -06:00
Cody Cutrer 61ebf0e808 sis grade publishing ui
Change-Id: If6c05e2aadfd40c25937651e36f51acf5e99e184
Reviewed-on: https://gerrit.instructure.com/2937
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-04-27 16:37:15 -06:00
Brian Whitmer 3beb896b50 interface for manual crosslisting
Sections can be manually cross-listed into another
course.  Teachers/admins can use the search tool to
find a course, or manually enter it's id/sis_id
to select it as a destination.  Cross-listed sections
and also be manually un-cross-listed.

fixes #3759

Change-Id: I65ac76c80e7cf2703ba3c5d4c63801b6b7a348a1
Reviewed-on: https://gerrit.instructure.com/3173
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-25 16:25:05 -06:00
Zach Wily 39b28dc81a check for files that are too big in kaltura uploader
Also bumped up the limit to 100MB, and started making it configurable via the
plugin.

Change-Id: Iee000afa2d6b68b48357931dfcd72ab3fde9ddf7
Reviewed-on: https://gerrit.instructure.com/3235
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-24 20:09:02 -06:00
Zach Wily 3f4d3427eb fix the progress bar on the kaltura upload widget
Change-Id: I0b319e9989a30fffbce421d298484b8997c58c8e
Reviewed-on: https://gerrit.instructure.com/3234
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-24 20:07:57 -06:00
JT Olds dca9d437f4 jammit complains about this comma
Change-Id: I6944b67ad82fc7f63a545df8517c4c12256aa640
Reviewed-on: https://gerrit.instructure.com/3220
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: JT Olds <jt@instructure.com>
2011-04-22 17:13:02 -06:00
Ryan Shaw 11fb072729 fix formSuggestions selecting then immediately unselecting, fixes #4327
the input would be selected then immediately unselected
every other time you clicked on the input with its defaultValue being shown

Change-Id: Icc95314f0d34cf66f9d771895e11cd55b2b205f6
Reviewed-on: https://gerrit.instructure.com/3186
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-22 10:40:45 -06:00
Ryan Shaw 0d4e3a9de8 enable google previews of attachments; fixes: #4060
this makes it so devices without flash (eg: iThings) can
view documents inline.

Includes a few other changes:
 * add UI to account/settings page to enable/disable 3rd
   party services (i.e. google docs previews, twitter, linkedIn)
   -- you can disable these previews there.
 * use DRYer API for embedding scribd docs this also makes
   them ready if/when we switch to ssl
 * open documents on show_preview page in a modal window
   instead of inline in the list (which would grow a
   little wider every time you mouse over it) fixes #4004
 * use all available screen real-estate on files#show page
   (before it would only use 400px of height).
   fixes #4007

Change-Id: I0bb4b10c75c2217f35e0361bef61ca0b602533a9
Reviewed-on: https://gerrit.instructure.com/2662
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-22 10:17:13 -06:00
Brian Palmer e66b32bcca update jquery to 1.5.2
Change-Id: I9489f301b66048c02fa93ed0cd4919793cf0239b
Reviewed-on: https://gerrit.instructure.com/2988
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-04-22 09:08:59 -06:00
Jon Jensen 13370f459b mathquill integration, closes #3116, #4250
uses the branch at github.com/jenseng/mathquill/tree/fancyeditor

Change-Id: I6621a7e9a1135b7522f73d38d272668dcc2d9393
Reviewed-on: https://gerrit.instructure.com/3099
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-21 16:30:44 -06:00
JT Olds f5149ad4d7 sis import feedback fixes
Change-Id: I81c96b0ca050c0888b20fa886b735b93bf92d1c4
Reviewed-on: https://gerrit.instructure.com/3161
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-21 15:01:37 -06:00
Brian Whitmer 3980f26580 fix mismatched date times on assignment details page
When editing an assignment, if the user's Canvas time
zone is different than their browser's time zone,
the date in the editor field wouldn't match the date
currently set for the assignment.

Change-Id: Ic6ce80af4cd83d6b1ae1f15ef028c3e0625d02ec
Reviewed-on: https://gerrit.instructure.com/3176
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-21 13:28:28 -06:00
Jon Jensen 8c2d97f436 allow html answers for multiple-choice/multiple-answers, closes #4206
Change-Id: I49626c4d2f24ac73336dba006f01fdc83792eda2
Reviewed-on: https://gerrit.instructure.com/3155
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-21 13:23:23 -06:00
Brian Palmer 48e130d765 fix adding/deleting assignment rubric on quiz page, fixes #4303
Change-Id: I96954fd271f9759b45c05eac640b4bf909d18a6d
Reviewed-on: https://gerrit.instructure.com/3160
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-20 14:45:12 -06:00
Brian Palmer fa71caf057 fix creating new pages in context module screen, fixes #4304
Change-Id: I15e704d9dd34dd4ddb4fc12623914a74b06da095
Reviewed-on: https://gerrit.instructure.com/3159
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-20 13:52:54 -06:00
Zach Wily f122fa7e28 adding ldb requirement for viewing quiz results
Change-Id: Id011290fbd5d8ad791b016450671c88c7cba30bc
Reviewed-on: https://gerrit.instructure.com/3152
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-20 10:11:21 -06:00
Brian Whitmer 6ade1baeb7 delicious integration fix
fixes #4251

Change-Id: Id8074f1ab8df6d618696401d2784b56a81ec7b44
Reviewed-on: https://gerrit.instructure.com/3027
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-04-19 09:50:15 -06:00
Brian Whitmer 187a02f1ae fix kaltura recorder to work in ie, fixes #4280
Change-Id: I6e55d193dc8ac564273ef5740fe3e8922ee3ee8e
Reviewed-on: https://gerrit.instructure.com/3137
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-18 16:20:25 -06:00
Ryan Shaw 2b9ea82a51 put the sumissiontoview in a try/catch
...and log to errorstack so I can take a look

Change-Id: I5d8598951bc37f336a1dd2cb7616e05c33743c94
Reviewed-on: https://gerrit.instructure.com/3044
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-18 13:49:22 -06:00
Brian Palmer 27adf9b16a Merge branch 'ims_cc'
Change-Id: I7fc8590ab50d9ec062fd3cf609aa11f034ed582f
2011-04-18 10:20:36 -06:00
Bracken Mosbacker cf6908801a fixes to make importing a canvas cartridge from ui work
this commit fixes a bunch of problems with importing
a whole export package and updates the UI

refs #3396

Change-Id: Ia344b385e06df2f08bb75878234a7712a036e4b3
Reviewed-on: https://gerrit.instructure.com/3085
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-18 08:09:34 -06:00
Zach Wily 2f858ae586 update sis import documentation
Change-Id: I86d676915c5670fedf282d3571f06df0b3d395cb
Reviewed-on: https://gerrit.instructure.com/2905
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-04-17 15:28:47 -06:00
Zach Wily 9c0448cc58 fix uploading files to eportfolios; fixes #4273
We renamed 'upload' to 'attachment' and missed a couple spots.

Change-Id: I5f53f59e135a7887ff106803f70d9c4d52596e79
Reviewed-on: https://gerrit.instructure.com/3124
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-16 13:41:54 -06:00
Ryan Shaw 6f25bc4df5 chrome 10 does not support speech-to-text
Change-Id: Icfde961ae29e2bcb5b40acc3209c035b8d3900c4
Reviewed-on: https://gerrit.instructure.com/3109
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-15 11:15:55 -06:00
Zach Wily 2d7e77a23c create video media comments on submissions and in speedgrader
Change-Id: Ic5c63768beaf0416e9ef5d4c383f2f23e95f9d65
Reviewed-on: https://gerrit.instructure.com/3107
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-04-15 10:46:57 -06:00
Bracken Mosbacker fc4cc9ff46 added ui for course exports
refs #3396

Change-Id: I07c30535e042dada7c7d4174a7bb8148b7f6b1fb
Reviewed-on: https://gerrit.instructure.com/3039
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-15 10:27:14 -06:00
Brian Whitmer 3e7997d8a8 new kaltura recorder
This turns on the new kaltura video/audio recording
dialog.  The dimensions for the video recorder were
off, so we changed the dimensions for both recorders
to match and be larger.

We also renamed media_test folder to media_record,
and added support for https thumbnails

fixes #3212

Change-Id: Ie2f89383639e676a541dad7237db0742c798af15
Reviewed-on: https://gerrit.instructure.com/2454
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-14 21:44:02 -06:00
Zach Wily a57614c543 be sure to skip submissions for skipped assignments; fixes #4163
Previously we were not skipping submissions for assignments that the user had
chosen to ignore. This change also makes sure that grade is set on the
submission as well as score. (Grade is usually set when score is, but not in
all cases.)

Also got rid of the "lookup assignment by name" fallback in the importer. This
could cause weirdness when a teacher had a deleted assignment in the
downloaded gradebook that they'd recreated with the same name. We are more
strict now about matching the assignments to what's in the course.

Change-Id: I980db994f5df77104a07e81c629a5800f3b40972
Reviewed-on: https://gerrit.instructure.com/2992
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-13 21:26:11 -06:00
Cody Cutrer c3729fec79 Soup up grade_summary. Closes #3863.
* Include rubric_assessments inline, rather than linking to submission page
 * Add link to "Show All Details", expands all rubric_assessments and comments sections

Change-Id: I93065908fa181a337a6497d5e3142324cfed6479
Reviewed-on: https://gerrit.instructure.com/3036
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-13 11:06:09 -06:00
Cody Cutrer bb84334ee9 Add modules to links list in wiki sidebar. Closes #3824.
* Add modules to wiki sidebar
 * Fix redirect from courses/:id/modules/:module_id to courses/:id/modules#module_:module_id, rather than just courses/:id/modules
 * Auto-expand the specified module when you access modules/#module_:module_id

Change-Id: Iaa2ab30dc462fec753fe67928fb101212cff440a
Reviewed-on: https://gerrit.instructure.com/3021
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-11 14:47:37 -06:00
Cody Cutrer bb76753301 Fix updating observer stats from AJAX. Fixes #3020.
Change-Id: I62f117bf69b4651115db82cf865ef9da400ec0e1
Reviewed-on: https://gerrit.instructure.com/3014
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-11 14:36:25 -06:00
Ryan Shaw 163ef11193 wait to init wikiSidbar files and images tabs till clicked
this just fixes part of the problem, but it is still
super slow to init if there are a lot of files. step
2 will be to really make it faster

fixes #4158

Change-Id: Ic26ccb3d22bf28f8c70c666ddcb0eb8e0c9912fb
Reviewed-on: https://gerrit.instructure.com/3006
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-04-11 10:00:58 -06:00
Ryan Shaw 0d3ada1392 don't assume i'm editing a student user, fixes #3918
Change-Id: I51fcb9ab73f8686609ae010ab64bda61536a65c8
Reviewed-on: https://gerrit.instructure.com/3003
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-04-11 09:58:08 -06:00
Ryan Shaw a448e3ed4c resize speedgrader on iThing/android orientationChange
cause it orientationChange does not fire the
resize event handler

Change-Id: Ia370cc030309c3589f9070dbcc8c3a3ba44d32b4
Reviewed-on: https://gerrit.instructure.com/2998
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-04-11 09:56:40 -06:00
Brian Palmer 8c1f894da6 improve js htmlEscape performance and add htmlEscapeValues helper
Change-Id: I5c03572e9fe9b03b917ea70ec9e694362927d3dc
Reviewed-on: https://gerrit.instructure.com/2989
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-07 15:53:49 -06:00
Zach Wily 3456f07105 don't create 2 question banks when hitting enter; fixes #4105
Change-Id: I2c17559abf4f403dcbb853d7504f709af657fd00
Reviewed-on: https://gerrit.instructure.com/2979
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-04-07 15:50:57 -06:00
Brian Whitmer 44403d1c7e send kaltura requests through canvas
This solves a few problems.

- will make it easier to support HTML5 video playback
  for systems that don't handle flash
- first step toward making it possible for canvas
  installs to migrate from one kaltura instance to
  another by making a place for us to put some
  additional logic if necessary
- third parties getting data from us are no longer
  forced to find and handle media comments in order
  for them to work, since this adds a fallback url

refs #4083

Change-Id: I729aaf88378a30bda2126bfca2b2a48ec14bb386
Reviewed-on: https://gerrit.instructure.com/2901
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-07 12:52:22 -06:00
Zach Wily 1c5f710a41 clear out the message box after a message is sent; fixes #4196
Change-Id: I3096314c4c83b6f87e51fc389c5e394512923f18
Reviewed-on: https://gerrit.instructure.com/2967
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-06 22:03:05 -06:00
Zach Wily c82ba7b8ef make inlined content fill the view
Change-Id: Id9edeed7df1eb9bcf0ce58c11b804201115cb136
Reviewed-on: https://gerrit.instructure.com/2978
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-04-06 16:53:01 -06:00
Brian Whitmer 34419410e6 quiz statistics revamp
Quiz statistics weren't supported for all question
types.  Also added a csv export of the raw quiz
results data, with an attempt to make the data
meaningful even for complex question types.

fixes #4134

Change-Id: I55d1a21eed1cd6813fe0500190a1c0cc5fc038ab
Reviewed-on: https://gerrit.instructure.com/2850
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-04-05 17:06:35 -06:00
Jon Jensen c6b7a45ad8 string validations/fixes, closes #4154. wiki fixes, closes #3973, #4168
proactively found and fixed varchar(255)'s where we relied on mysql's
silent truncation. added validations for places where we want to
enforce these limits

made it so you can reuse titles/urls of deleted wiki pages, and added
validations to ensure sane urls and prevent orphaned pages

Change-Id: I15bcc0c7a751efba1a0f7548e9989ad2ea1792bf
Reviewed-on: https://gerrit.instructure.com/2935
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-05 11:22:50 -06:00
Brian Palmer 4f4d041f74 add slickgrid 1.4.3 and assets sections, refs #4104
Change-Id: I923debb4858985b39b747c63a6dfc60f35c9a079
Reviewed-on: https://gerrit.instructure.com/2944
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-04 15:25:59 -06:00
Brian Whitmer 72ccab9f16 editing file content was broken
The xhr request was sending an empty body, which was
failing in rack before ever even getting to rails.

fixes #4077

Change-Id: I894419a5d0700a6fc8adfa752203cc2689481337
Reviewed-on: https://gerrit.instructure.com/2904
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-31 09:15:14 -06:00
Brian Whitmer 52ce635619 link quiz group to question bank in UI
Change-Id: Ib97cb26108d330226a501fbd7ab259e29790ce37
Reviewed-on: https://gerrit.instructure.com/2661
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-30 11:56:09 -06:00
Brian Whitmer 5e9f3eaba7 option to require initial post before seeing replies
Teachers can specify that before students see any
messages in a topic they need to post at least once
in the topic themselves.  This is used for
assignment topics or to help encourage students
to think for themselves instead of just posting
"what he said".

fixes #3871

Change-Id: I946b71ec47bfe135f06faff68598c6f19c088a27
Reviewed-on: https://gerrit.instructure.com/2370
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-29 22:56:45 -06:00
Brian Whitmer 0078485fdb "Submission Details" link in gradebook should link to speed grader
The link in the gradebook to see information should link to the
speed grader instead of to the submission grades page, which has
less information.

fixes #4115

Change-Id: I6e9beae2d0e4ead7f0da0e025dcc5137d98893d3
Reviewed-on: https://gerrit.instructure.com/2837
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-29 22:56:27 -06:00
Ryan Shaw 38ff217c7c fix missing submissions on gradebook showing only section
the problem was that it was using a global js variable
'id_maps' to know which student was on which row.
when I removed rows not in this section, the rows
would be off.

Change-Id: Ifb4813cae5074c351a16767e1bda4dbaf2092b61
Reviewed-on: https://gerrit.instructure.com/2856
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-29 15:33:55 -06:00
Brian Whitmer da288acd86 turnitin icons not showing dialog in gradebook
Change-Id: I733417dd3ede094428830d1bbfb59f76ba120f55
Reviewed-on: https://gerrit.instructure.com/2849
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-03-29 14:57:04 -06:00
Zach Wily 1b1d607a9b fix score display on quiz moderation; fixes #4003
Also did a couple other tweaks:

  * Fixed the "Time" display when reloading via ajax (wasn't checking for the
    right workflow_state
  * Hide the "Attempts" column on quizzes that have an unlimited # of
    since it doesn't contain any useful data (always "--").

Change-Id: I21182193005d7415594b9c0531c03d619a31c262
Reviewed-on: https://gerrit.instructure.com/2857
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-03-29 14:45:37 -06:00
Brian Whitmer 76bfff3157 topic podcasts
Each topic can now have its own podcast stream.  Teachers
have to manually turn on the podcast for the topic, and
can specify whether student comments show up in the stream
or not.

fixes #3538

Change-Id: I19b1b44fc2eec864cfeb298163ef34a0b0181067
Reviewed-on: https://gerrit.instructure.com/2369
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-03-28 14:32:16 -06:00
Brian Whitmer d00f705c59 catch early clicks on "#" links
If a page hasn't finished loading and a user clicks on a
"#" link (javascript-enabled), then it'll jump them to
the top of the page unexpectedly because the listener
isn't ready yet.  This commit will catch all those early
clicks and replay them after dom ready.

fixes #4109

Change-Id: I19a0b8a56e39eead693764d660ed6197ff6b0528
Reviewed-on: https://gerrit.instructure.com/2793
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-25 15:42:46 -06:00
Brian Whitmer b7f1d5ae18 align question banks to outcomes
Question banks can be aligned to outcomes that
are part of the same context.  Whenever students
take a quiz with questions from the bank they'll
get evaluated for the linked outcomes based on
the points they got for each bank question.

Also fixed a bug which may or may not have existed
before this commit that unexpectedly deleted quiz
submissions when a user tried to re-take a quiz.

refs #3317

Change-Id: I744af3915672a5e260b078503e0bc648c238eca9
Reviewed-on: https://gerrit.instructure.com/2641
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-25 15:39:56 -06:00
Ryan Shaw ec92342ae0 fix for lock icons disappearing fixes: #3911
Change-Id: I366afc5126d15ccf11d90a29d90d0586a18908f1
Reviewed-on: https://gerrit.instructure.com/2760
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-25 14:31:32 -06:00
Ryan Shaw bc4bcc83f3 upgrade tiny
I will add my patch as a separate commit
(if it is still needed)

Change-Id: Ib6f90acdf9da8ef52cfeca9005eedabb54b31feb
Reviewed-on: https://gerrit.instructure.com/2809
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-25 12:07:57 -06:00
Ryan Shaw 84f589c15e better ie detection
Change-Id: Ie615008a734b875fb891929ad6a19673d9c037e7
Reviewed-on: https://gerrit.instructure.com/2817
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-25 11:56:34 -06:00
Brian Whitmer 361c4b5f36 enable private messaging within groups
This wasn't supposed to have been disabled, but somewhere
along the way it got turned off.  Should be back on now.

fixes #4079

Change-Id: Ib6cd7ee7a25a92f62cc4c425b90b04247e8c7ea9
Reviewed-on: https://gerrit.instructure.com/2769
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-03-25 10:33:16 -06:00
Brian Whitmer e4169cd188 gradebook not correctly remembering pass/fail grades
For pass/fail assignments the gradebook was not properly
remembering the set value if you clicked the word bubble
to add comments to the submission from within the
gradebook.  This should be fixed.

fixes #4002

Change-Id: I29837e3063e365d9aa1b80f9f0062748a4b73fb7
Reviewed-on: https://gerrit.instructure.com/2740
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-25 10:33:06 -06:00
Brian Whitmer 53e583259b when quizzes have lots of questions, the points possible is wrong
The page didn't have a way to know how many points questions were
worth when they were rendered using the question_teaser partial.

fixes #4088

Change-Id: If435dc7d6345fa71dd6db673fae5618426c3ffe6
Reviewed-on: https://gerrit.instructure.com/2767
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-03-24 13:21:45 -06:00
Brian Whitmer d20eede2df move default error reporting to a plugin
Accounts can specify a destination email address or URL
endpoint that will receive messages as error reports are
created if the feedback button is enabled.  This could
be configured before, but it wasn't straightforward
how to go about doing it.

fixes #3410

Change-Id: Ibd28ebf14c876fb216b14d3d56e622fc009aa2ba
Reviewed-on: https://gerrit.instructure.com/2739
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-03-24 13:21:31 -06:00
Brian Whitmer 6bb11cbadd default to 2 instead of 1 for multiple attempts quiz setting
Change-Id: I414b9b3316ccd5e515d94cd23a1dfc7c166df8e2
Reviewed-on: https://gerrit.instructure.com/2701
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Mark Suman <marks@instructure.com>
Reviewed-by: Mark Suman <marks@instructure.com>
2011-03-24 10:01:23 -06:00
Ryan Shaw 9a4962751b add drag-to-desktop, speech, and shake-for-next to speedgrader
each of these will only be enabled if the browser
supports it, if not no problem.

Change-Id: Ie481737121d515a0a5d7c89aa8d4e89e78170901
Reviewed-on: https://gerrit.instructure.com/2788
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-24 09:41:36 -06:00
Brian Whitmer 9d131ea836 basic lti support
- external tools can be added on the course/account
  settings page
- external tools can be linked to from within modules
- clicking a tool in a module will load a new page
  with the tool embedded in an iframe
- see context_external_tools for standard procedures
  on retrieving settings for a specific link

fixes #4013

Change-Id: I8aa1934f8deac9af26d74036162b34fd1c4242e1
Reviewed-on: https://gerrit.instructure.com/2601
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-23 16:58:11 -06:00
Brian Whitmer 399e6504b3 get rid of 'show all' link on right side, add 'less' link
If there are more than 5 To Do items, it says "show more...".
If you clicked the link it would show up to 15 items.  If there
were more than that it would then show a "show all" link that
did nothing.  This link has been replaced with a "less..." link
that will shrink the list back down to 5 items.

fixes #4025

Change-Id: Ic9ef88dc62ccb0174ca402a8c8d102bd6967aa46
Reviewed-on: https://gerrit.instructure.com/2636
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-03-23 16:40:12 -06:00
Brian Whitmer e823872743 missing summary icon for facebook app, fixes #4082
Change-Id: I91c6e35109a7dc419de7b0931c0d01d3f47ed511
Reviewed-on: https://gerrit.instructure.com/2724
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-21 14:51:08 -06:00
Ryan Shaw ca28c1cdf8 sometimes points possible didnt get put in the module dialog
Change-Id: I869a2c1c65db4f036c5377b1d2a082e55a2c3ff1
Reviewed-on: https://gerrit.instructure.com/2713
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-21 12:03:47 -06:00
JT Olds 3cf7b5946a new canvas sis import docs
Change-Id: I2a4d4f0dd511c0a8bfd5eab7a9a25e2ce4c9f063
Reviewed-on: https://gerrit.instructure.com/2691
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-18 13:19:32 -06:00
Zach Wily 8ec40fe010 strip hash from the return_to url before adding a new one
After an assignment is created, it will add the hash to the return_to url, so
you end up with two of them. They just end up growing and growing as you
create new assignments, eventually hitting the url length limit. This strips
the hash off the return_to url before adding a new one.

refs #4041

Change-Id: Ia1eac98c1c152191e9bf41b85d649408ad6e87c6
Reviewed-on: https://gerrit.instructure.com/2689
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-17 15:43:18 -06:00
Brian Palmer 794ae08524 fix indicate() js method when no options are passed in, fixes #4065
Change-Id: I6058bb4396a04b2f78e5d8a7ec02b72632326010
Reviewed-on: https://gerrit.instructure.com/2683
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-17 13:02:24 -06:00
Brian Whitmer 769503e0f7 'next' button on modules not working for items
If the next button is pointing to an item in the
same module instead of the next module, then the
link was incorrect.

fixes #4008

Change-Id: Iaa52567c417a52e2de0d47e7df70b7cff711ee68
Reviewed-on: https://gerrit.instructure.com/2638
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-16 13:40:41 -06:00
Zach Wily cae8b41bd6 warn when deleting a quiz that has submissions; fixes #4043
Change-Id: I286f1dab7d503295d7836eb598f9e8a7aaa96aa4
Reviewed-on: https://gerrit.instructure.com/2655
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-16 13:17:19 -06:00
Brian Whitmer e1a20125f9 lazy load rubric editor/viewer for topics/quizzes
this adds rubric configuration for forum assignments
and graded quizzes

refs #3317

Change-Id: Ide6f95a934730c6742fed0a2dff98462b1fbc263
Reviewed-on: https://gerrit.instructure.com/2540
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-03-16 11:38:31 -06:00
Brian Whitmer 93ab982243 make rubric on discussion topics page editable
refs #3317

Change-Id: If565b7632faa25d4a5b470c134540e53229f98c5
Reviewed-on: https://gerrit.instructure.com/2539
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-03-16 11:38:24 -06:00
Jon Jensen 757bcb2c60 fix a couple file upload problems
Change-Id: I6c8bfb22709655a8bd2cff2375ab0e4be9dcc5ec
Reviewed-on: https://gerrit.instructure.com/2604
Reviewed-by: JT Olds <jt@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-10 17:12:42 -07:00
Zach Wily cb6a99668b fix typo breaking adding question bank questions to quizzes; fixes #4012
Change-Id: Ie2f286b3c6d7fffc694c90e5988d4324408cc3d5
Reviewed-on: https://gerrit.instructure.com/2595
Reviewed-by: JT Olds <jt@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-10 13:01:33 -07:00
Ryan Shaw b8ffff8cbf use the right user_id in the url of a submission preview
worked before, but now attachments dont have a user_id

Change-Id: I5799f62331f9ebd696639a811b57d3b574de37f5
Reviewed-on: https://gerrit.instructure.com/2586
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-10 12:21:56 -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
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 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 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
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
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
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
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 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
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
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 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 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 18cd4a4491 remove trailing comma in js object literal
Change-Id: If1d66971a39ee97352a2116c02564c2ccc2cdc3e
Reviewed-on: https://gerrit.instructure.com/2473
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-28 17:00:22 -07:00
Brian Whitmer bbd6b8f6dd "add assignment" link doesn't come back
on empty "Assignments" screen, click "add assignment" then
delete it, the "add assignment" link doesn't come back

also fixed scrolling on assignments page to feel less
jumpy when you're editing stuff

fixes #289

Change-Id: Ia0de43b768b851ef3ef2de68b861ab0b8b531095
Reviewed-on: https://gerrit.instructure.com/2441
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-02-28 15:51:38 -07:00
Zach Wily f4c44aa86a fix media comments in the same html block; fixes #3923
When two media comments were in the same html block, we were accidentally
finding the media_id for the first one when building the media comment
thumbnail.

Change-Id: I31ce651e1a7654ed9ede6eca7c3abb8d70f7a2bc
Reviewed-on: https://gerrit.instructure.com/2462
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-28 14:23:31 -07:00
Ryan Shaw 8c419e048e fix display of gradebook in firefox if you zoom out.
the root of the problem is when we set the width of the
$row for the header and each row in the table.  each of
the .cell's are float:left'ed and so we need to set a
total width of the container.  when you zoom out the
border width of 1px did not shrink so there was no room
in the container to float:left the last cell so it
wrapped to a new line.

Change-Id: I01d3b4e04edc3befff3e4366a5b7f5afe5672703
fixes: #3891
Reviewed-on: https://gerrit.instructure.com/2409
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-28 14:19:15 -07:00
Ryan Shaw 535e2c13d4 patch tinymce to not scroll to top on shift+enter in webkit.
fixes zendesk 3520

Change-Id: I0860e7cb224dacb17cb76eefc2cb1a9fb76149a0
Reviewed-on: https://gerrit.instructure.com/2352
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-28 14:18:15 -07:00
Brian Whitmer 118a46311d can't add content to second tinyMCE editor loaded
problem with scoping.  The $editor value was being set
the first time the plugin was initiated and then never
updated, which means these plugins could only insert
content into the first editor loaded.

Also fixed the $.indicate to scroll and highlight
as expected.

fixes #3725

Change-Id: Idc1f6b5692631b6e05c8233c2774d714312d247b
Reviewed-on: https://gerrit.instructure.com/2438
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-28 13:20:54 -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
Jon Jensen dbfbf569dd put error balloon in the right place, closes #3792
Change-Id: I44f71eadedca68af35760f8fc5e5ea3a57577834
Reviewed-on: https://gerrit.instructure.com/2437
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-24 17:25:44 -07:00
Brian Whitmer 0dc9cb5b62 pretty sure this is supposed to be a semicolon
Change-Id: Iecf4dec0ad29b6bfe59f5fd755df3fb3ac6d3484
Reviewed-on: https://gerrit.instructure.com/2430
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-24 16:21:34 -07:00
Zach Wily 0a084625fa fix escaping when replying to inbox items, fixes #3908
Change-Id: I935601cd2aac4537cfba0cd4b68248c738d836ec
Reviewed-on: https://gerrit.instructure.com/2434
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-24 16:08:03 -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
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
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
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
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
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
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
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
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
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
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
Ryan Shaw 285b885a3d not using clippy anymore
Change-Id: Ie05e8ff386d524af420f44fb5d15bde963f1aa63
Reviewed-on: https://gerrit.instructure.com/2188
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-02-16 17:52:37 -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
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 564866d0e4 set allowed_attempts=1 when multiple attempts is unchecked, fixes #2525
Change-Id: I3b783efcfbeaa0360870da66edaaf7fb2677ba57
Reviewed-on: https://gerrit.instructure.com/2297
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-15 14:39:56 -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 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
Brian Palmer c51b7fea1e include graded, unsubmitted submissions in "haven't submitted yet" messaging
refs #3783

Change-Id: I5b81c71645c423c339419cd1d2222998f846153d
Reviewed-on: https://gerrit.instructure.com/2277
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-11 16:49:54 -07:00
Brian Palmer ba8e495ac1 fix "message students who scored more/less than" and 0 scores
refs #3783

Change-Id: Idfd66601f0dd82a0e1f492a84d3526d77973ee4f
Reviewed-on: https://gerrit.instructure.com/2276
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-11 16:49:30 -07:00
JT Olds b0fd3fea78 console.log removal
Change-Id: I3793631c4b99cf86f7b1e86c4e42c7e0a094a73a
Reviewed-on: https://gerrit.instructure.com/2269
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-11 12:40:27 -07:00
JT Olds ead989d4a5 removing files.js
Change-Id: I45f2b53fa9367d4228751fab81cbbcb44c18c569
Reviewed-on: https://gerrit.instructure.com/2237
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-11 10:50:33 -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
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
Mark Suman 01d9f66a5b Add SpeedGrader for iPad to the list of recognized browsers.
fixes #3606

Change-Id: I875171ac8a4474a38c7fbc836cf52c5be4b0dbe5
Reviewed-on: https://gerrit.instructure.com/2226
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-10 10:29:08 -07:00
Brian Whitmer 0e9120e8b1 files lock_at/unlock_at data weren't showing correctly
first of all they were backwards, so if you set unlock_at
it would act like you'd set lock_at.  second of all,
it wasn't actually setting the display date correctly
so it would say "will be unlocked at " with no date.

fixes #3714

Change-Id: I4346247d83a3cf132b8483a2f8c8220f70e7ab11
Reviewed-on: https://gerrit.instructure.com/2206
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-02-09 00:12:27 -07:00
Brian Whitmer c819d861b7 update position attributes when reordering module items
if you dragged a module item below another one and then
indented it, it would jump up to where it used to be
in the list.

fixes #3716

Change-Id: Ic3c5cbdc028f4976bbc55e006a454c4a266f48bf
Reviewed-on: https://gerrit.instructure.com/2204
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-08 15:42:47 -07:00
Brian Whitmer 878a0cf2a7 bug on modules page, select content js
this broke way back when we did the base_ar_class
stuff, but nobody noticed until now, because
so few people actually have bookmark services
registered.

Change-Id: I6c264de3e982df36690803c149fac145e7d690f8
Reviewed-on: https://gerrit.instructure.com/2216
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-08 15:42:39 -07:00
Brian Whitmer 5b0b598c67 eportfolio reordering bug
If you add a submission to an eportfolio's content and
then try to drag that submission page to somewhere else
on the page, suddenly the page is full of white space
and the draggable jumps to the bottom of the page.

fixes #3734

Change-Id: I3397519e30b2dfa5e63e2cb9934c8310186b05b4
Reviewed-on: https://gerrit.instructure.com/2184
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-08 12:50:20 -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