ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,759 Commits 324 Branches 20,019 Tags 1.7 GiB
Commit Graph

1759 Commits

Author SHA1 Message Date
Jon Jensen 1705495c89 fix periodic spec failures 
Change-Id: I4bee4c1b5f298c22ee729a05c3361451d72fd93c
Reviewed-on: https://gerrit.instructure.com/5214
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-08-23 16:23:49 -06:00
Cody Cutrer cdce5650fb fix date-restricted inactive enrollments getting permissions from roleoverride 
refs #4996

Change-Id: I9d7111b229ddfc31c3daa1399e52422873f1388f
Reviewed-on: https://gerrit.instructure.com/5231
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
 2011-08-23 16:10:49 -06:00
Brian Palmer f483a19a3c api to retrieve all courses in an account 
Change-Id: Ic849f61d38f4887c241b97c72edc08ed06434c20
Reviewed-on: https://gerrit.instructure.com/4973
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
 2011-08-23 15:58:51 -06:00
Cody Cutrer f673176f01 fix deleting ajax-loaded questions from question banks 
fixes #5004

Change-Id: I79e31ac3569fedd1ca7e14c62dfea6964d730e8c
Reviewed-on: https://gerrit.instructure.com/5223
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-08-23 15:58:39 -06:00
Brian Palmer b4de1b0e37 account list/show apis, for account_users 
Change-Id: I787d05965b6dc5cee461f1b3041418de89d5304f
Reviewed-on: https://gerrit.instructure.com/4964
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
 2011-08-23 15:51:46 -06:00
Brian Palmer 21d7337a7f include basic user info in oauth response, closes #5247 
Change-Id: I701c8e0517eaf78c334d059ca9a6db1ebf03c52e
Reviewed-on: https://gerrit.instructure.com/5199
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Mark Suman <marks@instructure.com>
 2011-08-23 15:31:18 -06:00
Ryan Shaw f9892cd70d dont render wiki_page body at all if it was deleted 
Change-Id: I15d765572fdbd5cfa36160839bc7a2e7d9a5ed20
Reviewed-on: https://gerrit.instructure.com/4727
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
 2011-08-23 15:19:56 -06:00
Cody Cutrer 0763c48b82 workflow_state is a string, not a symbol 
Change-Id: I4d7d10ae0e33a5d84c39a35fcbb0ec21f366cf4c
Reviewed-on: https://gerrit.instructure.com/5220
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-08-23 13:07:36 -06:00
Zach Wily 98c816815f fix html escaping rubric long descriptions; fixes #5360 
Change-Id: I589d93e9d9c77a59c35846fc3b17f8b93098b74c
Reviewed-on: https://gerrit.instructure.com/5217
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
 2011-08-23 13:07:03 -06:00
Cody Cutrer ba786a4508 statelessly enforce enrollment date restrictions fixes #4996 
Change-Id: I978c1524518fd17bbffca73071f7b500ca79c435
Reviewed-on: https://gerrit.instructure.com/5166
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
 2011-08-23 12:23:22 -06:00
Ryan Shaw 544ffa0422 No % sign in Quiz Statistics 
Change-Id: I7acb7cf8750159f766fd682b521f1c42dc1428e6
fixes: #5356
Reviewed-on: https://gerrit.instructure.com/5205
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
 2011-08-23 12:01:48 -06:00
Cody Cutrer 29310a356c reset course content closes #4583 
Change-Id: I9f28519f68ab462833073de1126166e372d4ae89
Reviewed-on: https://gerrit.instructure.com/5211
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
 2011-08-23 11:26:52 -06:00
Ryan Shaw 5f51a08e9e fix submitting assignment using already uploaded file 
this was because it was considering <input type="file">'s
that had no value.

Change-Id: I079308a5d72ea69ddaff61c4ad487aa2973f6cb4
fixes: #5353
Reviewed-on: https://gerrit.instructure.com/5200
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
 2011-08-23 10:19:17 -06:00
Brian Palmer 3d9eead696 api for the activity stream, closes #4740 
Change-Id: If3a56f635dd6dbd93edc920f0bd0c5cadd709490
Reviewed-on: https://gerrit.instructure.com/4748
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
 2011-08-23 09:13:20 -06:00
Brian Palmer 9dc77019ce configurable ttl for delayed job redis stats 
Change-Id: Ifc76034c3c92bbe77f67fc4e65cc3834fdd9b08f
Reviewed-on: https://gerrit.instructure.com/5193
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-08-23 09:11:41 -06:00
Brian Palmer 09aebeade0 typo causing import buttons to disappear 
Change-Id: I334d7ba797c3105f8dc801160752eb8b47b2dafb
Reviewed-on: https://gerrit.instructure.com/5204
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
 2011-08-23 09:11:29 -06:00
