github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-01 03:13:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
17,906 Commits 214 Branches 500 Tags 960 MiB
d77511319e
Commit Graph

17906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arpit Jalan
d77511319e show monthly top topics on 404 page 2016-02-24 13:46:55 +05:30
Sam Saffron
12b5821d79 add missing class 2016-02-24 19:09:18 +11: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
Guo Xiang Tan
b500f35d14 Ignore ActionController::UnknownHttpMethod error in logs. 2016-02-24 12:58:23 +08:00
Sam
bc61cfcad4 correct autocomplete edge case on android 
@ backspace @ was not opening an autocomplete
 2016-02-24 15:20:12 +11:00
Sam
ee931e9f76 FIX: link to topic when clicking on up arrow 2016-02-24 14:50:14 +11:00
Sam
d7ac056606 puma config is a production thing 2016-02-24 14:49:31 +11:00
Sam
8322bcf0c3 FIX: switch to desktop not working 2016-02-24 14:21:07 +11:00
Sam
358e027e31 FIX: don't link avatars in "in reply" section of post 2016-02-24 14:17:51 +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
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