Commit graph

19544 commits

Author SHA1 Message Date
Sam
813fcebdd1 FIX: email_always was not respected correctly
In the past email always meant, email me even if active UNLESS I read post

Now emails always means, always, even if I read the post
2016-07-01 11:22:07 +10:00
Guo Xiang Tan
42ce59d257
Partially revert https://github.com/discourse/discourse/commit/09b92dd3. 2016-07-01 01:28:49 +08:00
Guo Xiang Tan
b66fc72c18
FIX: Incorrect deprecation message. 2016-07-01 01:18:57 +08:00
Guo Xiang Tan
aa4dccd0a1 Merge pull request #4298 from tgxworld/make_desktop_notifications_extendable
Refactor desktop notifications to be more modular.
2016-07-01 00:35:34 +08:00
Guo Xiang Tan
9fc0b8607c
Add event trigger for post notification alert. 2016-07-01 00:12:07 +08:00
Guo Xiang Tan
904d9735ab
Refactor desktop notifications to be more modular. 2016-07-01 00:11:32 +08:00
Régis Hanol
4eb33d08b3 Version bump to v.1.6.0.beta10 2016-06-30 18:04:55 +02:00
Régis Hanol
5dcdfb9777 ensure default locale is 'en' instead of nil 2016-06-30 17:37:00 +02:00
Robin Ward
5094df2807 Upgrade Emoji One to the latest release of images 2016-06-30 11:31:26 -04:00
Régis Hanol
da8163eb29 FIX: 'cdn_url' not 'cnd_url' 2016-06-30 17:15:56 +02:00
Régis Hanol
5169bcdb6e FIX: httpshttps ultra secure URLs 2016-06-30 16:55:01 +02:00
Matt Palmer
7a1e99dacb Add some clarifying specs around new-topic-creating emails work
Strangers get to create new topics (if the appropriate tickbox is ticked)
but low-TL existing users don't.  That might seem a bit backwards, but
the tickbox says 'strangers', not 'everyone'.
2016-06-30 22:24:25 +10:00
Sam
b15f6bd211 FIX: s3 cdn urls not remapped correctly 2016-06-30 18:58:38 +10:00
Arpit Jalan
342783e716 Update Translations 2016-06-30 13:47:13 +05:30
Neil Lalonde
99e88ce39f FIX: n+1 query when fetching tag groups 2016-06-29 18:41:22 -04:00
Neil Lalonde
610d8a5cb1 FIX: layout of topic list nav on mobile when filtered by a tag 2016-06-29 15:51:22 -04:00
Neil Lalonde
0eaf76fc88 FIX: add missing outlet on topic list page when filtered by tag 2016-06-29 14:24:13 -04:00
Arpit Jalan
ad16329b5c Update onebox gem 2016-06-29 21:31:50 +05:30
acshi
deda9a6908 Prevent creation of empty entry in _connectorCache for raw templates. (#4296) 2016-06-29 10:59:48 -04:00
Mark Wingerd
e4074f75b1 Stop URLs from being censored (#4288)
URLs that contained a censored word were being altered by
censored-words.js and ulimately this broke the links. As an example
www.expertsexchange.com would get censored when it would link to a
legitimate website.  This URL blocking functionality should be
handled through other settings.
2016-06-29 10:41:54 -04:00
Guo Xiang Tan
136b1b504d
Allow force_https to be shadowed by a global setting. 2016-06-29 15:24:06 +08:00
Guo Xiang Tan
918b015bdb
Move comment to the right place. 2016-06-29 15:23:29 +08:00
Guo Xiang Tan
8db3ab5f2a Merge pull request #4292 from tgxworld/rename_use_https_to_force_https
Rename `SiteSetting#use_https` to `force_https`.
2016-06-29 15:17:57 +08:00
Guo Xiang Tan
20359788dc
Rename SiteSetting#use_https to force_https. 2016-06-29 15:02:43 +08:00
Sam
f88cf4e2f0 Merge pull request #4226 from xfalcox/non-persistent-session
FEATURE: add setting permanent_session_cookie to configure session st…
2016-06-29 16:47:31 +10:00
Sam
be76a9808a Merge pull request #4287 from steinwaywhw/patch-1
Fix frozen email string problem in mbox.rb
2016-06-29 16:32:30 +10:00
Guo Xiang Tan
717d606430 Merge pull request #4295 from tgxworld/ux_collapse_users_on_om
UX: Collapse users when composing a private message.
2016-06-29 11:56:19 +08:00
Guo Xiang Tan
41842460b4
UX: Collapse users when composing a private message. 2016-06-29 10:40:38 +08:00
Sam
4b7b80a5c2 Merge pull request #4259 from tgxworld/update_dependencies
Update dependencies
2016-06-29 12:20:18 +10:00
Sam
7a4c3af29d Merge pull request #4279 from scossar/s3cdn-upload-location
FIX: get urlWithCDN before appending protocol
2016-06-29 12:18:44 +10:00
Sam
ef93e75f80 correct #4293 no need to muck with site settings, messes up repeat runs 2016-06-29 12:01:37 +10:00
Sam
d7adfc08bc Merge pull request #4291 from sijad/fix_editorconfig
Set trim_trailing_whitespace false for markdown
2016-06-29 11:55:01 +10:00
Sam
83b08b87d5 Merge pull request #4269 from choiceaustralia/qunit-args
exit if RETRY is false
2016-06-29 11:44:17 +10:00
Sam
7a6b9a953e Merge pull request #4294 from tgxworld/fix_n+1_queries
PERF: Remove N+1 queries on user messages page.
2016-06-29 11:41:06 +10:00
Guo Xiang Tan
4a143d584b
Don't log bullet alerts in the console. 2016-06-29 09:36:32 +08:00
Guo Xiang Tan
e221414935
PERF: Remove N+1 queries on user messages page. 2016-06-29 09:30:54 +08:00
Sam
b4cb2e367c FIX: require full name at signup when display is suppressed and required 2016-06-29 10:43:40 +10:00
Jeff Atwood
8fbcda5bf1 minor copyedit 2016-06-28 14:52:21 -07:00
Robin Ward
8e5a22ba5d Support for mapping multiple mbox imports into categories 2016-06-28 16:35:19 -04:00
Robin Ward
61ce5c210c FIX: S3Cdn link clicks weren't working 2016-06-28 15:52:38 -04:00
Régis Hanol
76766a25bf FIX: wrong translation key 2016-06-28 17:22:34 +02:00
Régis Hanol
f406b9a798 fix lint 2016-06-28 16:49:47 +02:00
Régis Hanol
214f5bff5c don't send more than 1 reply per day to auto-generated emails 2016-06-28 16:42:05 +02:00
Sam
1411eedad3 FEATURE: offer to unwatch categories when unwatching category 2016-06-28 18:34:20 +10:00
Guo Xiang Tan
3e07658fb2
Don't alert. 2016-06-28 11:53:45 +08:00
Guo Xiang Tan
9ed79d8ecd
Add Bullet gem to detect N+1 queries. 2016-06-28 09:29:42 +08:00
Guo Xiang Tan
fc81209564
UX: Missing loading wheel on user notifications page. 2016-06-28 08:37:36 +08:00
Guo Xiang Tan
156953bc55
UX: Better alignment on group page. 2016-06-28 08:33:11 +08:00
Guo Xiang Tan
dc09b9f8d6 Merge pull request #4290 from linc01n/fix-group-title-page-color
UX: fix group header font color
2016-06-28 08:28:16 +08:00
Régis Hanol
d18e9a5293 validator was on the wrong site setting 2016-06-27 22:48:27 +02:00