Jon Jensen 1ebf2072d6 fix two mysql bugs wrt common courses and enrollment types 
Change-Id: Ied849e68744f4153851acf2c7d2d1c91f9f72479
Reviewed-on: https://gerrit.instructure.com/5215
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-08-22 21:35:19 -06:00
Jon Jensen 8825d83258 fix linkify issue 
Change-Id: Iad7b48bfa653f6403c39c177cacc7dbe3db12258
Reviewed-on: https://gerrit.instructure.com/5216
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-08-22 21:34:29 -06:00
Jon Jensen 15ff3e4cf4 fix broken query 
Change-Id: Iba6a99d49588a8e9409b4852443cfbcee03466bc
Reviewed-on: https://gerrit.instructure.com/5213
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
 2011-08-22 17:27:15 -06:00
Jon Jensen c8c15dcbb0 fix faculty journal checks 
Change-Id: I23692f617b6949cfc13eed3e6c1046b0c723c0f5
Reviewed-on: https://gerrit.instructure.com/5206
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
 2011-08-22 16:26:53 -06:00
Jacob Fugal c2c7626915 use context_host, not default_host, in conversation notifications 
Change-Id: I3c1509f41d4a45731a2ed85972c00f63b358f1a2
Reviewed-on: https://gerrit.instructure.com/5203
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
 2011-08-22 15:40:15 -06:00
tom metge 6be9a8afed don't dump the entire customer ldap db on search test. 
only accepts the first result from the ldap connection, then exits.

Change-Id: I49f1db7bb3c1bbef8e24a09ead088141b775c66c
Reviewed-on: https://gerrit.instructure.com/5197
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
 2011-08-22 15:31:48 -06:00
Ryan Shaw 41bff4537a ensure an assignment group exists when editing assignment 
this manifested itself in a bunch of tickets from pcsd

Change-Id: I86a23cde6e1e55a8251124677bb0e66a2bd0cd92
Reviewed-on: https://gerrit.instructure.com/5170
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
 2011-08-22 14:27:14 -06:00
Jon Jensen 1b2e96d5ef fix coffeescript parse error 
Change-Id: I583fc1d05afb619ce35703e9bc88d2e15725dc4c
Reviewed-on: https://gerrit.instructure.com/5198
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
 2011-08-22 14:16:10 -06:00
Jon Jensen 3c8b5b9b6d fix selenium spec 
Change-Id: Idb5c97d548c3cd353e6fa3f07d30f24fabfed7d8
Reviewed-on: https://gerrit.instructure.com/5185
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
 2011-08-22 14:15:59 -06:00
Jacob Fugal 14f2d01cee include necessary js in discussion_replies 
Change-Id: Ic629d538cdbd63490bc28c374ffe5179167b1fad
Reviewed-on: https://gerrit.instructure.com/5195
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
 2011-08-22 14:02:49 -06:00
Ryan Shaw f66a90b12b don't show deleted assignment groups in the new graded discussion page 
Change-Id: Ifccdd950718ce627a91aa350d74d74282f54c719
fixes: #5345
Reviewed-on: https://gerrit.instructure.com/5169
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
 2011-08-22 13:54:40 -06:00
Ryan Shaw fe3673187a question banks were being shown in reverse alpha order 
Change-Id: I1810729abcd193bd3c7d65f3df208873930226eb
fixes: #5330
Reviewed-on: https://gerrit.instructure.com/5142
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
 2011-08-22 13:54:32 -06:00
Jacob Fugal 8ba6528cdf tweak slideshow styling 
fix screenshot image on slide 3, do corners/shadow in css, and tile
background image

Change-Id: I2a53f532a367799502c0b25b5fe1217bd6b81a9b
(cherry picked from commit 47eaf29745d339e3d18df3f5944c9be533037ad2)
Reviewed-on: https://gerrit.instructure.com/5192
Reviewed-by: Jon Jensen <jon@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
 2011-08-22 13:20:39 -06:00
Bracken Mosbacker 3e66b02684 prevent wiki title uniquefying from making the title too long 
closes #4861

Change-Id: I200c0a0caad8fda56e8824e200f943999d0b9a7c
Reviewed-on: https://gerrit.instructure.com/5140
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
 2011-08-22 08:22:30 -06:00
Zach Wily fe8ddb3f5e quotify and linkify messages in conversations 
This is basically a port of TextHelper#format_message to coffeescript.

Change-Id: Id96d0db04d8aff1e6fd86f8e4c9f58777208d768
Reviewed-on: https://gerrit.instructure.com/5191
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-08-21 09:19:54 -06:00
Jon Jensen 274f8880ad faculty note support in new inbox 
also pull in course/group user so we can use it in the future

Change-Id: I34c2aea2fea9b56c988d4903fb2fcf32d96d4f10
Reviewed-on: https://gerrit.instructure.com/5190
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
 2011-08-20 19:58:53 -06:00
JT Olds b77558c281 fixing some conversations slides language 
Change-Id: I7076b080cf67fb74b202521a7c318e7a0b202c25
Reviewed-on: https://gerrit.instructure.com/5187
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Zach Wily <zach@instructure.com>
 2011-08-20 13:49:57 -06:00
