Commit Graph

3052 Commits

Author SHA1 Message Date
Régis Hanol f7432d8ec9 FEATURE: add support for multiple incoming emails for groups & categories 2016-02-24 19:47:58 +01:00
Régis Hanol 54262cc9b2 FIX: properly handle invalid from header 2016-02-24 17:40:57 +01:00
Régis Hanol c3a393a11f let's try with 'normal' linebreaks 2016-02-24 15:16:29 +01:00
Régis Hanol 999e7ac4bc FIX: newlines around attachments in received emails 2016-02-24 11:38:12 +01:00
Régis Hanol 415efd0f5b FIX: staged user doesn't get notified for replies in topics they created in secured categories 2016-02-24 11:30:17 +01:00
Sam 833af461ab FIX: stop using regex to detect mentions 2016-02-24 17:47:55 +11:00
Sam 4ce870c17f Merge pull request #4031 from rriemann/support_hyphen_in_mentions
fix: support for hyphens in group name
2016-02-24 17:21:56 +11:00
Sam 3c072cdfc9 Merge branch 'master' of github.com:discourse/discourse 2016-02-24 13:53:43 +11:00
Robert Riemann 9c39647cd2 fix: support for hyphens in group name
The group mention @ORG-team triggers notifications for the group @ORG. This fix changes the RegExp, so that the group name is correctly extracted.

see: https://meta.discourse.org/t/group-mentions-that-begin-with-the-same-characters-may-be-incorrect/39892/12?u=rriemann
2016-02-23 23:55:31 +01:00
Robin Ward ee1aec6766 Merge branch 'vdom' 2016-02-23 15:30:40 -05:00
Neil Lalonde eb87cffa13 FEATURE: Category/topic importer skips objects that it has already imported. 2016-02-23 12:19:08 -05:00
Guo Xiang Tan f2db1a27cf FIX: Make sure we write inside a lock. 2016-02-23 12:10:25 -05:00
Guo Xiang Tan 8dad58ba78 FIX: N+1 query on topics view page. 2016-02-23 12:10:25 -05:00
Guo Xiang Tan c344bd3fd1 FIX: Make sure we write inside a lock. 2016-02-23 23:25:59 +08:00
Guo Xiang Tan ced86aa890 FIX: N+1 query on topics view page. 2016-02-23 16:22:40 +08:00
Sam Saffron d0a86f8032 Merge branch 'master' into vdom 2016-02-23 15:58:46 +11:00
Sam 1f81d2f178 Merge branch 'master' of github.com:discourse/discourse 2016-02-23 10:34:57 +11:00
Sam 32c681c96b annotate models 2016-02-23 10:33:53 +11:00
Gerhard Schlager 8481548def FIX: Load fallback locales after reloading translations 2016-02-22 22:48:56 +01:00
Gerhard Schlager 80c9fa4dca FIX: Load translation overrides for more than one locale 2016-02-22 22:48:56 +01:00
Gerhard Schlager 2e875d3cca FIX: Use fallback locales when searching for translations 2016-02-22 22:48:55 +01:00
Robin Ward 026bba1876 Merge branch 'master' into vdom 2016-02-22 15:28:07 -05:00
Régis Hanol 5415b2666d FIX: staged users couldn't create new topic in a private category via email 2016-02-22 19:57:53 +01:00
Neil Lalonde 1b9b68cb51 Version bump to v1.5.0.beta11 2016-02-22 11:27:35 -05:00
Sam c404da248a Merge branch 'master' into vdom 2016-02-22 12:20:59 +11:00
Gerhard Schlager c4ec1d0fcf FIX: Don't suggest invalid username 2016-02-21 23:28:57 +01:00
Sam b9bcdb984a Merge branch 'master' into vdom 2016-02-18 16:57:40 +11:00
Sam f0e942f647 PERF: move 3 more option columns out of the user table 2016-02-18 16:57:22 +11:00
Sam b11e6ec38e Merge branch 'master' into vdom 2016-02-18 13:20:55 +11:00
Régis Hanol 52a6682690 FIX: don't create an EmailLog when we can't send a digest 2016-02-17 17:31:46 +01:00
Régis Hanol 8893d711e0 FEATURE: new pop3 polling configuration admin dashboard check 2016-02-17 11:25:49 +01:00
Sam e8f76c335a Merge branch 'master' into vdom 2016-02-17 18:10:12 +11:00
Sam bbbb09a6fb FEATURE: start tracking information about migrations that run
This commit adds a new tracking table that lets us know

