github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-30 09:34:17 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
19,386 Commits 214 Branches 500 Tags 960 MiB
ff50e59c4f
Commit Graph

3204 Commits

Author SHA1 Message Date
Guo Xiang Tan
e8de80de98 FIX: Default to first page when page params is an array. 2016-02-25 11:32:58 +08:00
Ubuntu
5c603bf8ec Added Instagram login method 2016-02-25 12:13:59 +10:00
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
James Kiesel
6ceb108946 Add specs for post action guardian 2015-12-30 20:52:36 +01:00
Robin Ward
b17e5c99cc PERF: Use a regexp for unicode replacements 2015-12-30 14:35:25 -05:00
James Kiesel
a559754db3 Add post action creator 2015-12-30 20:04:05 +01:00
James Kiesel
86da47880a Allow +1 via email 2015-12-30 12:17:45 +01:00
Arpit Jalan
51ced7aeae make site setting for read time word count per minute 2015-12-30 12:15:30 +05:30
Guo Xiang Tan
6c9f646e34 Use string interpolation instead. 2015-12-30 08:50:03 +08:00
Neil Lalonde
007326d3bd FIX: hidden posts that are edited by the author and unhidden could not be flagged by the same users again 2015-12-29 16:59:36 -05:00
Robin Ward
c064dc1322 FEATURE: Perform a server side replacement of unicode emoji 2015-12-29 16:28:27 -05:00
Guo Xiang Tan
e89f29cca7 FIX: Pluralization error when overriding translations. 2015-12-29 10:31:23 +08:00
Arpit Jalan
6ef1537ee0 FEATURE: better unfurling of Discourse topics on Slack 2015-12-28 19:10:19 +05:30
Arpit Jalan
3a28bafc0f FEATURE: onebox internal audio or video files 2015-12-25 01:52:14 +05:30
Robin Ward
f423869e03 FIX: forgot end :) 2015-12-23 16:43:39 -05:00
Robin Ward
d792c0a1d7 Should not be active in dev mode 2015-12-23 16:39:56 -05:00
Robin Ward
d1ebb9d0b5 FIX: I18n Fallbacks were not applying correctly 2015-12-23 12:09:18 -05:00
Sam
03ea0bfe22 FEATURE: allow users to archive messages 
Messages are now in 3 buckets

- Inbox for all new messages
- Sent for all sent messages
- Archive for all messages you are done with

You can select messages from your Inbox or Sent and move them to your Archive,
you can move messages out of your Archive similarly

Similar concept applied to group messages, except that archiving and unarchiving
will apply to all group members
 2015-12-23 11:09:30 +11:00
Robin Ward
3095dd160e Add slightly_smiling emoji and use it as default smile. 2015-12-22 14:40:49 -05:00
Régis Hanol
3e923c7a41 FIX: ensure inactive users can't email in 2015-12-21 17:54:02 +01:00
Neil Lalonde
b3198d7a6a callback in TopicQuery for plugins to add result set filters 2015-12-21 11:43:17 -05:00
Sam
b7ce4bdc78 correct code 2015-12-20 17:21:31 +11:00
Sam
63076a841e Merge branch 'refactor_user_page' 2015-12-20 16:50:33 +11:00
Sam
a8b5192efd FEATURE: User page refactor 
Re-organise user page so it is easier to find interesting info
split it into tabs

- Introduce notifications and messages tabs
- Stop couting stuff for the user page to speed up rendering
- Suppress more information when viewing your own profile
 2015-12-20 16:45:49 +11:00
Régis Hanol
ca529a673a just use the address instead of building it ourselves 2015-12-18 17:54:42 +01:00
Neil Lalonde
9435dd777f Version bump to v1.5.0.beta7 2015-12-18 11:09:08 -05:00
Sam
29f6d960c6 FIX: autospec not monitoring correctly 2015-12-17 13:17:57 +11:00
Régis Hanol
4bb31daa2e FIX: when getting a reply by email, ensure it's by the same user 2015-12-16 00:43:05 +01:00
Sam Saffron
4be8de21a1 FIX: not searching group messages when searching private 2015-12-15 13:26:35 +11:00
Régis Hanol
15c229195f FEATURE: notification_level on a per-group basis 2015-12-14 23:17:09 +01:00
Arpit Jalan
e65a7370ef FIX: disable avatar education message when 'allow_uploaded_avatars' is 
disabled
FEATURE: setting to disable avatar education message
 2015-12-14 22:47:35 +05:30
Robin Ward
ccf5b1584d Unsubscribe link needn't be sanitized 2015-12-11 10:06:25 -05:00
Régis Hanol
02279c41cb Merge pull request #3918 from techAPJ/better-email-parsing 
FEATURE: better email reply parsing
 2015-12-11 14:51:24 +01:00