Jacob Fugal 2c05a6948f fix some whitespace in conversation emails 
Change-Id: I4ae5587df2d1cce27f932c714e668a188152df79
Reviewed-on: https://gerrit.instructure.com/5183
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-08-20 13:43:38 -06:00
Jon Jensen e4b907bf7f fix direct file downloads 
Change-Id: I287499027fa72aa64ed5f08d105a8185c5bf84b6
Reviewed-on: https://gerrit.instructure.com/5186
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
 2011-08-20 12:54:57 -06:00
Jon Jensen c10689608f fix adding recipients in firefox 
Change-Id: I28203697f87e8a71d624153937791d355bb7813c
Reviewed-on: https://gerrit.instructure.com/5184
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
 2011-08-20 08:59:31 -06:00
Jon Jensen 46fbd65c0b Merge remote-tracking branch 'origin/dev/conversations' 
Conflicts:
	app/models/course.rb
	app/views/context/inbox.html.erb

Change-Id: I62c650ebd0bb20dd1f0a9a43843bf7f8d0b86c83
 2011-08-20 08:22:14 -06:00
Jacob Fugal 64ed879371 put in name, subject, and fake body for Added To Conversation notification 
Change-Id: Ia194aac3984805ff91b7600023f8a4b915ddff7e
Reviewed-on: https://gerrit.instructure.com/5180
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
 2011-08-20 07:55:55 -06:00
Jon Jensen ccbf57557d fix notification pref migration 
Change-Id: Iae2a29bed902a4868a64032c02fae9493445fc0b
Reviewed-on: https://gerrit.instructure.com/5179
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
 2011-08-20 07:54:51 -06:00
Jacob Fugal 4cd8c194c4 compiled js for 59f29a6 
Change-Id: I6f0afaeaa91d547422a7617b982a42df6e1a4b08
Reviewed-on: https://gerrit.instructure.com/5181
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Zach Wily <zach@instructure.com>
 2011-08-20 07:53:03 -06:00
Jacob Fugal 59f29a6d69 scope I18n in slideshow tooltips 
Change-Id: I88d4e27580cf3e494a2727332e44e0c05528795b
Reviewed-on: https://gerrit.instructure.com/5178
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Zach Wily <zach@instructure.com>
 2011-08-20 07:28:36 -06:00
Jacob Fugal 37817f556b bigger text in convo intro 
Change-Id: I035eaa456da438233f17ebf300f9527079c7a10d
Reviewed-on: https://gerrit.instructure.com/5177
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Jacob Fugal <jacob@instructure.com>
 2011-08-20 07:23:00 -06:00
Zach Wily e9fa9a93c9 don't include generated locales for now 
Change-Id: Idd644d11aae6b2b6c3359666791cd3f7c24d501a
Reviewed-on: https://gerrit.instructure.com/5176
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
 2011-08-20 00:45:54 -06:00
Jacob Fugal fd73d326ef fix peer reviews 
Change-Id: Ifa1f3f6b590b60692e2eb3d5904fa3e12a18dc37
(cherry picked from commit 37eb50486825168fdc3eb28cca164ed8d7a17755)
Reviewed-on: https://gerrit.instructure.com/5175
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Jacob Fugal <jacob@instructure.com>
 2011-08-20 00:23:08 -06:00
Jacob Fugal 834e38eaa1 conversations intro slideshow 
Change-Id: Icb3be1ae4f33b374c5f3eafc4c30aa9c8e3ef2ad
Reviewed-on: https://gerrit.instructure.com/5152
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
 2011-08-19 23:31:40 -06:00
Jon Jensen b22cb8f247 get rid of hover transition 
Change-Id: Ifa1769256c787480b2c3faeeb9c7eba88af929cc
Reviewed-on: https://gerrit.instructure.com/5173
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-08-19 22:27:45 -06:00
Jon Jensen 1fe15404ed clear the label if all messages have been removed, fixes #5346 
Change-Id: I945a19f75ae7cb28e8acdd8489c5bbd11e831238
Reviewed-on: https://gerrit.instructure.com/5172
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-08-19 22:10:08 -06:00
Jon Jensen 2b19f29615 don't select the current message when "New Message" is clicked 
Change-Id: I48a481c4447769b5be687d1f726333e9474db13f
Reviewed-on: https://gerrit.instructure.com/5171
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-08-19 22:09:38 -06:00
Jon Jensen 310ce6aba4 fix some display issues w/ long names and context lists 
Change-Id: Id52975c8a5e60f4069ad50e9ab24e323874886dc
Reviewed-on: https://gerrit.instructure.com/5168
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-08-19 22:09:08 -06:00
Zach Wily c03baf48f8 make the message actions panel slide up and down 
Change-Id: Ibe4299b371a0d48a645685bd81b6a937b680342f
Reviewed-on: https://gerrit.instructure.com/5167
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Zach Wily <zach@instructure.com>
 2011-08-19 17:00:21 -06:00