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

1115 Commits

Author SHA1 Message Date
Jacob Fugal 971979a7ce localize Plugins 
Change-Id: Ia1931439e12f502ffed7da16ee0c1c8df7e1bb68
Reviewed-on: https://gerrit.instructure.com/4260
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
 2011-06-17 09:44:25 -06:00
Zach Wily 52dbe5f1ae clean up account reports page 
Change-Id: I36a49d13ca494845734e8f078fb320923609449e
Reviewed-on: https://gerrit.instructure.com/4262
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
 2011-06-17 09:32:47 -06:00
Zach Wily 790f951135 wiki pages i18n 
Change-Id: I71474f36823d1a2e641ab9abea0e5973edae77dc
Reviewed-on: https://gerrit.instructure.com/4146
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
 2011-06-17 09:32:36 -06:00
Brian Palmer 739a1e54c1 fix some orderings in submission api specs 
Change-Id: Ia53298d4e402e174091406ee1b8357550a3a0ab9
Reviewed-on: https://gerrit.instructure.com/4261
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-06-17 08:38:16 -06:00
Jacob Fugal 006d1a34ea localize PageComments 
Change-Id: Ic5b295599ca14d373451dd9bb6728de5aed6614a
Reviewed-on: https://gerrit.instructure.com/4256
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
 2011-06-17 08:28:33 -06:00
Jon Jensen c91d187650 fix some more i18n issues 
Change-Id: Ib3e28b526336c5ae0781e38838bd40b39b710fe6
Reviewed-on: https://gerrit.instructure.com/4255
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
 2011-06-16 16:49:28 -06:00
Brian Palmer a7f520ad87 treat html_safe as a "superset" of markdown_safe 
You can't have a string that's both markdown_safe and html_safe, so
without this change you can't have a substitution with html in it.

Change-Id: I0f121c5dbfffd1035f937977d2bdb0851a66c320
Reviewed-on: https://gerrit.instructure.com/4251
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
 2011-06-16 16:15:29 -06:00
Bracken Mosbacker 47b53a02bd make some qti importer adjustments for moodle-produced qti 
closes #4810

Change-Id: Ib05b54c5892dba7f16525ea141a2166a3607fe91
Reviewed-on: https://gerrit.instructure.com/4123
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
 2011-06-16 15:20:13 -06:00
Cody Cutrer 6d7a5abbcf i18n collaborations 
Change-Id: Id300f665039f13f27f4300da7ba75753367fdbf6
Reviewed-on: https://gerrit.instructure.com/4243
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
 2011-06-16 15:02:30 -06:00
Cody Cutrer 3ecdbd0251 i18n calendar 
Also, keyboard shortcuts are borken, but that problem already existed prior
to this change.

Change-Id: I891ba4192f6a4a98613c89df10cd97b7cc762c18
Reviewed-on: https://gerrit.instructure.com/4240
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
 2011-06-16 15:02:23 -06:00
Brian Palmer 46d5349155 fix send_to_inbox for submission comments, closes #4898 
Change-Id: I46fa01a07074e2e1719b526c09a56a736404c565
Reviewed-on: https://gerrit.instructure.com/4248
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-06-16 13:20:30 -06:00
Cody Cutrer 708e6f5b63 i18n content_exports 
Change-Id: Id1efda0c4516121382164da117d21daaf92f5409
Reviewed-on: https://gerrit.instructure.com/4246
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
 2011-06-16 13:13:31 -06:00
Cody Cutrer 3aab3fdf47 i18n communication channel 
Change-Id: Ida1b226a9364f534d77319c691d8ca6b1088702f
Reviewed-on: https://gerrit.instructure.com/4245
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
 2011-06-16 13:13:15 -06:00
Zach Wily e91b0589f6 fix reordering items in modules; fixes #4894 
Change-Id: Ie579805a67cddc4a834f626cac8ef4a414df3e72
Reviewed-on: https://gerrit.instructure.com/4247
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
 2011-06-16 13:02:39 -06:00
Zach Wily 66cdce18fe fix adding account admins; fixes #4885 
Change-Id: I2dc97e3a214e66cd960496bac872ed4781060c4b
Reviewed-on: https://gerrit.instructure.com/4242
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
 2011-06-16 12:52:04 -06:00
Jon Jensen 941e77f92b fix some key scoping/collision issues 
Change-Id: Id092de2ccacd40296af0c73dfd6b9c52315d6ec6
Reviewed-on: https://gerrit.instructure.com/4239
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
 2011-06-16 09:57:01 -06:00
Brian Palmer 858e281322 i18n context_module 
Change-Id: I061822cba6216ddd401118a21f636492e57411a6
Reviewed-on: https://gerrit.instructure.com/4199
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
 2011-06-16 09:09:01 -06:00