Robin Ward
df19a27753 FIX: Don't sanitize header_instructions 2015-12-10 18:15:32 -05:00
Régis Hanol
323e3cee22 when creating a staged account, use the display name provided in the email 2015-12-10 23:52:20 +01:00
Régis Hanol
93d1cc6294 add support for incoming emails in CC/BCC fields 2015-12-10 23:49:16 +01:00
Régis Hanol
978a1539fa new pop3_polling_enabled setting validator to ensure credentials are working before enabling it 2015-12-10 22:23:54 +01:00
Arpit Jalan
553248de86 FEATURE: new gem discourse_email_parser 2015-12-11 01:02:28 +05:30
Sam
8cf4d52cb6 FEATURE: split up group PMS on user page 2015-12-10 11:39:33 +11:00
Arpit Jalan
7a8e5a50ff FEATURE: better email reply parsing 2015-12-09 23:47:01 +05:30
Sam
b8a47a1129 FIX: if a string was missing catch the throw 
if overrides were in play and we tried to translate a
missing string we would throw an exception
 2015-12-09 17:10:51 +11:00
Sam
65edbb609c Revert "Revert message bus upgrade" 
This reverts commit 47e718f5b2.
 2015-12-09 11:48:41 +11:00
Sam
47e718f5b2 Revert message bus upgrade 2015-12-09 11:45:11 +11:00
Sam
2cc95af69b Revert "REVERT: message bus changes" 
This reverts commit 4820d5c7b0.
 2015-12-09 07:36:36 +11:00
Robin Ward
4820d5c7b0 REVERT: message bus changes 2015-12-08 15:32:31 -05:00
Régis Hanol
3aa5129f54 FEATURE: allow group members to see all messages on group page 2015-12-07 23:19:33 +01:00
Robin Ward
b781b6aea3 Add header_instructions overridable translation for email headers. 2015-12-07 16:52:33 -05:00
Sam
a3ba564b03 missing spot where initializer was renamed 2015-12-08 07:13:29 +11:00
Régis Hanol
a37d575d7d FEATURE: new 'My Groups' messages filter in user page 2015-12-07 18:37:03 +01:00
Régis Hanol
1cde276656 FEATURE: ability to send emails to a group 2015-12-07 17:01:08 +01:00
Sam
8d49091572 PERF: stop running VACUUM FULL only run VACUUM 2015-12-07 20:14:26 +11:00
Arpit Jalan
dd8b773059 UX: use pastel blue background for topic education pop-ups 2015-12-04 09:19:55 +05:30
Arpit Jalan
f38abbe279 FIX: onebox links should respect nofollow settings 2015-12-04 01:59:12 +05:30
Sam
9899e8d4a5 FEATURE: First class messages to groups, you can select a group as a target of a message 2015-12-02 15:49:43 +11:00
Sam
6577f3c1ed Merge pull request #3909 from humzashah/reduced-time-operation 
reused value of `Time.now` in a method
 2015-12-02 09:01:22 +11:00
Syed Humza Shah
d0955e02d6 reused value of Time.now in a method 
`Time.now` was being used to fetch the current time, twice in the
same line. This commit stores the time value in a variable and
reuses it instead of generating/fetching it for the second time.

Additionally, a guard clause in the same method is substituted by
an `if/else/end` block for clarity.
 2015-12-01 21:06:37 +00:00
Andy Waite
3e50313fdc Prepare for separation of RSpec helper files 
Since rspec-rails 3, the default installation creates two helper files:
* `spec_helper.rb`
* `rails_helper.rb`

`spec_helper.rb` is intended as a way of running specs that do not
require Rails, whereas `rails_helper.rb` loads Rails (as Discourse's
current `spec_helper.rb` does).

For more information:

https://www.relishapp.com/rspec/rspec-rails/docs/upgrade#default-helper-files

In this commit, I've simply replaced all instances of `spec_helper` with
`rails_helper`, and renamed the original `spec_helper.rb`.

This brings the Discourse project closer to the standard usage of RSpec
in a Rails app.

At present, every spec relies on loading Rails, but there are likely
many that don't need to. In a future pull request, I hope to introduce a
separate, minimal `spec_helper.rb` which can be used in tests which
don't rely on Rails.
 2015-12-01 20:39:42 +00:00
Régis Hanol
5b9594277a skip most post validations for staged accounts 2015-12-01 10:40:23 +01:00
Sam
aa2f802247 PERF: DISCOURSE_NO_CONSTANTS removed 
we minimize the amount of constants we decalre see: https://meta.discourse.org/t/deprecating-es6-compatibility-layer/35821
 2015-12-01 10:58:01 +11:00
