Commit Graph

2318 Commits

Author SHA1 Message Date
Zach Pendleton 909a6348e0 show mute icon when refreshing gradebook page. fixes #5101
mute icon not showing up when user mutes an assignment and then
refreshes gradebook page. page now resizes mute cells on load.

Change-Id: I70af005f642cdb0220c6993347855a08d61ef6ba
Reviewed-on: https://gerrit.instructure.com/6074
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2011-10-12 10:16:16 -06:00
Ryan Shaw f0f41d1647 fix path to handlebars template in GradebookHeaderMenu
Change-Id: I8fd3b4416e0311bf06826dab67c25a79795e86e5
Reviewed-on: https://gerrit.instructure.com/6124
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-10-12 10:14:39 -06:00
Brian Palmer 0730f8c7d4 revert to syck yaml engine in ruby 1.9, for delayed jobs
Change-Id: I92310b0d30322192b7d2a5b20dad1c6a349af9f5
Reviewed-on: https://gerrit.instructure.com/5837
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-10-12 09:36:35 -06:00
Brian Palmer 1fe1b1ad6b csv lib compat in ruby 1.9.x
fastercsv is not supported in 1.9, instead csv in the stdlib has been
modified to be api compatible with fastercsv. in this first step, we
alias CSV to FasterCSV when running under 1.9. This allows 1.8.7 to
continue working with no changes.

Change-Id: I34c3a9031b6f4946380510e4833203e29a05073a
Reviewed-on: https://gerrit.instructure.com/5835
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-10-12 09:36:18 -06:00
Jacob Fugal e07e64b9ef self signup group categories
group categories can be flagged as self sign-up, and optionally
restricted to be section-homogenous. like normal groups and unlike
student-organized groups, a student may be in at most one self sign-up
group. but like student-organized groups and unlike normal groups,
students can assign themselves to the group of their choice. if the
section restriction is enabled, students can only be assigned (whether
by themselves or their teacher) to a group which is either empty, or
whose existing members are in the same section as the student.

also added an edit UI to group categories allowing renaming and
management of the self sign-up options. polished the existing UI for
creating categories.

fixes #4624

Change-Id: Ib623f4c6afd20e9700984f8294cd42950107252c
Reviewed-on: https://gerrit.instructure.com/6052
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-10-11 17:22:46 -06:00
Ryan Shaw 41e232007e check attempt not @submission in submissions api
Change-Id: I49f3b338a71e46c8bea3d561c3d6ddc526dbb3f6
Reviewed-on: https://gerrit.instructure.com/6119
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-10-11 14:50:56 -06:00
Brian Palmer 9409bd78db submit_to_scribd on a job strand
Change-Id: I9bfb7f093e58c3c913ee31cfa7fb4cc194671198
Reviewed-on: https://gerrit.instructure.com/6117
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-10-11 14:46:33 -06:00
Cody Cutrer 966f196fc4 drop Pseudonym#deleted_unique_id closes #5896
Change-Id: I5072b341cebd0221d6b06bb74bb012c61b62610f
Reviewed-on: https://gerrit.instructure.com/6080
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-10-11 14:10:54 -06:00
JT Olds b5c95cad85 inverted logic fix for stickiness migration
Change-Id: Ie890b4620202039d5852e66129ad8ae1edadea3c
Reviewed-on: https://gerrit.instructure.com/6087
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-11 14:00:33 -06:00
Cody Cutrer e9cb011914 clear avatar state when assigning by non-existent service
Change-Id: I816b3b34f8876705402afe819ac031f0130975a1
Reviewed-on: https://gerrit.instructure.com/6112
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-11 13:32:32 -06:00
rob orton 1ccd161bd8 typo in group collaborations text
added space to text createdso>created so

