Commit graph

19629 commits

Author SHA1 Message Date
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
64858c10fe
FIX: Set a not expiring key for user enabled readonly mode. 2016-06-29 15:10:01 +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
7619c2fa2f
FIX: Make sure we add a TTL when we enable readonly mode. 2016-06-29 13:55:17 +08: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
Mittineague
322d3e8a9c Merge remote-tracking branch 'origin/master' 2016-06-28 17:42:26 -04: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
Régis Hanol
376881845c always strip s/mime signatures in incoming emails 2016-06-27 22:26:05 +02:00
Neil Lalonde
32b22996d0 FEATURE: vanilla_mysql importer can import tags 2016-06-27 16:17:00 -04:00
Régis Hanol
f3905fd99a FIX: S3 CDN wasn't applied to lightboxed images 2016-06-27 22:08:49 +02:00
Régis Hanol
5eda2f43c6 small topic/category guardians refactor 2016-06-27 14:36:57 +02:00
Sam
ea46e5dd57 UX: add minimum height for zoomed composer on mobile 2016-06-27 17:22:42 +10:00
Guo Xiang Tan
994063ac72
UX: Disable toolbar by default on Android devices. 2016-06-27 15:06:58 +08:00
Sam
3ad1423c53 UX: autofocus the edit reason text field 2016-06-27 16:49:16 +10:00
Jeff Atwood
db1b0e2235 minor copyedit 2016-06-26 23:34:40 -07:00
Guo Xiang Tan
5ba12840e0 Merge pull request #4285 from tgxworld/fix_polls_not_cooked
FIX: Incorrect model for embedded post widget.
2016-06-27 13:31:03 +08:00
Guo Xiang Tan
63b8797667
FIX: Incorrect model for embedded post widget. 2016-06-27 13:15:26 +08:00
Arpit Jalan
1b80f1ea39 Fix the build :fired: 2016-06-27 01:11:56 +05:30
Arpit Jalan
83309752ae FEATURE: new site setting 'code formatting style' 2016-06-27 01:00:11 +05:30
Régis Hanol
800081f606 FIX: staged users weren't able to reply in restricted categories 2016-06-26 19:25:45 +02:00
Régis Hanol
74e93d2260 FIX: Reply As New Topic from all 3 different places 2016-06-26 14:20:22 +02:00
Régis Hanol
589bae5c03 try to fix badly encoded emails 2016-06-26 13:27:34 +02:00
Sajjad Hashemian
c3d4219d41 Set trim_trailing_whitespace false for markdown 2016-06-25 22:29:01 +04:30