- When a migration ran
- What version Discourse was at
- How long it took
- What version Rails was at

The built in tracking in Rails is very limited, does not track this info
2016-02-17 18:08:25 +11:00
Sam 3829c78526 PERF: shift most user options out of the user table
As it stands we load up user records quite frequently on the topic pages,
this in turn pulls all the columns for the users being selected, just to
discard them after they are loaded

New structure keeps all options in a discrete table, this is better organised
and allows us to easily add more column without worrying about bloating the
user table
2016-02-17 18:08:25 +11:00
Robin Ward 3ea1f88cdc Merge branch 'master' into vdom 2016-02-16 11:48:42 -05:00
Régis Hanol c33a6ddfed Merge pull request #4009 from ebernhardson/export_category_filename
Take filename to write to as optional parameter to export_category
2016-02-16 10:53:22 +01:00
Sam 18d67851c0 Merge branch 'master' into vdom 2016-02-16 11:53:14 +11:00
Régis Hanol 4ad5660615 add slightly more logs when skipping email notifications 2016-02-15 17:53:07 +01:00
Sam b878598418 Merge branch 'master' into vdom 2016-02-13 17:49:50 +11:00
Sam b1e68390f4 FIX: false overrides should be permitted via ENV 2016-02-13 17:49:26 +11:00
Erik Bernhardson 48cb386d58 Take filename to write to as optional parameter to export_category
My discourse instance will be making regular automated public backups
of specific categories. It's preferred to be able to directly control
the path and filename of the output, rather than letting discourse
choose for me. This was already mostly supported, a filename parameter
just needed to be passed through the cli app.
2016-02-12 22:02:29 -08:00
Neil Lalonde 3939b9ec7d FIX: restore in development mode connects to the wrong database 2016-02-12 17:20:38 -05:00
Sam f02e035f94 Merge branch 'master' into vdom 2016-02-12 18:21:03 +11:00
Guo Xiang Tan b0d2e69cc3 FIX: Update log level to warn. 2016-02-12 15:18:34 +08:00
Sam 06403df059 Merge branch 'master' into vdom 2016-02-12 17:51:44 +11:00
Régis Hanol 86819f08c3 FIX: use RFC-compliant previous replies separator 2016-02-11 18:48:09 +01:00
Robin Ward d1e85bdd8b FEATURE: Use virtual dom framework for faster post rendering 2016-02-11 11:00:40 -05:00
Régis Hanol 3bf931ce54 FIX: should have been 'category_slug' 2016-02-11 16:04:40 +01:00
Régis Hanol 75a78e0518 Merge pull request #4007 from tgxworld/fix_siitesetting_not_published_to_clients
FIX: Client settings were not being published.
2016-02-11 11:51:10 +01:00
Guo Xiang Tan f2c64a3580 FIX: Client settings were not being published. 2016-02-11 17:53:30 +08:00
Régis Hanol cad7fc1062 FIX: don't allow blocked user to send emails in 2016-02-11 10:39:57 +01:00
Régis Hanol 91bb38626c FEATURE: new incoming email details modal 2016-02-10 22:00:27 +01:00
Guo Xiang Tan 39aaa181e1 FIX: Category hashtag is cooked incorrectly. 2016-02-10 17:08:57 +08:00
Sam Saffron d0dd517f27 FEATURE: blank global settings should not shadow
Due to https://github.com/docker/docker/issues/9298 it is a huge pain
to remove ENV vars when composing images, allow us to simply treat "blank"
as a ENV var that is not being shadowed. In general we always supply a
value to ENV vars we are shadowing.
2016-02-10 11:54:40 +11:00
Régis Hanol 8944d62aa6 add validator for the 'reply_by_email_enabled' site setting 2016-02-09 23:35:40 +01:00
Arpit Jalan 82a75c00c0 UX: change 'Visit Topic' to 'Visit Message' for message notification email 2016-02-09 13:39:10 +05:30
Sam Saffron b0567f9c62 FEATURE: automatically sync "move to inbox" / "archive" state on messages 2016-02-07 23:39:07 +11:00
Gerhard Schlager 89add4a4a2 JsLocaleHelper should search for moment.js locale files
moment.js uses a different naming conventions for locale files.
E.g. "zh-zn" instead of "zh_ZN" and "nb" instead of "nb_NO"