Robin Ward
de88be2fbc Support for "Only show overridden" in site text customization 2015-11-30 15:25:08 -05:00
Régis Hanol
7c694139ec trust staged accounts when validating posts 2015-11-30 19:08:35 +01:00
Régis Hanol
dd28a3c63a add support for inline images in emails in 2015-11-30 18:33:24 +01:00
Sam
ad3dd161e7 FEATURE: first class group mentions built in 
If you allow a group to be mentioned it can be mentioned with the @ symbol.

Keep in mind as a safety mechanism max_users_notified_per_group_mention is set to 100
 2015-11-30 17:08:43 +11:00
Robin Ward
c4eee825de FIX: Missing site name key 2015-11-27 17:23:43 -05:00
Robin Ward
7181e3cb75 FIX: Missing new education keys 2015-11-27 17:00:43 -05:00
Régis Hanol
540933dce3 don't notify users about sequential replies in messages 2015-11-27 19:29:44 +01:00
Robin Ward
5e93140f85 FEATURE: Can override any translation via an admin interface 2015-11-27 11:35:19 -05:00
Sam
f74a6457ee FEATURE: allow CJK to be tokenized in non CJK sites. 
Meaning a mixed English/Chinese site can still have a functioning search.
 2015-11-27 16:35:27 +11:00
Régis Hanol
0d54c18c8b new hidden 'allow_staged_accounts' setting 2015-11-26 18:31:23 +01:00
Neil Lalonde
2561b5f304 Version bump to v1.5.0.beta6 2015-11-25 17:19:12 -05:00
Arpit Jalan
3eb0288adb UX: reviving old topic popup should not have red warning background 2015-11-25 16:31:17 +05:30
Sam
d41a8a21cc FIX: show letter avatars even if NGINX is not running in Dev mode 2015-11-25 14:42:46 +11:00
Robin Ward
434deb1bd3 SECURITY: Backported XSS fixes from Handlebars 2015-11-24 16:08:08 -05:00
Neil Lalonde
f4d44187c8 FIX: site_contact_user should default to system user, not first admin user 2015-11-24 14:37:41 -05:00
Robin Ward
d65ec1af2e Rename ninja_edit_window to editing_grace_period :'( 2015-11-24 14:28:42 -05:00
Arpit Jalan
db2799507b FIX: admin trust level user list URL should be consistent with new naming 2015-11-23 14:28:56 +05:30
Sam
5c899c765b Revert "Revert "REFACTOR: support booting discourse with DISCOURSE_NO_CONSTANTS"" 
This reverts commit c21457d6a7.
 2015-11-21 12:27:06 +11:00
Robin Ward
1506eba28d Support for overriding client side translation keys 2015-11-20 17:14:01 -05:00
Robin Ward
c21457d6a7 Revert "REFACTOR: support booting discourse with DISCOURSE_NO_CONSTANTS" 
This reverts commit c0b277d273.
 2015-11-20 10:00:12 -05:00
Sam
c0b277d273 REFACTOR: support booting discourse with DISCOURSE_NO_CONSTANTS 
This change is discussed here: https://meta.discourse.org/t/deprecating-es6-compatibility-layer/35821

Prior to this change we were not booting correctly with DISCOURSE_NO_CONSTANTS
 2015-11-21 00:14:50 +11:00
Robin Ward
f5b34d5f53 FEATURE: Admin interface for editing email templates 2015-11-19 16:39:34 -05:00
Robin Ward
e168c5fde3 PERF: Much more performant, multisite aware I18n overrides 2015-11-19 16:36:59 -05:00
Robin Ward
7737ea89b1 FIX: Missing fallback logic 2015-11-19 12:35:51 -05:00
Sam
09bedfd4c0 Make DISCOURSE_NO_CONSTANTS work in anon for home page 2015-11-20 00:29:56 +11:00
Régis Hanol
31a54377be staged users automatically watches all topics they participates in 2015-11-18 22:24:46 +01:00
Robin Ward
7f4ca91e06 FIX: I18n overrides should be multisite aware 2015-11-18 16:05:53 -05:00
Robin Ward
2196160549 FIX: Allow emails to begin with a quote (but skip it!) 2015-11-18 15:23:10 -05:00
Régis Hanol
8ba5397f0d can't find staged users with search 2015-11-18 21:06:59 +01:00
Jeff Wong
cf86f27415 FEATURE: New setting to allow all caps posts 
Adds a setting to ignore text_sentinel's check on all caps content.
 2015-11-18 09:50:50 -08:00