Change-Id: I21b91784efbe896fbe85a2826f205281c3766fa2
Reviewed-on: https://gerrit.instructure.com/5876
Reviewed-by: Jon Jensen <jon@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jon Jensen <jon@instructure.com>
2011-10-11 13:27:59 -06:00
JT Olds dab4973c64 show individual grade publishing status results on the course settings page
Change-Id: I81ddbc77fbc7ac5db4d1b26e88afa73477b2c26c
Reviewed-on: https://gerrit.instructure.com/5950
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2011-10-11 13:18:59 -06:00
Ryan Shaw 919ba94e6f Add submission comment dialog to gradebook2
Change-Id: I782a5c516b013ba91c0109a3ffc8b03f5416ffa1
Reviewed-on: https://gerrit.instructure.com/6056
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-11 13:15:13 -06:00
Ryan Shaw 5276288f53 require handlebars extractor in jst guard
Change-Id: I2949cb0aa19769607edc9b7334e3548bdd84e53d
Reviewed-on: https://gerrit.instructure.com/6110
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-11 13:14:46 -06:00
Ryan Shaw b5603306ef send turnitin data back in api
Change-Id: I1bdabc2e080c616c4d96e0cb88749b16da2cfa7d
Reviewed-on: https://gerrit.instructure.com/6089
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-11 12:52:39 -06:00
Jon Jensen 29cacb184c fix a couple kaltura related selenium specs
Change-Id: I5cee07ef78394f4c5eeff18c0d4fe2c3070fd16e
Reviewed-on: https://gerrit.instructure.com/6108
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Tested-by: Bryan Madsen <bryan@instructure.com>
2011-10-11 12:51:53 -06:00
rob orton 77ead78868 add missing xlists docs
Change-Id: I1f04a58011281b0475f3fa5f47225d8ceaba5c5c
Reviewed-on: https://gerrit.instructure.com/6095
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-10-11 12:42:23 -06:00
Ryan Shaw 2181cefa5c don't set perspective 2x
Change-Id: I10772aa1066bfa367c2df28d498939185ba53f40
Reviewed-on: https://gerrit.instructure.com/6057
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2011-10-11 12:17:07 -06:00
Ryan Shaw 36a8e3be77 make kylemenu look like coffeescript
Change-Id: I30d020984947249b4cf0e8a65c1c36cd100aebac
Reviewed-on: https://gerrit.instructure.com/6058
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2011-10-11 12:16:54 -06:00
Brian Palmer 5a48da71a1 move barista gems to the development Gemfile group
Change-Id: I14059147bd974cd9cf5d90cc55c7cf970f1464b5
Reviewed-on: https://gerrit.instructure.com/6106
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-10-11 10:42:33 -06:00
Cody Cutrer 133f2a156a make Pseudonym#unique_id sis sticky refs #5897
Change-Id: If969d8bfd8844a2dcd5263a11c9bc06dcaa47c55
Reviewed-on: https://gerrit.instructure.com/6092
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-10-11 10:16:06 -06:00
Brian Palmer 9c6a4f1798 compile_assets without loading the canvas/rails environment
Change-Id: I8cd841228c9fae6194316cc576a5fc737062f569
Reviewed-on: https://gerrit.instructure.com/6105
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-11 10:07:50 -06:00
Jon Jensen 94b866d88d handlebars string extraction, a couple i18n fixes
Change-Id: If6154634a2df6e1dcaf8e259734cd73ef3928200
Reviewed-on: https://gerrit.instructure.com/6102
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-10-11 09:56:34 -06:00
Ryan Shaw 944472610b add ability to pass fallback to /images/users/x
Change-Id: I21dce49651f4091b59657d9a9a8c34aeb08a612c
Reviewed-on: https://gerrit.instructure.com/6088
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-10-11 09:53:31 -06:00
Brian Palmer 9b3f9cfe5c compile jst and coffeescripts in canvas:compile_assets
Change-Id: Ibd3395e64f2b459782c6a97d199df53c2a3f573b
Reviewed-on: https://gerrit.instructure.com/6104
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-11 09:32:30 -06:00
Ryan Shaw d498350329 don't 404 for submission that was not created yet
Change-Id: I67dffd8f8fce13e3ac21f988e67f7e84d9eba4d0
Reviewed-on: https://gerrit.instructure.com/6090
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-10-11 09:13:27 -06:00
Jon Jensen 403bd095d5 reorganized i18n extraction classes
no real changes, just moved/renamed things a bit prior to creating a
HandlebarsExtractor

