833af461ab
FIX: stop using regex to detect mentions
2016-02-24 17:47:55 +11:00
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
3c072cdfc9
Merge branch 'master' of github.com:discourse/discourse
2016-02-24 13:53:43 +11:00
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
ee1aec6766
Merge branch 'vdom'
2016-02-23 15:30:40 -05:00
eb87cffa13
FEATURE: Category/topic importer skips objects that it has already imported.
2016-02-23 12:19:08 -05:00
f2db1a27cf
FIX: Make sure we write inside a lock.
2016-02-23 12:10:25 -05:00
8dad58ba78
FIX: N+1 query on topics view page.
2016-02-23 12:10:25 -05:00
c344bd3fd1
FIX: Make sure we write inside a lock.
2016-02-23 23:25:59 +08:00
ced86aa890
FIX: N+1 query on topics view page.
2016-02-23 16:22:40 +08:00
d0a86f8032
Merge branch 'master' into vdom
2016-02-23 15:58:46 +11:00
1f81d2f178
Merge branch 'master' of github.com:discourse/discourse
2016-02-23 10:34:57 +11:00
32c681c96b
annotate models
2016-02-23 10:33:53 +11:00
8481548def
FIX: Load fallback locales after reloading translations
2016-02-22 22:48:56 +01:00
80c9fa4dca
FIX: Load translation overrides for more than one locale
2016-02-22 22:48:56 +01:00
2e875d3cca
FIX: Use fallback locales when searching for translations
2016-02-22 22:48:55 +01:00
026bba1876
Merge branch 'master' into vdom
2016-02-22 15:28:07 -05:00
5415b2666d
FIX: staged users couldn't create new topic in a private category via email
2016-02-22 19:57:53 +01:00
1b9b68cb51
Version bump to v1.5.0.beta11
2016-02-22 11:27:35 -05:00
c404da248a
Merge branch 'master' into vdom
2016-02-22 12:20:59 +11:00
c4ec1d0fcf
FIX: Don't suggest invalid username
2016-02-21 23:28:57 +01:00
b9bcdb984a
Merge branch 'master' into vdom
2016-02-18 16:57:40 +11:00
f0e942f647
PERF: move 3 more option columns out of the user table
2016-02-18 16:57:22 +11:00
b11e6ec38e
Merge branch 'master' into vdom
2016-02-18 13:20:55 +11:00
52a6682690
FIX: don't create an EmailLog when we can't send a digest
2016-02-17 17:31:46 +01:00
8893d711e0
FEATURE: new pop3 polling configuration admin dashboard check
2016-02-17 11:25:49 +01:00
e8f76c335a
Merge branch 'master' into vdom
2016-02-17 18:10:12 +11:00
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
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
3ea1f88cdc
Merge branch 'master' into vdom
2016-02-16 11:48:42 -05:00
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
18d67851c0
Merge branch 'master' into vdom
2016-02-16 11:53:14 +11:00
4ad5660615
add slightly more logs when skipping email notifications
2016-02-15 17:53:07 +01:00
b878598418
Merge branch 'master' into vdom
2016-02-13 17:49:50 +11:00
b1e68390f4
FIX: false overrides should be permitted via ENV
2016-02-13 17:49:26 +11:00
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
3939b9ec7d
FIX: restore in development mode connects to the wrong database
2016-02-12 17:20:38 -05:00
f02e035f94
Merge branch 'master' into vdom
2016-02-12 18:21:03 +11:00
b0d2e69cc3
FIX: Update log level to warn.
2016-02-12 15:18:34 +08:00
06403df059
Merge branch 'master' into vdom
2016-02-12 17:51:44 +11:00
86819f08c3
FIX: use RFC-compliant previous replies separator
2016-02-11 18:48:09 +01:00
d1e85bdd8b
FEATURE: Use virtual dom framework for faster post rendering
2016-02-11 11:00:40 -05:00
3bf931ce54
FIX: should have been 'category_slug'
2016-02-11 16:04:40 +01:00
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
f2c64a3580
FIX: Client settings were not being published.
2016-02-11 17:53:30 +08:00
cad7fc1062
FIX: don't allow blocked user to send emails in
2016-02-11 10:39:57 +01:00
91bb38626c
FEATURE: new incoming email details modal
2016-02-10 22:00:27 +01:00
39aaa181e1
FIX: Category hashtag is cooked incorrectly.
2016-02-10 17:08:57 +08:00
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
8944d62aa6
add validator for the 'reply_by_email_enabled' site setting
2016-02-09 23:35:40 +01:00
Sam
Robert Riemann
Robin Ward
Neil Lalonde
Guo Xiang Tan
Gerhard Schlager
Régis Hanol
Erik Bernhardson