This change allows us to use the locale files without renaming which
makes future upgrades of moment.js a lot easier.
2016-02-05 21:49:03 +01:00
Gerhard Schlager 8ced8350ba Upgrade moment.js to version 2.11.2
In order to make future upgrades easier we don't rename the locale files anymore.
2016-02-05 21:42:48 +01:00
Régis Hanol 56a16a0e89 we still need md5 2016-02-05 15:27:24 +01:00
Sam Saffron e3747f654b SECURITY: hoist blocks using guids, not md5 hashes 2016-02-06 01:02:48 +11:00
Sam 0032047804 missing a bracket 2016-02-05 15:01:12 +11:00
Guo Xiang Tan 8560194abf Merge pull request #3973 from tgxworld/postgres_failover
FEATURE: AR adapter to failover to a replica DB server.
2016-02-05 11:27:40 +08:00
Guo Xiang Tan 74dc838f5f FIX: Add a lock to ensure only a single thread is running each time. 2016-02-05 10:47:47 +08:00
Sam 886273f158 FIX: when CDN assets are not in root path source maps fail 2016-02-05 13:05:47 +11:00
Guo Xiang Tan c532d7d1ae Internally `AR::Base.establish_connection` removes the current connection. 2016-02-05 08:51:50 +08:00
Guo Xiang Tan a08496bb1a Remove Concurrent::TimerTask which spawns a long lasting Thread. 2016-02-05 08:51:50 +08:00
Guo Xiang Tan 0058d09e35 Second attempt which removes any kind proxying. 2016-02-05 08:51:10 +08:00
Guo Xiang Tan 46589a1a0c FEATURE: AR adapter to failover to a replica DB server. 2016-02-05 08:51:10 +08:00
Sam 0ef141b2c3 FIX: skip jwt encoding for auth 2016-02-05 08:48:16 +11:00
Neil Lalonde eb593f568f Version bump to v1.5.0.beta10 2016-02-04 13:44:29 -05:00
Régis Hanol 7d992cb4c5 FIX: sending emails to mailing list subscribers wasn't working 2016-02-03 19:27:58 +01:00
Régis Hanol d43a693654 Merge pull request #3991 from xfalcox/patch-4
FIX: Local onebox on subfolder installs
2016-02-03 11:23:29 +01:00
Sam Saffron bc75010b20 FEATURE: suggested messages for messages
FEATURE: clicking envelope takes you to inbox

Suggested messages works somewhat like suggested topics.