Robin Ward
bb76c389fd Merge pull request #3817 from gschlager/locale-pluralization 
FIX: Pluralizations in English locale files
 2015-11-17 12:35:24 -05:00
Neil Lalonde
4423c6b9f9 Version bump to v1.5.0.beta5 2015-11-17 11:39:38 -05:00
uppfinnarn
ca8c5f7382 migrate_to_s3: check for missing local files 
If an image is already on S3, but not available locally (eg. if they're already migrated), `path` is nil. This crashes the task, because File.exists?(nil) is not valid.
 2015-11-16 11:39:40 +01:00
Robin Ward
810a069cfd FIX: Couldn't migrate database from nothing due to I18n 
Since I18n has a DB backend now, I've introduced a helper we can use to
skip overrides in certain situations. Otherwise migration from empty
databases was broken.
 2015-11-14 16:12:09 -05:00
Robin Ward
060ce9bf2a FEATURE: Overwrite server side I18n keys with API 2015-11-13 16:35:02 -05:00
Robin Ward
3720783c1b Refactor to our own Discourse I18n backend 
This removes some monkey patches and makes testing easier.
It will also support database backed I18n changes.
 2015-11-13 16:35:02 -05:00
Gerhard Schlager
6e33a21a7a FIX: Replace invalid pluralizations in locale files 2015-11-13 21:25:15 +01:00
Sam Saffron
6dd4bc7d57 FEATURE: support group owner, capable of controlling group membership 
Group owners are regular users that can add or remove users to a group
The Admin UX allows admins to appoint group owners
The public group UX will display group owners first and unlock UI to
add and remove members

Group owners can only be appointed on non automatic groups
Group owners may not appoint another group owner
 2015-11-10 00:56:57 +11:00
Robin Ward
8ba7c06b7d Merge pull request #3735 from riking/patch-4 
FIX: Discourse.BaseUri should not default to /
 2015-11-06 14:52:19 -05:00
Régis Hanol
fc27b7442f FIX: it should have been an array of arrays...:fired: 2015-11-06 15:42:16 +01:00
Régis Hanol
86f76e5b4d FIX: better plugin emojis API 2015-11-06 15:02:40 +01:00
Régis Hanol
13e96ffd3b FEATURE: add support for custom emojis via plugins 2015-11-05 17:25:26 +01:00
Régis Hanol
7e255a151b PERF: only use fulltext when searching for a user (I checked, it's enough) 2015-11-04 23:04:37 +01:00
Neil Lalonde
abeac7f681 two more places: make it possible for plugins to add methods to classes that don't follow naming conventions 2015-11-04 14:53:45 -05:00
Neil Lalonde
c1db9da45b Version bump to v1.5.0.beta4 2015-11-04 13:26:43 -05:00
Régis Hanol
e2121c2c2c FIX: add 'max-width' to images with auto width/height in emails 2015-11-04 12:38:39 +01:00
Gerhard Schlager
f85a311ae1 add missing dependency 2015-11-02 20:40:50 +01:00
Robin Ward
d00762dcd5 Merge pull request #3787 from gschlager/locale-keys 
FIX: Some strings in locale files were not translatable
 2015-11-02 13:40:22 -05:00
Sam
48ef609003 correct implementation add tests 2015-11-02 15:05:08 +11:00
Sam
3575012a47 correct implementation 2015-11-02 14:59:10 +11:00
Sam
fbb6eba252 Merge branch 'master' of github.com:discourse/discourse 2015-11-02 13:24:42 +11:00
Sam
eaae72c3e4 improve watching logic 2015-11-02 13:24:24 +11:00
Sam Saffron
606b10445e FEATURE: remove muted topics from suggested and latest 2015-11-02 09:20:22 +11:00
Régis Hanol
7fbf902d09 FIX: prevent cross-contamination of emojis in multisites 2015-10-30 23:26:34 +01:00
Arpit Jalan
9f8d6b6088 FIX: allow exisiting users to be invited to topic/message when enable_local_logins is disabled 2015-10-30 11:28:05 +05:30
Robin Ward
1f6e40eebe FIX: typo 2015-10-29 16:07:45 -04:00
Robin Ward
c68cbe700b FIX: Better link extraction than URL.regexp 2015-10-29 16:02:11 -04:00
Robin Ward
0b4c9005f9 FIX: Don't include name in hash when names are disabled. 
This could break some SSO implementations due to honeypot
not being triggered.
 2015-10-29 12:19:45 -04:00
Robin Ward
a9823ab59a FIX: Use a cookie to bypass the anon cache 2015-10-28 17:16:56 -04:00
Régis Hanol
bb79e6aff7 FEATURE: new hide_user_profiles_from_public site setting 2015-10-28 19:56:08 +01:00
Robin Ward
d9997a6b9e Add auto link support to the email formatter 2015-10-28 13:31:28 -04:00
Robin Ward
6b236d3c83 FEATURE: Bulk Unlisting of topics 2015-10-27 16:57:40 -04:00
Carson Reinke
df916e86b7 compact! only returns array if changes were made 2015-10-27 12:27:37 -04:00
Carson Reinke
6c172a30d3 #compact! can return nil if no changes were made 2015-10-27 12:14:18 -04:00
Robin Ward
2fdf8cba3d FIX: Support formatted > quotes in emails 2015-10-22 16:08:52 -04:00
Régis Hanol
6c29781687 FIX: this is making oneboxed images way too big (reverts 121426287) 2015-10-22 19:46:48 +02:00
Régis Hanol
515fc49727 FIX: replace polls with a link in emails 2015-10-22 19:10:07 +02:00
Robin Ward
57fc1e5e0c FIX: Don't run a FULL ANALYZE on first migration. 
This seems to block databases unecessarily. We should only really be
vacuuming when there is a lot of deleted data to recover.
 2015-10-22 12:34:09 -04:00
Arpit Jalan
1821ba8d93 optimize string replacment 2015-10-21 13:44:59 +05:30
Arpit Jalan
897563a309 FIX: List-ID should not contain space 2015-10-21 00:00:06 +05:30
Neil Lalonde
50d2ba5f8e Version bump to v1.5.0.beta3 2015-10-19 17:34:31 -04:00
Arpit Jalan
59a011e6a9 FIX: min_trust_to_create_topic affects private messages 2015-10-17 15:30:18 +05:30
Sam
805120fc95 FEATURE: add connnection reaping based on maximum age 
This feature ensures connections to the db are always attempted to be closed
after 600 seconds of idle time.
 2015-10-17 11:29:16 +11:00
Régis Hanol
5bea933370 fix build 2015-10-16 23:39:01 +02:00
Robin Ward
f155ff8270 FIX: Tests would fail if your test db's optimized image ids were high 2015-10-16 17:08:41 -04:00
Sam
606aeb9d55 improvements to importer 
- improve perf of test for existing posts
- always use a system guardian when importing posts
- for lithuim importer requery raw (transform is not repeatable)
 2015-10-16 10:41:21 +11:00
Régis Hanol
37c5909a31 FIX: use the first image in the first post in the topic as opengraph image 
FEATURE: new 'default_opengraph_image_url' setting
 2015-10-15 11:00:47 +02:00
Régis Hanol
73e345fe8f FIX: unescape emojis in digests 2015-10-15 09:59:29 +02:00
Sam Saffron
8a0a87812b FIX: navigating back to latest was not respecting pinned topics 2015-10-14 13:03:55 +11:00
Sam
a56e3ccea0 FIX: explicitly tracked topics will show up even if category is muted 2015-10-13 17:54:31 +11:00
Sam
fab51496cb correct full screen login feature 2015-10-13 13:11:49 +11:00
Sam
25db4cc4d9 added DONT_PRECOMPILE_CSS env var 2015-10-13 10:48:21 +11:00
Sam
42b72a9834 parallel is not really helping, need a diff approach. 2015-10-13 10:14:48 +11:00
Sam
5f62c592a4 FEATURE: CSS_COMPILE_THREADS env setting for compiling CSS concurrently 2015-10-12 17:31:37 +11:00
Sam
e29fe77b45 FEATURE: make trust level for message sending configurable 
- add min_trust_to_send_messages site setting (default 1) to allow admins
 to configure when messages can be sent between members
 2015-10-12 11:15:48 +11:00
Arpit Jalan
fa0f731427 FIX: do not show image as category description 2015-10-08 19:36:16 +11:00
Neil Lalonde
95e90ee9aa Version bump to v1.5.0.beta2 2015-10-02 11:08:09 -04:00
Régis Hanol
54d6d24cbf FIX: timing issue with edits and cook post processing 2015-09-29 18:51:26 +02:00
Sam
42925b46b8 FEATURE: allow DONT_MINIFY flag in production for assets:precompile 2015-09-29 11:54:16 +10:00
Sam
1061a9ed06 PERF: introduce full cache for site json when anon 2015-09-28 16:50:24 +10:00
Sam
da41b11309 FIX: mget not implemented correctly 2015-09-28 16:50:24 +10:00
Sam
47597ae6b3 PERF: better caching in topic view 2015-09-28 16:50:24 +10:00