Change-Id: I47fa3bbc8d3bcbb926b92a4f42f704b9373c38f7
Reviewed-on: https://gerrit.instructure.com/6086
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-10-10 20:58:03 -06:00
Jon Jensen 15985ed60c i18n.js: apply wrappers prior to interpolation
makes for happier handlebars templates

Change-Id: I0f2e9dae3f61700542c253fd6f9e0b4d652397da
Reviewed-on: https://gerrit.instructure.com/6079
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-10-10 20:57:38 -06:00
Ryan Shaw df9fab15aa add muting to gradebook2
Change-Id: Ib11a665f12319bf96fa2de4bda84d38c64132b6d
Reviewed-on: https://gerrit.instructure.com/5970
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-10 18:39:37 -06:00
Ryan Shaw 54b0dcd9c5 add assignment details dialog to gradebook2
Change-Id: If0ffeff55edaa01ce97bd9482c7a18467d753d1d
Reviewed-on: https://gerrit.instructure.com/5987
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-10-10 18:19:12 -06:00
Ryan Shaw 473154ca1b get some of the grade book column header menus working
Change-Id: I780f5da11e530c304681f92fc0540f6f4aa8045c
Reviewed-on: https://gerrit.instructure.com/5945
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-10 18:18:44 -06:00
Jacob Fugal cccba00ee8 fix creating/editing assignments after group category model
Change-Id: I3bce5efa2676759833a5f9f301348288bc2bda2a
Reviewed-on: https://gerrit.instructure.com/6078
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-10-10 16:44:27 -06:00
Brian Palmer cd31b7207c add description to todo item assignment return
Change-Id: I4232f70f88c1d34310d66aa62525f56d9e4389e5
Reviewed-on: https://gerrit.instructure.com/6083
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2011-10-10 15:53:32 -06:00
Brian Palmer 9f0aa5f6e6 rewrite user content in the api for file links and media comments
file links get translated to direct file download links, and media
comments into embedded html video tags.

use this to add assignment description to the assignment json response.

closes #5739, closes #4742

Change-Id: Iccfc517014ed2777686c355a382ded290ae4d8b8
Reviewed-on: https://gerrit.instructure.com/6030
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-10-10 15:05:28 -06:00
Brian Palmer 150491a217 refactor user content rewriters
One in course copy, and one in common cartridge export.

refs #5739

Change-Id: I4ba016f643a22f0cf3f6dbbe6b00dcd7d228a10a
Reviewed-on: https://gerrit.instructure.com/5979
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-10-10 15:05:15 -06:00
Cody Cutrer c76181133f require :manage_sis permission to remove sis pseudonyms fixes #5634
Change-Id: I35eb761e4c13c09d3622b4b6ba84852434402260
Reviewed-on: https://gerrit.instructure.com/6075
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-10-10 14:32:18 -06:00
Brian Palmer deb4b3091f fix typo in qti_exporter
import is a rake method

Change-Id: I469209c44133568a8c638412f8f3da2bc6992588
Reviewed-on: https://gerrit.instructure.com/6069
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-10-10 13:39:11 -06:00
Cody Cutrer 31c83ef741 update avatar urls for twitter to https in migration
refs #5194

