Commit Graph

213 Commits

Author SHA1 Message Date
Brian Palmer 6fad15dd0e undefine Spec::DSL::Main#context
We check responds_to?(:context) on many objects in our app, to duck type
context-owned objects. So in test mode when rspec is loaded, this causes
a lot of issues since every object ends up responding to :context.

Change-Id: I97f804e696e0e553b6fc7ef9b0700d0bdea7e9b2
Reviewed-on: https://gerrit.instructure.com/2221
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-02-09 13:57:32 -07:00
Zach Wily a5b7292710 upgrade to rails 2.3.11
Change-Id: I7043e9c4f4679277c23558da4c3d57d6dc142093
Reviewed-on: https://gerrit.instructure.com/2218
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-09 09:21:27 -07:00
Zach Wily fc710970c2 fix accounts not getting their root account set properly
When the "Manually Created Courses" account was getting created, it wasn't
getting its root_account set properly. In fact, it looks like only
sub-accounts 2-levels deep were getting it set correctly all the time. This
was causing courses in those accounts to have the wrong root account, making
it so admins couldn't access them.

fixes #3749

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

Change-Id: Id391ba65749860fede1e4fc16b0a8969f497eedd
Reviewed-on: https://gerrit.instructure.com/2215
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-02-08 15:58:39 -07:00
Brian Whitmer 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
JT Olds b1947bab40 fixing md5-matching local storage.
Change-Id: I33e13ec9dbcec50aead18771e1956edcd2f3b8fe
Reviewed-on: https://gerrit.instructure.com/2168
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-08 15:25:29 -07:00
Brian Whitmer bab11f5bbf module headings weren't getting copied on course copy
fixes #3588

Change-Id: I1873451425ddba8615d86cdbd80faab3f7c45fe5
Reviewed-on: https://gerrit.instructure.com/2210
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-08 15:12:35 -07:00
Brian Palmer 93c2785230 add bluecloth to Gemfile for api doc generation
Change-Id: If82284dee307b55ee9c381d5e2d17fe4ac67af76
Reviewed-on: https://gerrit.instructure.com/2212
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-08 14:35:42 -07:00
Bracken Mosbacker e832bb9af2 set the correct workflow state on sis import
users need to be 'registered' not 'active'

closes #3744

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

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

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

closes #3739

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

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

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

fixes #3720

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

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

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

closes #3519

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

fixes #3636

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

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

Change-Id: I2ecd672365f696f3467414d429a15151b181fc50
Reviewed-on: https://gerrit.instructure.com/2177
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-07 14:42:50 -07:00
Bracken Mosbacker 157750bf3f fixed a couple course dropdown encoding problems
Change-Id: I159320adaeaa2a0fce7192191905e4100ca3b636
Reviewed-on: https://gerrit.instructure.com/2180
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-07 14:25:22 -07:00
Brian Whitmer fc7a551367 select/deselect all links not working on collaborations page
fixes #3719

Change-Id: If3e0f8d005b6a9da41bb619736e9696f95115b69
Reviewed-on: https://gerrit.instructure.com/2172
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-07 12:42:30 -07:00
Ryan Shaw ee7356f097 source only rubygems in gemfile, others are deprecated
gemcutter is now rubygems and github doesn't host
gems any more.

Change-Id: Ibb38fe87a5fe6527d90469eab3263c8dbc421d62
Reviewed-on: https://gerrit.instructure.com/2113
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Zach Wily <zach@instructure.com>
2011-02-05 06:22:22 -07:00
JT Olds 80079ebbcc remove immediate dependence of email template generation on domain.yml
not sure why i didn't do it this way before. i'm dumb. closes #3710

Change-Id: I93d5d5e600baae247a149b4a87dbfbcc0395b44c
Reviewed-on: https://gerrit.instructure.com/2165
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-02-04 17:34:41 -07:00
Brian Palmer d8e0e10a13 retain the grade if another submission API PUT is made without one
fixes #3718

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

Change-Id: Ie684cc868454215941363959e0bfac9be4d90860
Reviewed-on: https://gerrit.instructure.com/2161
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-04 13:56:13 -07:00
Brian Palmer e1b6f066b4 improved auto-linkification of text fields, refs #3706
Change-Id: I6ffe2f4f946b551c527eeb4249dfff959f77a22e
Reviewed-on: https://gerrit.instructure.com/2154
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-04 12:10:27 -07:00
Brian Whitmer d3092fd878 turnitin fixes
- javascript syntax error
- fix turnitin link on grade_summary page
- added url for student turnitin report view
- ruby syntax error in submission partial

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

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

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

Change-Id: I76d909dcf9d581760c815a369793d86264148a1c
Reviewed-on: https://gerrit.instructure.com/2132
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-03 13:56:39 -07:00
JT Olds 903bcdd371 move gem_home configuration for delayed_jobs to config folder
right now, the documentation tells people to change script/canvas_init, which
kinda sucks for people hoping to upgrade by doing git pull.

this seems sort of hacky - i'm open to suggestions.

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

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

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

Change-Id: I8bba90001a300e76d467c99f25747cf246fe3933
Reviewed-on: https://gerrit.instructure.com/2136
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-03 08:42:22 -07:00
unknown bafc2ed37d get rid of newrelic config file
Change-Id: I4c934463035c6bcb1e992240c684eb487367c892
Reviewed-on: https://gerrit.instructure.com/2102
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Brian Whitmer <brian@instructure.com>
2011-02-02 15:22:45 -07:00
Brian Whitmer 77702d6327 start logging asset accesses again
This was accidentally removed.

fixes #3691

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

Change-Id: I46200fb27a9c434d3b1983674043f6413b23a041
Reviewed-on: https://gerrit.instructure.com/2128
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-02-02 11:19:23 -07:00