Brian Palmer f4110b4be3 i18n context views 
Change-Id: Ifb5e0e1ec99ea20da59c2e30c4744192d46d6cfa
Reviewed-on: https://gerrit.instructure.com/4174
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-06-16 09:08:50 -06:00
Brian Palmer 284dcfb7e3 don't use highest priority for send_at delayed jobs 
Change-Id: I291b55704bb58b0363491a6400d18da034ae004a
Reviewed-on: https://gerrit.instructure.com/4209
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-06-16 09:08:30 -06:00
Brian Palmer 543b3d1b8b remove delayed_jobs controller, replaced by jobs controller 
Change-Id: I114d305b7b72fed73373ba40dd01830f2411bb6b
Reviewed-on: https://gerrit.instructure.com/4202
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
 2011-06-16 09:08:14 -06:00
Brian Palmer 8a879e63e0 html escape the translated string in mt, rather than use RDiscount html stripping 
this lets us use wrappers and stuff with markdown

Change-Id: Ia0f778df30ca17d3b734f0ec52b295d237e6517e
Reviewed-on: https://gerrit.instructure.com/4231
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
 2011-06-16 09:01:19 -06:00
JT Olds cfab93c9b5 notification category i18n reminders 
Change-Id: I034fa38e582f862df27a60c689d592ffff8fa26f
Reviewed-on: https://gerrit.instructure.com/4224
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
 2011-06-16 08:49:40 -06:00
JT Olds 840ff3106f notifications i18n (everything but categories) 
Change-Id: I7c9e2923bc27f397ecfbe68de963300f90919ab3
Reviewed-on: https://gerrit.instructure.com/4233
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
 2011-06-16 08:43:12 -06:00
JT Olds 61f3d6154c adding require_relative to gemfile 
Change-Id: I959621adb8dff53627c07e66e402d2921220b1b4
Reviewed-on: https://gerrit.instructure.com/4220
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-06-16 08:42:55 -06:00
JT Olds 5cd6d3b679 make non-sis crosslisting sticky 
if a user crosslists via the ui, we don't want the SIS to blow away those
changes. fixes #4840, refs #4815

Change-Id: Ia3f844b3a33d9c9a6e9433dc79ce74e433f1f389
Reviewed-on: https://gerrit.instructure.com/4162
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-06-16 08:42:46 -06:00
JT Olds 4bbeacce99 set enrollment restriction to course/section dates when provided 
closes #4832

Change-Id: I204a00863d7c85c1e4c8489d1dc367e99bcffde6
Reviewed-on: https://gerrit.instructure.com/4156
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-06-16 08:42:36 -06:00
Brian Palmer 3065f0e3ba remove periodic job double-indirection 
Now that that the block passed as a periodic jobs is already running as
a delayed job, it's pointless to just turn around and schedule another
delayed job inside the block.

Also make periodic jobs default to low priority and force max_attempts =
1.

Change-Id: Ib453df3cdecca2fcaddf70ee8d2ef731e7f1d65b
Reviewed-on: https://gerrit.instructure.com/4210
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-06-16 08:39:04 -06:00
Brian Palmer 99ad305b3d search by strand in jobs admin ui 
Change-Id: Ib278449e16128a840425d4a6aeb2d5c1be5fa690
Reviewed-on: https://gerrit.instructure.com/4208
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-06-16 08:37:50 -06:00
Jon Jensen edcefd9299 remove sti and controller action scoping 
also fixed a couple dup key issues and other weirdness

Change-Id: I48272a136783c95819de3863f05be4250a4a6102
Reviewed-on: https://gerrit.instructure.com/4223
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-06-16 08:25:51 -06:00
Cody Cutrer 9d17a0de72 i18n CalendarEvent 
Change-Id: I36a1c42266088eb4171e676e7db8b8c953ef03fa
Reviewed-on: https://gerrit.instructure.com/4236
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-06-16 07:36:55 -06:00
Cody Cutrer 758d1662de i18n files part 2 
Change-Id: Id0fe7c86f355f2645c36249637c010a03c67cec4
Reviewed-on: https://gerrit.instructure.com/4226
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-06-16 07:18:28 -06:00
Cody Cutrer 85e3241634 i18n Bookmark Service 
Change-Id: Ice0ef335b58fc94c19081ad3049188be43347a88
Reviewed-on: https://gerrit.instructure.com/4227
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
 2011-06-16 07:16:10 -06:00
JT Olds ad73ec523d learning_outcomes i18n 
Change-Id: I222c662ec6163c9d38bc71558debdad8e048c488
Reviewed-on: https://gerrit.instructure.com/4221
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
 2011-06-15 17:30:41 -06:00
