Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,945 Commits 245 Branches 502 Tags 902 MiB
Commit Graph

17945 Commits

Author SHA1 Message Date
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
Robin Ward 03068e3556 FIX: User deleted posts weren't red 2016-02-23 13:38:51 -05:00
Robin Ward 84a01599c6 Commenting was *too* good :) 2016-02-23 13:37:08 -05:00
Robin Ward 360805afa8 FIX: Overflow CSS was hiding selecting posts buttons 2016-02-23 13:31:28 -05:00
Robin Ward 05a0308663 Finish documenting new PluginAPI 2016-02-23 12:44:52 -05:00
Neil Lalonde eb87cffa13 FEATURE: Category/topic importer skips objects that it has already imported. 2016-02-23 12:19:08 -05:00
Robin Ward ef079004da Ability to decorate after post cooked, and rawHtml helper 2016-02-23 12:10:25 -05:00
Guo Xiang Tan f2db1a27cf FIX: Make sure we write inside a lock. 2016-02-23 12:10:25 -05:00
Arpit Jalan 9de5c340b0 FIX: invite link should not auto-accept invitation if user is already logged in 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
Sam Saffron 90e017ffef somehow this can be null in some cases 2016-02-23 12:10:25 -05:00
Arpit Jalan 72784d23e7 improved already_logged_in copy 2016-02-23 21:56:34 +05:30
Guo Xiang Tan c344bd3fd1 FIX: Make sure we write inside a lock. 2016-02-23 23:25:59 +08:00
Arpit Jalan 1253afdf95 FIX: invite link should not auto-accept invitation if user is already logged in 2016-02-23 19:49:58 +05:30
Guo Xiang Tan ced86aa890 FIX: N+1 query on topics view page. 2016-02-23 16:22:40 +08:00
Sam Saffron bc28c1ccb5 somehow this can be null in some cases 2016-02-23 17:34:05 +11:00
Sam Saffron 27052717a4 Merge branch 'master' into vdom 2016-02-23 17:23:05 +11:00
Sam Saffron d59c9badbe correct build 2016-02-23 17:22:41 +11:00
Sam Saffron 10aa1923a4 Merge branch 'master' into vdom 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2016-02-23 17:07:01 +11:00
Sam Saffron 32d3dd22a0 FIX: broken autocomplete on Android 
Android Chrome does not support keypress event, instead use keyup
 2016-02-23 17:06:15 +11:00
Sam Saffron d0a86f8032 Merge branch 'master' into vdom 2016-02-23 15:58:46 +11:00
Sam Saffron 6d22354ac3 FIX: cleaner error handling for multiple autocomplete matchers 2016-02-23 15:48:39 +11:00
Robin Ward 200da89355 FIX: Broken tests 2016-02-22 22:11:35 -05:00
Robin Ward 5dd81700f1 FIX: Overflow CSS was hiding selecting posts buttons 2016-02-22 22:07:23 -05:00
Régis Hanol 8d1da9cedd FEATURE: keep original title when sending email notifications about a PM 2016-02-23 01:34:16 +01:00
Jeff Atwood 6eb8730fce tweak banner close X button a bit 2016-02-22 15:57:31 -08:00
Jeff Atwood 69461ec1ce slightly better upgrade email text 2016-02-22 15:50:28 -08:00
Sam 1f81d2f178 Merge branch 'master' of github.com:discourse/discourse 2016-02-23 10:34:57 +11:00
Robin Ward 841065db2f Merge pull request #4011 from gschlager/i18n-overrides 
Fixes for I18n and translation overrides
 2016-02-22 18:34:45 -05: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 8bfb5b4e7b Backported double click fix 2016-02-22 16:39:43 -05:00
Robin Ward d4091d579d Remove profiling information for vdom 2016-02-22 16:31:49 -05:00
Robin Ward 6d06979da6 FIX: Arrow in quotes was pointing the wrong way 2016-02-22 16:19:22 -05:00
Robin Ward acc20c87b2 FIX: Jump to embedded was not working when the post was far away 2016-02-22 15:58:08 -05:00
Robin Ward 026bba1876 Merge branch 'master' into vdom 2016-02-22 15:28:07 -05:00
Robin Ward fdf0047f56 A helper for cooked content in a decorator 2016-02-22 15:19:56 -05:00
Neil Lalonde cab5dd09d3 FIX: broken links on admin dashboard in Top Referrers section 2016-02-22 14:31:13 -05:00
Robin Ward 65553d7b70 Allow custom classes for any widget 2016-02-22 14:09:53 -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
Robin Ward 54904133a0 Ability to mount ember views into vdom 
It's slow but can be used as a last resort for old plugins.
 2016-02-22 12:10:34 -05:00
Neil Lalonde 1b9b68cb51 Version bump to v1.5.0.beta11 2016-02-22 11:27:35 -05:00
Neil Lalonde 7e39619bc9 Update translations 2016-02-22 11:10:12 -05:00
Régis Hanol 780c3ad755 Merge pull request #4008 from joebuhlig/master 
Add tertiary color to email digests
 2016-02-22 14:43:21 +01:00
Joe Buhlig 6763a9923a Added tertiary color to digest 
Added hash to color in helper

Added anchor_color to topic and site name links

Styled the unsubscribe link
 2016-02-22 07:02:21 -06:00
Arpit Jalan c2caf90de6 FIX: RSS feed must have unique GUID 2016-02-22 18:28:09 +05:30
Régis Hanol 4d981cec53 FIX: don't try to optimize large PNGs (takes too much time) 2016-02-22 12:57:24 +01:00