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
Duong Tam Chau
cd84a05600
FIX: Remove existing characters when a new emoji is selected.
...
When the user choose an emoji from the "More..." option, any previously typed character should be discarded.
2016-02-22 20:24:06 -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
Arpit Jalan
5f747a74a1
Update onebox version
2016-02-22 16:05:40 +05:30
Jeff Atwood
c9d19c9462
tighten up mobile profile image size
2016-02-22 02:18:34 -08:00
Jeff Atwood
2ab901bec4
adjust bad styling on mobile user page
2016-02-22 02:03:50 -08:00
Jeff Atwood
66fa836d88
we don't want a clear for notification options
2016-02-22 01:53:51 -08:00
Jeff Atwood
23063ea094
mobile needs different post body overflow handling
2016-02-22 01:40:28 -08:00
Jeff Atwood
6a6e3a6a3a
FIX: add global hidden overflow on all topic bodies
2016-02-22 01:17:50 -08:00
Jeff Atwood
f6b1238d6c
reduce maximum_backups default from 7 to 5
2016-02-22 00:56:26 -08:00
Guo Xiang Tan
3142eb76dc
Revert "FIX: find_by_attribute method in Rails 4.5 is case insensitive."
...
This reverts commit 2af587005b
.
2016-02-22 15:55:48 +08:00
Guo Xiang Tan
c852fb83d0
Upgrade Logster.
2016-02-22 15:18:25 +08:00
Sam
0af9e7b572
Merge branch 'master' into vdom
2016-02-22 12:25:07 +11:00
Sam
4c0a40f2b0
FIX: publish notification state when notifications are read
...
(this clears green and blue bubbles)
2016-02-22 12:24:51 +11:00
Sam
c404da248a
Merge branch 'master' into vdom
2016-02-22 12:20:59 +11:00
Sam
d0337e7f5e
FIX: clear notification bubble when notification is read
2016-02-22 12:20:41 +11:00
Sam
5a47199528
Merge pull request #3947 from khoa-le/update-locale-vietnamese
...
Add locale for Vietnamese
2016-02-22 11:41:37 +11:00
Régis Hanol
13e1bf849e
Merge pull request #4023 from dandv/patch-1
...
Typo fix: "your sure"
2016-02-21 23:52:38 +01:00
Régis Hanol
87e72cb521
Merge pull request #4025 from gschlager/importer-name
...
Allow importers to set empty names
2016-02-21 23:52:15 +01:00