Commit Graph

26827 Commits

Author SHA1 Message Date
Bracken Mosbacker b866a18699 fix wiki_page reference for module importing
closes #3843

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

fixes #3738

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

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

refs #3315

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

Change-Id: I68c215ef8f4ce11f22b2f156b691fa8284342e78
Reviewed-on: https://gerrit.instructure.com/2308
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-16 14:22:59 -07:00
Brian Whitmer 8035e390f4 add observer role to csv import
and add a new column for linking it to a user

refs #3315

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

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

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

fixes #3827

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

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

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

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

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

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

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

fixes #3804

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

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

Change-Id: Ia659f85aa30877d1e7a7ce351d5856809a034d7d
Reviewed-on: https://gerrit.instructure.com/2300
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-15 16:17:05 -07:00
Brian 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 Palmer e0a163d297 change delayed_job child exiting strategy, fixes #3808
Before, the child did a hard Kernel#exit!, skipping all finalizers and
exit callbacks. This was causing issues with code misbehaving, for
instance Tempfile instances never getting rm'd off disk.

Now we're doing a fork { block } and using the normal ruby exit path, so
that these finalizers get run. I had to tweak the db connection
handling, because this means that the db connection is also getting
closed by each spawned child.

Unfortunately I'm sure there's a performance hit for reconnecting to the
job queue database after each job is run.

Change-Id: I83776d08bf3693f72fd3e7246cee196cca1987a1
Reviewed-on: https://gerrit.instructure.com/2295
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-15 14:39:51 -07:00
Brian Whitmer ba802b72f2 allow up to four decimal places for numeric questions
fixes #3802

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

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

fixes #3818

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

fixes #3781

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

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

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

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

fixes #3727

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

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

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

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

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

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

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

closes #3702

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

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

refs #3711

Change-Id: Ide0a0603b6c820ea0ec94646c4327239d980b09c
Reviewed-on: https://gerrit.instructure.com/2194
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-11 12:54:21 -07:00
tom metge 62ba756243 ignore demo database files
Change-Id: I01c3a08a6d5201d66ccdaeb22cdbd64e5dc2059f
Reviewed-on: https://gerrit.instructure.com/2257
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-11 12:54:14 -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 046cfe54c1 oh whoops, bash might not always be the default shell
Change-Id: I3ba13544e0238579fb374a6a0886fd978689433c
Reviewed-on: https://gerrit.instructure.com/2270
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-11 12:33:24 -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 dc1cc82a9c test file uploads from homework submissions page
Change-Id: Ifdaf61db104cf06f9edfbdc80eca6133a258886a
Reviewed-on: https://gerrit.instructure.com/2101
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-11 10:50:20 -07:00
JT Olds f39cab0237 discussion page file upload selenium tests
Change-Id: I77c8a4e3b292e0eb32a145aa0b59322e7939b92a
Reviewed-on: https://gerrit.instructure.com/2100
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-11 10:50:13 -07:00
JT Olds a1698d6009 flash s3 uploading
Change-Id: I479dc752d707ef6b52f7efb5e4e43514c2dbe15e
Reviewed-on: https://gerrit.instructure.com/2098
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-11 10:50:07 -07:00
JT Olds cdb522a281 non-flash direct-to-s3 changes
Change-Id: I1147b249c887a2034e499e1b22d633f7813a716f
Reviewed-on: https://gerrit.instructure.com/2097
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-11 10:49:53 -07:00
JT Olds ba735d41b6 direct-to-s3 server side changes
Change-Id: Ie7b415b84f403c98d82f0e67212ae2e7b051b67d
Reviewed-on: https://gerrit.instructure.com/2096
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-11 10:49:47 -07:00
Bracken Mosbacker 9168dfbdec urls from external migrations are already escaped
The text helper was double escaping urls from external migrations

refs #3667

Change-Id: Ica89af6fffab47ec1fee82167acc1d34551e63e4
Reviewed-on: https://gerrit.instructure.com/2232
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-11 10:28:51 -07:00
Brian Palmer e09161c808 don't push empty hashes onto the rubric rating data, fixes #3654
Change-Id: Ic2ac3d2fdc0e68786a9f372da25dc3b56b878451
Reviewed-on: https://gerrit.instructure.com/2244
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-11 08:34:17 -07:00