Commit Graph

72 Commits

Author SHA1 Message Date
Brian Palmer 9c8c2939bd fix truncate_html for nokogiri 1.5.0
A bug in the upgraded nokogiri library was causing nil access errors
when trying to truncate html.

See https://github.com/tenderlove/nokogiri/issues/595

test plan: Send a discussion topic message to the dashboard that is more
than 50 words long. verify that it is truncated with ..., and no error
is generated.

Change-Id: I35523d125e50beac82ed8cf7214a64d6ce0d7001
Reviewed-on: https://gerrit.instructure.com/7989
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2012-01-11 09:29:23 -07:00
Jon Jensen a41081cf22 fix dashboard notifications for appointments
display stream items for new and updated appointment groups, as well as
when someone signs up another user (e.g. group signup)

removed unused message templates, fixed date_string range to just show a
single date if date parts are the same

test plan:

1. publish an appointment group and ensure all pertinent students get a
dashboard notification
2. add times to an appointment group and ensure all pertinent students
get a dashboard notification
3. sign up a group for a timeslot and ensure all other group members
get a dashboard notification

Change-Id: Id0dec52c0376fb6e14b0f26bb60e4695b25f7591
Reviewed-on: https://gerrit.instructure.com/7938
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2012-01-10 13:40:25 -07:00
Jon Jensen 80c90587d6 calendar and scheduler apis; refs #3395
Change-Id: I0bafb21630086ff2a99b8b881568bff51afabedc
Reviewed-on: https://gerrit.instructure.com/7823
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2012-01-06 12:35:27 -07:00
Jacob Fugal 399355c9dc replace usage of Date.today
Date.today does not accomodate Time.zone. This is a problem when the
time at the time of the call is between Time.zone's midnight and the
system time zone's midnight; Date.today will think it's a day
earlier/later (depending on direction of offset) than Time.zone.today in
that case.

Change-Id: I54083d26dcf704ac00d812597ee6aec95ffa0685
Reviewed-on: https://gerrit.instructure.com/7584
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-12-20 15:25:45 -07:00
Zach Wily bc0b1f6f62 truncate text to max bytes; fixes #5881
Change-Id: I7d4226d575a508d23c32fe59fabc0e5dd820a2b2
Reviewed-on: https://gerrit.instructure.com/6043
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-10 08:30:19 -06:00
Cody Cutrer 6ad5852d11 provide more helpful access denied messages for students. fixes #5517
Change-Id: Icaf643ad6cc94a8414dab9ce4d35e110db9b6d85
Reviewed-on: https://gerrit.instructure.com/5992
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Mark Suman <marks@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-10-07 15:41:44 -06:00
Brian Palmer 60aa7baf5e add encoding magic comments to files with utf-8 chars
Change-Id: Ieba9245724da8aeeb816d7f178bb704b3dcda80f
Reviewed-on: https://gerrit.instructure.com/5832
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-09-27 10:27:35 -06:00
Jon Jensen be9dd5671a lock down linkification
Change-Id: Ice456817a8fff4ec3b3e61880fbc6594ab825ab0
Reviewed-on: https://gerrit.instructure.com/5350
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-08-30 16:55:06 -06:00
Jacob Fugal 69d13cb200 localize PageViews
Change-Id: I22451fe3adedbd893aa3b1a70b21954f9e64b928
Reviewed-on: https://gerrit.instructure.com/4257
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-06-24 10:40:14 -06:00
Cody Cutrer e5ec8c6462 fix mt inlinify for multiple inline tags
Change-Id: Ic254eba25a318dc89e7bc11bd66949391be312f6
Reviewed-on: https://gerrit.instructure.com/4307
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-06-21 14:38:15 -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 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
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
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 23d215c460 don't call TimeWithZone directly
rails docs discourage the use of ActiveSupport::TimeWithZone.new

Change-Id: I6310ea3a5d29fd1dabd9f0be7a3385564cf011d3
Reviewed-on: https://gerrit.instructure.com/4126
Reviewed-by: JT Olds <jt@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-06-09 10:46:12 -06:00
Brian Palmer d2dedbeb9a extract strings for ContextController
Change-Id: I1f9fff665c8d3a8a653dc3b602f40f292795f3f1
Reviewed-on: https://gerrit.instructure.com/4122
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-06-09 09:35:57 -06:00
Jon Jensen 58a25bd462 preliminary i18n setup, closes #4124
* i18n key scoping for controller/model/js/etc.
 * inline English translation support
 * rdiscount gem for markdown'ed translations
 * html_safe interpolation tweaks
 * label helpers
 * crummy tweak to translate symbol keys
 * internationalized most of lib, and some plugins/messages
 * conference i18n (view/model/controller/js)

Change-Id: I42772b9e19a110efbe855dc83a681be49ec98df2
Reviewed-on: https://gerrit.instructure.com/4080
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-06-06 14:19:03 -06:00
Cody Cutrer 63bad32df0 Handle incoming mails. Closes #4016.
* Uses Mailman gem
 * Can be configured for POP3, Maildir, or stdin (push from mailserver)
 * Maildir can be chained with fetchmail or similar to support IMAP
 * Can be run as part of the job server, or as a separate process

Change-Id: I000000000000000000000000000001
Reviewed-on: https://gerrit.instructure.com/2971
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-07 10:46:11 -06:00
Brian Palmer c14f66f81a correctly truncate text that contains MB chars, fixes #4135
TextHelper#truncate_html doesn't appear to have this issue, because it
always splits and truncates on word boundaries (using String#split()).

Change-Id: I8bf301055818d7080d8e12859707458ba41e89f4
Reviewed-on: https://gerrit.instructure.com/2851
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-29 10:07:59 -06: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
Zach Wily 03c4e204f2 make sure that the truncated html strings are not escaped
fixes #3677

Change-Id: Id758d0c21fd6dabf078e5f5a7a0ba7547f496013
Reviewed-on: https://gerrit.instructure.com/2089
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-02 11:03:58 -07:00
Brian Whitmer 8b8173dcc9 Initial commit.
closes #6988138
2011-01-31 18:57:29 -07:00