codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-30 10:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
18483 commits 7 branches 179 tags 87 MiB
Commit graph

3034 commits

Author SHA1 Message Date
Guo Xiang Tan
c07c474575 FEATURE: Master-Slave Redis configuration with fallback and switch over. 2016-03-11 12:18:58 +08:00
Sam
7fb8fda7bf Merge pull request #4065 from phw/update-highlightjs 
Updated highlight.js
 2016-03-10 16:21:17 +11:00
Régis Hanol
2747e14b4c FEATURE: hide elided part of incoming emails behind a [details] tag 2016-03-09 18:51:54 +01:00
Philipp Wolfer
9ad8d23d21 Updated highlight.js 2016-03-09 08:58:44 +01:00
Robin Ward
5771d2aee2 SECURITY: Support for confirm old as well as new email accounts 2016-03-08 14:52:22 -05:00
Guo Xiang Tan
d783a393ec Fix randomly failing test. 2016-03-08 12:51:51 +08:00
Guo Xiang Tan
322ee3e17c Fix the build. 2016-03-08 11:38:26 +08:00
Guo Xiang Tan
00078a438b FIX: FastImage#size returns nil if it can't fetch the image size. 2016-03-08 11:29:18 +08:00
Guo Xiang Tan
fcc86d3a9d FIX: PostgreSQLFallbackHandler was bouncing in and out of readonly. 2016-03-08 10:02:38 +08:00
Régis Hanol
622d804d46 FEATURE: Add rejection message on rejected IncomingEmail 
FIX: Better RateLimit description in rejected IncomingEmail
FEATURE: Send email when hitting a rate limit
 2016-03-07 16:56:17 +01:00
Neil Lalonde
090a064c41 Version bump to v1.5.0.beta12 2016-03-07 10:37:00 -05:00
Sam
c838291d47 Merge pull request #4041 from joebuhlig/custom-field-sorting 
Added ability to create topic sorts with custom_fields for plugins
 2016-03-07 14:15:23 +11:00
Sam
fe6ea48123 Merge pull request #4038 from markbiegel/instagram-login 
FEATURE: Instagram OmniAuth login methods
 2016-03-07 14:05:07 +11:00
Sam
77ecaba43a Merge pull request #4049 from tgxworld/support_multisite_in_postgresql_fallback 
FEATURE: Support multisite in PostgreSQL fallback adapter.
 2016-03-07 14:01:15 +11:00
Robin Ward
396713718b FEATURE: Adds ~200 more emoji 
This includes all new emoji from Unicode 7 and Unicode 8 with the
exception of skin tones which will require a new interface.
 2016-03-04 15:10:14 -05:00
Joe Buhlig
8d6579c729 Added ability to create topic sorts in plugins with custom_fields 2016-03-04 11:07:39 -06:00
scossar
a20a52b25f add user locale 2016-03-03 17:21:50 -08:00
Arpit Jalan
36f82aa68c FEATURE: enforce admin password validation when signing up via developer email 2016-03-04 00:28:47 +05:30
Régis Hanol
8d4bac7da2 fix build & add migration to clear common passwords cache 2016-03-03 19:39:22 +01:00
Jeff Atwood
57c518eee1 update common password checker for 10 char+ 2016-03-03 04:06:54 -08:00
Neil Lalonde
53a463d7c1 Hub must be called with https 2016-03-02 17:51:13 -05:00
Robin Ward
be257225b6 Adjustment: New User Posts must be reviewed at TL0 + TL1 2016-03-02 14:54:03 -05:00
Robin Ward
0167f6bb57 FIX: Don't substitute emojis within code blocks 2016-03-02 14:32:00 -05:00
Robin Ward
94f5aa6015 FIX: Have the approve post count setting work as advertised 2016-03-02 13:20:13 -05:00
Guo Xiang Tan
b41aa27a84 FEATURE: Support multisite in PostgreSQL fallback adapter. 2016-03-02 21:37:37 +08:00
Arpit Jalan
50e65634d7 FEATURE: new setting min_admin_password_length and better default 2016-03-02 14:43:26 +05:30
Régis Hanol
be5a54d67d FEATURE: new 'allow_all_attachments_for_group_messages' site setting 2016-02-29 22:39:24 +01:00
Sam Saffron
89d550dac5 UX: In Reply / Previous Replies some times purple in gmail 2016-02-27 19:07:15 +11:00
Régis Hanol
21b51090bf FIX: don't tell staged users they can visit topics in email notifications 2016-02-26 23:56:56 +01:00
Mark Biegel
70b287a053 Update instagram_authenticator.rb 2016-02-26 11:37:48 +10:00
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