Change-Id: Id6aace4a0e6a1ebc25fd20eb42ee187d96fdf83d
Reviewed-on: https://gerrit.instructure.com/6068
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-10 13:01:18 -06:00
Brian Palmer 2ff3d60cbe Gemfile: allow rake 0.9.x
Change-Id: I5c3d45aad0a67f011cdc43ad36fd4beff6ae5ebb
Reviewed-on: https://gerrit.instructure.com/5848
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-10 12:35:09 -06:00
Jon Jensen 4e884adfdf return attachment and media comment urls, closes #5850
Change-Id: I971a02d2055778120a0a5df0129f2b145da98843
Reviewed-on: https://gerrit.instructure.com/6045
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-10 12:26:00 -06:00
Ryan Shaw 51f7ecf586 add fs-events gem on osx/linux to make guard happy
Change-Id: I004fc6aba99cef99dcc8829ee674aec51e0bb3df
Reviewed-on: https://gerrit.instructure.com/6065
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-10 11:04:33 -06:00
Cody Cutrer f41047c61a account setting to disable name editing fixes #5851
also rearrange account settings slightly so that stuff that doesn't apply
to non-root accounts doesn't show for them

Change-Id: I568887a30cbf923c976e7c5bbac1036bb8e88659
Reviewed-on: https://gerrit.instructure.com/6012
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-10-10 10:59:08 -06:00
Brian Palmer cf3de519ff force domain.yml config in test env
tests fail if this config isn't what's expected, so it's silly to allow
changing it

Change-Id: Ib7f0bc1fe77ef85192b83de37db90f808be495cc
Reviewed-on: https://gerrit.instructure.com/6066
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-10-10 10:36:33 -06:00
Ryan Shaw 6c6dc117e6 filenames starting with a "_" can be used as Handlebars partials
Change-Id: Ie4f48b75fec90550439b1d20e96e09ecd74a58f6
Reviewed-on: https://gerrit.instructure.com/6059
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-10 10:12:27 -06:00
Brian Palmer a24edffb32 remove the sis documentation pdf, link to the new api doc version
Change-Id: I3d21e8605924cec07a898b79e6bb666d424d0e36
Reviewed-on: https://gerrit.instructure.com/6051
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-10-10 10:05:18 -06:00
Jon Jensen 71a650d382 revised address book, fixes #5639
added/changed functionality:

 * search for course sections
 * browse and select groups/sections/enrollment types (e.g. all
   teachers) within a course
 * browse and select enrollment types within a section
 * changed toggle vs. drilldown input handling (e.g. clicking on an
   expandable element now always expands it, unless you click on the
   checkbox)
 * "Select All" checkbox within groups and enrollment types

Change-Id: I13baa9e8b98abc5b5ec6dfb4cfbd1021160f65cc
Reviewed-on: https://gerrit.instructure.com/5955
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Jon Jensen <jon@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
2011-10-10 09:58:44 -06:00
Jon Jensen 6e2f7ac517 fix faculty journal regression, closes #5724
incidentally also fixes issue where user's common contexts were not
displaying in the recipient finder

Change-Id: I69c866ead86796a3602030c8fdd1df25200fdcb3
Reviewed-on: https://gerrit.instructure.com/6033
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
2011-10-10 09:58:24 -06:00
JT Olds dc2a8fd040 make sure decrosslisting is sticky too
Change-Id: Ib5aa0e9df093ba9967aefad85197c94638f82845
Reviewed-on: https://gerrit.instructure.com/6049
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-10-10 09:45:11 -06:00
Jacob Fugal 13b83cdbe5 use model ids instead of names to identify group categories
clean up some group category UI stuff along the way

Change-Id: I82aa086bd6d392af007d2e5f9def5618cf4dc143
Reviewed-on: https://gerrit.instructure.com/6054
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-10-10 09:36:23 -06:00
Jacob Fugal 5c8406bd35 GroupCategory model
Group#group_category_name (groups.category) and
Assignment#group_category_name (assignments.group_category) are now
deprecated.

refs #4624

Change-Id: I8fc5d03a75e962c3f649305986f77ad242d3a694
Reviewed-on: https://gerrit.instructure.com/5765
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-10 09:36:06 -06:00