Commit graph

9214 commits

Author SHA1 Message Date
Peter N Lewis
d0ebdea5fa Honor email_always even if notification has been read
Even if the notification has been read, send it by email if user has enabled email_always
2014-06-06 21:16:41 +08:00
Peter N Lewis
0af1242aa8 Use an appropriate name in the Reply-To header
Use "Site Name <>" for the Reply-To header when the reply is to the site or a public topic.

Use "username <>" for the Reply-To header only when the reply is to a private message topic.
2014-06-06 21:09:00 +08:00
Sam
cc1bbf3a7b BUGFIX: cut up line while searching in chrome mac 2014-06-06 17:15:14 +10:00
Peter N Lewis
6a2dde6417 Bugfix: Mailing list mode disables PM emails
Emailing a PM uses the user_posted event/format, but Mailing List Mode disables emails with this format.

We work around this by temporarily using "postedprivate", and then reverting back to "posted" efter the Mailing List Mode check.
2014-06-06 15:04:33 +08:00
Sam
41b15d1ad1 BUGFIX: not notifying unread and new counts correctly 2014-06-06 15:17:02 +10:00
Sam
3767080f3b Added rake task to normalize code 2014-06-06 14:08:39 +10:00
Sam Saffron
d97ceb1d72 FEATURE: log_out endpoint for admins 2014-06-06 13:02:52 +10:00
Sam Saffron
05ca1e6e46 Added code block normalization routing for import 2014-06-06 10:34:21 +10:00
Jeff Atwood
544e7b999e Merge pull request #2419 from adamloving/patch-1
Heroku Readme: Add instructions to add postgres
2014-06-05 15:31:21 -07:00
Adam Loving
b33a6e363b Add instructions to add postgres
heroku addons:add heroku-postgresql
2014-06-05 14:55:33 -07:00
Jeff Atwood
221fc2aef4 Merge pull request #2417 from adamloving/doc-fixes
Minor fixes to documentation and comments
2014-06-05 14:49:59 -07:00
Jeff Atwood
c27e70849e Merge pull request #2418 from kevinreese/master
restore bg-color for New Topic / New Post rows of Topic-List Categories
2014-06-05 14:46:50 -07:00
Robin Ward
97715b33d5 FIX: Composer wasn't displaying errors correctly. The fix is a hack
around our weird view structure that we need to fix.
2014-06-05 17:06:42 -04:00
Neil Lalonde
cc257e1f5c Boolean site settings don't save immediately 2014-06-05 17:02:15 -04:00
Neil Lalonde
e114e47533 FIX: enum site settings UI was broken 2014-06-05 16:42:37 -04:00
Robin Ward
651def63e5 Return the current user's custom fields 2014-06-05 16:16:45 -04:00
Neil Lalonde
f085770ed4 Import scripts: add update_feature_topic_users 2014-06-05 15:31:05 -04:00
Neil Lalonde
9bd76b0c16 Import scripts: relax our posting rules before the import starts 2014-06-05 15:31:05 -04:00
Robin Ward
6ae7d48fd1 FIX: Make sure the context of plugin outlets is correct 2014-06-05 15:20:55 -04:00
Robin Ward
e65283ecf5 ES6: Convert a view, adds a backwards compatibility layer with
deprecations for the old view helper names.
2014-06-05 15:09:20 -04:00
Kevin Reese
49ef3958c5 restore bg-color for New Topic / New Post rows in Topic-List Categories table 2014-06-05 11:58:20 -07:00
Neil Lalonde
2f706d084f FIX: in import scripts, don't generate names for users based on their emails. It's basically the same as publicizing their emails. 2014-06-05 14:15:52 -04:00
Robin Ward
7bb33c28c2 Add new max_width feature for oneboxes. Allows vimeo oneboxes to not
look like total garbage.
2014-06-05 13:18:18 -04:00
Adam Loving
5e57ff485c Update development docs regarding SMTP 2014-06-05 09:52:49 -07:00
Adam Loving
3f1c5bef00 spelling in comment 2014-06-05 09:52:35 -07:00
Adam Loving
efcd6396cf fix route in comment 2014-06-05 09:52:01 -07:00
Régis Hanol
c46b7f6181 TRIVIAL: ES6ify AppEvents 2014-06-05 18:51:39 +02:00
Régis Hanol
2cb6bec014 BUGFIX: progress bar was hidden when the composer was open - TAKE 2 2014-06-05 18:39:26 +02:00
Neil Lalonde
04e94bec5f Mobile: on a post, put username, name, and title on their own lines beside the author avatar 2014-06-05 12:32:48 -04:00
Neil Lalonde
a3c148407c Mobile: don't show edit reason and in reply to details in composer 2014-06-05 12:09:08 -04:00
Neil Lalonde
bd92291b26 When javascript disabled, add category links to topic list and topic page 2014-06-05 11:14:06 -04:00
Robin Ward
06965a999e Use replaceWith in order to not break the back button. 2014-06-05 10:18:31 -04:00
Régis Hanol
222e13e5cc Merge pull request #2416 from ligthyear/min-max-params
add min_posts, max_posts to filter the topic list queries
2014-06-05 15:51:06 +02:00
Benjamin Kampmann
6b3d5c7348 add min_posts, max_posts to filter the topic list queries
superseeds #2412
2014-06-05 15:30:24 +02:00
Sam
a4de1f25c1 Fix broken tests 2014-06-05 21:16:36 +10:00
Jeff Atwood
17dbc568c8 why did topic-excerpt have 50px padding? 2014-06-05 04:00:50 -07:00
Régis Hanol
425526d3fb BUGFIX: fix post highlight 2014-06-05 12:31:29 +02:00
Jeff Atwood
d3035b9405 gutter needs more left-margin 2014-06-05 03:07:42 -07:00
Jeff Atwood
3dd61a2056 f**ing bootstrap, span5 = .gutter 2014-06-05 02:57:56 -07:00
Jeff Atwood
f245da5142 f**ing bootstrap, span11 = .embedded-posts body 2014-06-05 02:29:56 -07:00
Jeff Atwood
972d58b876 consolidate post-column into topic-body 2014-06-05 02:02:27 -07:00
Jeff Atwood
3ed8b8f155 f**ing bootstrap, span2 = topic-avatar 2014-06-05 01:42:27 -07:00
Jeff Atwood
48f58eff1d tweak gutter width a bit 2014-06-05 01:15:06 -07:00
Jeff Atwood
8185fe0097 correct reply-to-tab offsets, based on .row? 2014-06-05 01:00:22 -07:00
Jeff Atwood
80a862c358 f**ing bootstrap, span14 = post-column 2014-06-05 00:34:57 -07:00
Sam
e7991cb803 FEATURE: search highlighting within topic
BUGFIX: fixed hiding of the search dialog when navigating within a topic
2014-06-05 17:03:53 +10:00
Jeff Atwood
96fc5addc4 fix some CSS color issues 2014-06-04 23:33:58 -07:00
Sam
c8a0994f24 Remove aggressive highlighting 2014-06-05 14:45:53 +10:00
Sam
f1a28d62a3 FEATURE: support registration of custom html by plugins 2014-06-05 11:39:33 +10:00
Sam
8ec9288a5c BUGFIX: not showing tooltips correctly 2014-06-05 10:55:45 +10:00