Jon Jensen 7eccbc5754 fix some i18n typos 
Change-Id: I42a32846e63db72ef6b8585fff7f4d2bfc9ae65f
Reviewed-on: https://gerrit.instructure.com/4232
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
 2011-06-15 17:17:06 -06:00
Jon Jensen d9b1f09325 fix various typos and i18n issues 
Change-Id: I13abb4d1ff5fa81414ba6c35d0d6d3bf0beb1490
Reviewed-on: https://gerrit.instructure.com/4219
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
 2011-06-15 15:39:08 -06:00
JT Olds c567ff64fe support running specs in parallel 
Change-Id: I521adc994f5f2bd58099a89315468111435dbbf8
Reviewed-on: https://gerrit.instructure.com/4218
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
 2011-06-15 15:18:42 -06:00
JT Olds 7af31d40e8 fix the teacherless getting started wizard 
Change-Id: I1f84ad5db4bd34cee5ebcd54d8e00eef80698c47
Reviewed-on: https://gerrit.instructure.com/4211
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
 2011-06-15 15:18:03 -06:00
JT Olds 17f75954aa getting started i18n 
Change-Id: I46273d11738a5fe74174017f78adc9658757233b
Reviewed-on: https://gerrit.instructure.com/4153
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
 2011-06-15 15:17:55 -06:00
Cody Cutrer ef719f39a6 i18n attachments/files part 1 
Change-Id: Ic8b08c237a50b15cd9cc489a98929063c56d50d7
Reviewed-on: https://gerrit.instructure.com/4216
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
 2011-06-15 15:00:40 -06:00
Cody Cutrer eec1d7b9ee i18n AssignmentGroup 
Change-Id: If4473d2dec548f581482aa22e85c582e1be1d78b
Reviewed-on: https://gerrit.instructure.com/4192
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
 2011-06-15 15:00:35 -06:00
JT Olds 22986cd5b9 discussion_topics javascript i18n wasn't scoped 
Change-Id: I9403f7ee25fbbdb4cf7a45ab4ac89d92e4d72d3d
Reviewed-on: https://gerrit.instructure.com/4212
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
 2011-06-15 13:27:02 -06:00
Jacob Fugal ef7c7a1cf8 localize DelayedNotification and Enrollment 
Change-Id: I7632abbd80481156069fb6deba3cb85cbebbc517
Reviewed-on: https://gerrit.instructure.com/4151
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
 2011-06-15 13:01:55 -06:00
Cody Cutrer 4d26143442 assignment views, part 2 
Change-Id: I653ae26badfeb5dbad053eb88d0bec0270656397
Reviewed-on: https://gerrit.instructure.com/4180
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
 2011-06-15 10:59:17 -06:00
Bracken Mosbacker 2f6b3b13fe don't allow quiz results to be shown when unchecked 
There are two check boxes on the quiz page about showing
quiz results. One of them is a sub-checkbox to the
other. When you unchecked the primary checkbox the sub-box
wasn't unchecked thus the property was still set to true

closes #4874

Change-Id: Id3710b3acf4c2c5cda58f8e153649b71541b27dc
Reviewed-on: https://gerrit.instructure.com/4215
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
 2011-06-15 10:58:38 -06:00
Brian Palmer 1e635d0133 fix syntax errors in twitter_user_poller 
Change-Id: I5a71c81125eb51e9deb89e8f46e7f098b30f19f1
Reviewed-on: https://gerrit.instructure.com/4213
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
 2011-06-15 10:43:57 -06:00
Jon Jensen 91ce600f3b remove unused view 
Change-Id: I3f5c804e169ba1e77f79d8c33fee4d548b6f4f0a
Reviewed-on: https://gerrit.instructure.com/4207
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
 2011-06-15 09:37:27 -06:00
Jon Jensen d5b7d8af32 fix a couple i18n typos 
Change-Id: Ic3cc1027ea318c5110abc2f242b23b0e9e39c6c9
Reviewed-on: https://gerrit.instructure.com/4206
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
 2011-06-15 09:29:13 -06:00
Jon Jensen b9afedc0a5 i18n for layouts 
Change-Id: I512a95a36128264d2365fc58f3c969c07d368d92
Reviewed-on: https://gerrit.instructure.com/4195
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
 2011-06-14 17:01:26 -06:00
Brian Palmer 5eb9157bcd i18n course_section 
Change-Id: I69dc7cbe1300b74918c7d34b8bad78177ad4befc
Reviewed-on: https://gerrit.instructure.com/4200
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
 2011-06-14 16:24:52 -06:00
Brian Palmer c370d5b74c i18n context_message 
Change-Id: Ib33f51cb55f1f856ef52794fccef04cc07233710
Reviewed-on: https://gerrit.instructure.com/4198
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
 2011-06-14 16:24:43 -06:00