- New show up first (in either group inbox or inbox)
- Then unread (in either group inbox or inbox)
- Finally "related" which are messages with same participants as the current pm.
2016-02-03 18:50:05 +11:00
Neil Lalonde 0d611ed8cb FIX: group import/export bugs in category exporter 2016-02-02 16:06:19 -05:00
Régis Hanol cf4c256b17 FEATURE: new 'raw email' modal when listing rejected emails 2016-02-01 21:41:49 +01:00
Arpit Jalan 99c4252ba6 FEATURE: Staff should be exempt from user mention limit 2016-02-01 21:19:56 +05:30
Rafael dos Santos Silva e51293d298 FIX: Local onebox on subfolder installs
This should fix oneboxing local topics when using the subfolder install feature.
2016-02-01 13:30:48 -02:00
Régis Hanol 49d1f88f6e FIX: support incoming emails with no subject 2016-02-01 12:16:15 +01:00
Régis Hanol 27aaed0aa5 FIX: don't use 'Return-Path' header to determine whether the email was auto generated 2016-02-01 10:21:58 +01:00
Régis Hanol 46b6c55197 FIX: replace 'discourse_email_parser' with 'email_reply_trimmer' to better trim replies from plain text emails
FIX: undefined method `number_to_human_size' when email contains attachments
2016-01-30 01:29:31 +01:00
Sam Saffron 1d27b33100 FIX: DistributedCache would fail serialization in some cases 2016-01-30 09:01:15 +11:00
Régis Hanol 96380bfd38 FIX: only create 1 email_log when an email is sent 2016-01-29 16:49:49 +01:00
Guo Xiang Tan 28ac5fb17c FEATURE: DiscourseEvent hook for server side markdown context. 2016-01-29 22:59:15 +08:00
Régis Hanol 7d5fdd0997 temporarily fix the build (cc @tgxworld) 2016-01-29 11:53:03 +01:00
Régis Hanol 378b7f964c Revert "FEATURE (WIP): add max-width and center email notifications" 2016-01-29 11:13:59 +01:00
Guo Xiang Tan e8c5127865 Convert to link as long as a valid link is received. 2016-01-29 13:31:11 +08:00
Guo Xiang Tan 190345ba20 Add DiscourseEvent hook when converting raw post to markdown. 2016-01-29 13:30:12 +08:00
Neil Lalonde 9331dfa63c category export: export img src with absolute urls so pull_hotlink_image can move it over later 2016-01-28 15:45:28 -05:00
Neil Lalonde 3053c1ebd8 category export: include category permissions and custom groups 2016-01-28 15:17:18 -05:00
Arpit Jalan 106e3c897f FIX: TL3 users should not be able to edit title of archived topics 2016-01-29 01:16:41 +05:30
scossar 77167f12ad move styles to Styles 2016-01-27 19:07:21 -08:00
scossar 3f09ec2aca add layout for notifications 2016-01-27 11:27:32 -08:00
Sam 7b558f959e correct tracking logic 2016-01-27 23:20:29 +11:00
Sam Saffron a764cc3a42 FEATURE: by default users track a group (as opposed to watch)
FEATURE: a rollup counting number of messages in the group inbox to tracking users
2016-01-27 21:38:33 +11:00
Guo Xiang Tan 0916007d01 Fix the build. 2016-01-27 16:04:11 +08:00
Neil Lalonde 58610d15a1 FEATURE: export/import topics and categories from one Discourse site to another. (Early-access alpha greenlight. More to do...) 2016-01-26 19:57:54 -05:00
Jeff Atwood 0337964759 a bit better email name inference 2016-01-26 16:39:02 -08:00
Neil Lalonde 0a95fee68f Version bump to v1.5.0.beta9 2016-01-25 13:40:56 -05:00
Sam ee823305a1 FIX: Allow for large free disk space
reported via @envygeeks shift multiplication of free space out of awk and into rube

awk on some systems appears to be converting stuff to floats.
2016-01-25 13:22:36 +11:00
Sam 7138b74110 Revert "FIX: disk_space should be a BigDecimal to handle large disk (closes #3923)"
This reverts commit 260d023b65.
2016-01-25 13:03:43 +11:00
Sam b3855d94f4 Merge pull request #3972 from tgxworld/remove_arel_patch_merged_upstream
Remove Arel patch that has been merged upstream.
2016-01-25 09:27:57 +11:00
Sam d0ee32f3ce FIX: correct counts on user summary 2016-01-24 16:39:01 +11:00
Neil Lalonde 685ba1eb7f FEATURE: blocked users can send and reply to private messages from staff 2016-01-22 12:54:24 -05:00
Guo Xiang Tan b8193e8e67 Remove Arel patch that has been merged upstream. 2016-01-22 12:24:36 +08:00
Arpit Jalan f0b04ac730 Merge pull request #3970 from gdpelican/unsubscribe-via-email
Hotfix for unsubscribe via email
2016-01-21 14:59:17 +05:30
James Kiesel b92e2b33eb Hotfix for unsubscribe via email 2016-01-21 21:46:15 +13:00
Régis Hanol 4a17cdc1e4 FIX: don't invite users with emails configured as 'incoming' (reply, group our category) 2016-01-20 23:08:27 +01:00
Régis Hanol f145310cd5 FIX: associates email replies using both 'In-Reply-To' and 'References' headers 2016-01-20 22:52:08 +01:00
Jeff Atwood f5c0972210 Merge pull request #3966 from scossar/simple-email-button
FIX: email button padding for Outlook
2016-01-20 12:25:01 -08:00
scossar 1fb709362a fix border widths 2016-01-20 11:03:13 -08:00
scossar e2b265eb98 reduce border 2016-01-20 10:19:13 -08:00
Régis Hanol 260d023b65 FIX: disk_space should be a BigDecimal to handle large disk (closes #3923) 2016-01-20 15:42:24 +01:00
Régis Hanol c88093eecb Merge pull request #3920 from tgxworld/fix_onebox_emoji
FIX: Emoji in Discourse onebox is wrapped in square brackets.
2016-01-20 15:38:12 +01:00
Régis Hanol c2c01cdb5d FIX: username suggester to account for the more relaxed username rules (closes #3907) 2016-01-20 15:37:34 +01:00
James Kiesel c7283751a3 Unsubscribe via email 2016-01-20 22:25:25 +13:00
Régis Hanol 735017dd9f FIX: don't invite users with the same email as 'reply_be_email_address' 2016-01-19 15:24:34 +01:00
Sam 8d392066d8 oops (tests were running in other window but was trigger happy) 2016-01-19 18:22:59 +11:00
Sam dec40ea3cf FIX: raise proper error if system message creation fails
FIX: skip validations when creating system messages
2016-01-19 18:19:35 +11:00
scossar a1d08cad6a use default font 2016-01-18 16:41:52 -08:00
Régis Hanol 02d9ec5bde oops, should not have been commited 2016-01-19 01:01:17 +01:00
Régis Hanol 3083657358 FEATURE: better email in support
FEATURE: new incoming_email model
FEATURE: infinite scrolling in emails admin
FEATURE: new 'emails:import' rake task
2016-01-19 00:57:55 +01:00
scossar 0c4e28cd0b pad link with border 2016-01-18 14:06:35 -08:00
Guo Xiang Tan a055c37939 Merge pull request #3956 from tgxworld/fix_clashing_slug
FIX: Clashing category slug.
2016-01-18 10:15:13 +08:00
Sam 1a27d887fa FIX: if topic did not save do not attempt to skip inbox 2016-01-14 10:38:20 +11:00
Guo Xiang Tan a362ad9407 FIX: Emoji in Discourse onebox is wrapped in square brackets. 2016-01-13 19:00:11 +08:00
Guo Xiang Tan c60e360c90 FIX: Clashing category slug. 2016-01-13 15:32:29 +08:00
Arpit Jalan e676974f16 Merge pull request #3953 from techAPJ/wiki
FEATURE: allow users to wikify their own posts based on trust level
2016-01-13 09:53:33 +05:30
Régis Hanol e2744fc19f FIX: adding the 'contains_messages' column back 2016-01-12 12:06:51 +01:00
Régis Hanol 96aa5b865f FIX: mentions regex server-side (ie. don't count email addresses) 2016-01-12 09:53:09 +01:00
Arpit Jalan 06bac23e5f FEATURE: allow users to wikify their own posts based on trust level 2016-01-12 08:44:25 +05:30
Sam 4ec409f705 FEATURE: don't add admins to topic allowed users if already in group 2016-01-12 13:57:45 +11:00
Régis Hanol fbacaab2fc FIX: disable scheduled jobs when in readonly mode 2016-01-11 18:31:28 +01:00
Régis Hanol cf0558cd33 FEATURE: properly style whisper email notifications 2016-01-11 17:47:17 +01:00
Régis Hanol 98c0fac461 FEATURE: add small action post when adding/removing users in messages 2016-01-11 12:42:06 +01:00
Jeff Atwood 1a8487cf7b we want screw_ie8 here as we don't support IE9 2016-01-11 03:13:37 -08:00
Jeff Atwood 4d8eb25148 let's explicitly use gzip level 5 here
see http://tukaani.org/lzma/benchmarks.html
2016-01-11 03:03:14 -08:00
Jeff Atwood 770adbaf71 gzip 9 takes 2x as long as 7 for +0.1% compression 2016-01-11 02:53:28 -08:00
Régis Hanol cf4cb2126a FIX: word_count wasn't working with non-latin sentences 2016-01-11 11:16:23 +01:00
Sam 6fabb341f1 FEATURE: automatically archive welcome messages for site_contact_user
This de-clutters the sent messages box for site_contact_user, making it again usable
2016-01-10 16:46:11 +11:00
Neil Lalonde 1a223b9d10 Version bump to v1.5.0.beta8 2016-01-08 15:56:55 -05:00
Robin Ward e0c4987e68 Merge pull request #3950 from techAPJ/enum
Enums that are used in tables need to be stable
2016-01-08 10:30:23 -05:00
Arpit Jalan 97e4f7f6d3 Enums that are used in tables need to be stable 2016-01-08 20:43:11 +05:30
Jeff Atwood 006bb06371 make first email footer link specially highlighted 2016-01-08 02:14:58 -08:00
Régis Hanol dcd0270d52 FIX: don't use the CDN for attachments when login is required 2016-01-06 21:54:01 +01:00
bgr11n 53fb84baa3 fixed password validator on equality with email 2016-01-05 22:43:11 +02:00
Guo Xiang Tan c1dbf5c1c4 FEATURE: Autolinking to category using hashtags. 2016-01-05 00:12:24 +08:00
Guo Xiang Tan 556cd1e3f8 FIX: Do not override existing translations. 2015-12-31 23:20:19 +08:00
Régis Hanol bebeeffc30 FIX: ico are images too 2015-12-31 11:40:23 +01:00
Robin Ward f0694d491a Merge pull request #3943 from gdpelican/plus-one-via-email
Allow +1 via email
2015-12-30 15:55:55 -05:00