catstodon

CatCatNya/catstodon

Fork 0

forked from glitch-soc-github-mirror/mastodon

Commit graph

f69d7cb43b fix purge_removed_accounts task should suspend account before delete it (#6521) takayamaki 2018-02-22 00:30:46 +09:00
a7171af0a3

Fix avatar and header issues by using custom geometry detector (#6515) Eugen Rochko 2018-02-21 03:40:12 +01:00
a4fd4ad1d5 Fix build error for missing variable interpolation in chown instruction (#6519) Moritz Heiber 2018-02-20 19:11:36 +01:00
02856073f7

Fix #6509: Use pull queue for chewy jobs (#6513) Eugen Rochko 2018-02-20 17:25:16 +01:00
be9bab171d

Set Docker permissions during the build process (#6514) Eugen Rochko 2018-02-20 17:25:01 +01:00
544543e40a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-02-20 16:17:11 +00:00
7124881273 Improve performance of feed_manager_spec (#6517) abcang 2018-02-21 00:50:12 +09:00
1445ba1703 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-02-19 15:17:14 +00:00
66105929e0

Don't resize avatars/headers if their dimensions are already right (#6508) Eugen Rochko 2018-02-19 16:06:12 +01:00
cbb69d41f6

Fix media spoiler design (#6507) Eugen Rochko 2018-02-19 02:39:18 +01:00
bb26cdda24 add parameter locked to /api/v1/update_credentials (#6506) Konrad Pozniak 2018-02-18 22:57:53 +01:00
78936461d7 Added fetch_remote_status_service call spec case actibitypub (#6500) Kazushige Tominaga 2018-02-19 00:34:03 +09:00
bc6751ecce Remove outline from body window (Fixes #6501) (#6502) HellPie 2018-02-18 16:32:58 +01:00
51869f2a8c Remove unnecessary g++ configuration (#6499) Akihiko Odaki 2018-02-19 00:32:17 +09:00
cba2897108

Cache relationships in API (#6482) Eugen Rochko 2018-02-18 03:14:46 +01:00
9b8a448477 Isolate each specs for cache store (#6450) Akihiko Odaki 2018-02-18 06:35:05 +09:00
a71af98401

Push discovered status through streaming API within a time window (#6484) Eugen Rochko 2018-02-17 14:28:48 +01:00
a7c50c7aba Limit the languages used for notification mailer test (#6487) Akihiko Odaki 2018-02-17 22:27:51 +09:00
3d033a4687

Merge remote-tracking branch 'tootsuite/master' into merge-upstream David Yip 2018-02-17 00:02:37 -06:00
c770b503c0 Fix Spanish translation of remote_follow acct (#6475) Simó Albert i Beltran 2018-02-16 19:53:38 +01:00
ffdf0f2ff6 Fix Catalan translation of remote_follow acct (#6476) Simó Albert i Beltran 2018-02-16 19:15:56 +01:00
eb3262b941 [Nanobox] Fix backups for file storage (#6483) Daniel Hunsaker 2018-02-16 09:10:01 -07:00
9dbae6e8a1

Save video metadata and improve video OpenGraph tags (#6481) Eugen Rochko 2018-02-16 07:22:20 +01:00
1122579216

Do not hide NSFW media/CW'd text in OpenGraph tags (#6479) Eugen Rochko 2018-02-16 04:40:53 +01:00
478ca39e5e

After click to embed video, autoplay it (#6480) Eugen Rochko 2018-02-15 23:05:12 +01:00
f7765acf9d

Fix #5173: Click card to embed external content (#6471) Eugen Rochko 2018-02-15 07:04:28 +01:00
ecdac9017e Fix media button type (#6478) abcang 2018-02-15 12:40:42 +09:00
ba8ec4eed6 i18n: Update Polish translation (#6470) Marcin Mikołajczak 2018-02-13 23:55:45 +01:00
e9052ceaaf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-02-11 23:17:11 +00:00
6ef3874b2e Fix URLs incorrectly having trailing hyphen removed (#6465) Daniel King 2018-02-11 22:49:18 +00:00
e20700fe8f

Fix Chewy trying to update index with the wrong strategy (#6464) Eugen Rochko 2018-02-11 22:59:44 +01:00
5ffa6f0fa1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-02-11 18:17:11 +00:00
cf36d184f4

Interactive rake mastodon:setup task (#6451) Eugen Rochko 2018-02-11 18:40:57 +01:00
efc9ffcb80 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-02-11 04:10:16 +00:00
b6159bcb0a

Merge remote-tracking branch 'origin/merge-upstream' David Yip 2018-02-10 22:08:45 -06:00
136458eaf4

Merge pull request #362 from ThibG/glitch-soc/fix-notifications-clearing beatrix 2018-02-10 21:47:27 -05:00
20b519f0fc

Merge pull request #236 from glitch-soc/plaintext-mutes beatrix 2018-02-10 21:46:19 -05:00
380989def8

Remove NOKOGIRI_USE_SYSTEM_LIBRARIES from Travis. #236. David Yip 2018-02-10 11:01:49 -06:00
fb6f131fa1 Revert 245816ab27 (fixes #348) Thibaut Girka 2018-02-10 20:56:48 +01:00
f1f67c46c5

Use Html2Text to generate plaintext for keyword mutes. #236. David Yip 2018-02-10 10:32:14 -06:00
9105b0c954

Introduce html2text for extracting plaintext from statuses. #236. David Yip 2018-02-10 02:32:39 -06:00
53c86b29f0

Glitch::FilterHelper -> Glitch::KeywordMuteHelper. #234. David Yip 2017-12-03 21:49:55 -06:00
718802a05d Added FetchRemoteAccountService spec (#6456) Kazushige Tominaga 2018-02-11 01:10:58 +09:00
411c9ecb4b Fix password recovery (#6459) ThibG 2018-02-10 17:09:44 +01:00
d263e3bc2d

Fill out some examples for Glitch::FilterHelper. #234. David Yip 2017-12-03 21:40:28 -06:00
29b5b46c87

Strip HTML from keyword mute input. #234. David Yip 2017-12-03 17:28:30 -06:00
cbe8743e47 Added #call spec (#6455) Kazushige Tominaga 2018-02-10 11:31:38 +09:00
3ebc0ad4d3

Full-text search for authorized statuses (#6423) Eugen Rochko 2018-02-09 23:04:47 +01:00
b8efc3fc0b

Normalize simple_form.en.yml. David Yip 2018-02-09 09:41:57 -06:00
020b40efdb

Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-02-09 09:25:53 -06:00
235c14c79d fix-indent (#6453) masarakki 2018-02-09 23:29:48 +09:00
2ef9d0e101

Change web UI "posts" to "toots" on profile for consistency (#6447) Eugen Rochko 2018-02-09 00:27:18 +01:00
76f3d5d16b

Add preference to always display sensitive media (#6448) Eugen Rochko 2018-02-09 00:26:57 +01:00
5ba2c300d8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-02-08 23:17:14 +00:00
1167c6dbf8 Perform request spec (#6446) Kazushige Tominaga 2018-02-09 08:12:35 +09:00
298c81c00f Clear account cache of notification target_status (#6442) abcang 2018-02-08 23:33:23 +09:00
cf32f7da5c Fix response of signature_verification_failure_reason (#6441) abcang 2018-02-08 13:00:45 +09:00
2bb393684b Added #link_header spec (#6439) Kazushige Tominaga 2018-02-08 08:17:53 +09:00
67f7ffa792 Change user_id column non-nullable (#6435) Akihiko Odaki 2018-02-08 00:35:44 +09:00
3405ea6dd9 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-02-05 02:17:12 +00:00
95c8232109 match hashtag regex in js client with server (#6431) Daniel King 2018-02-05 01:44:13 +00:00
e815d6803d

db/schema.rb: resolve erroneously-unresolved conflict David Yip 2018-02-04 17:04:22 -06:00
a6fb1c58ee

Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-02-04 16:36:19 -06:00
38e0133e1b

Make PAM gem optional, allow configuration over environment (#6415) Eugen Rochko 2018-02-04 15:05:53 +01:00
9b6223f5e2 Validation of count works even when text of status is nil (#6429) abcang 2018-02-04 20:32:41 +09:00
3f35d43222 Exclude nil from relationships array (#6427) abcang 2018-02-04 20:32:10 +09:00
c156a83e7d Make sure status is not nil (#6428) abcang 2018-02-04 20:31:46 +09:00
258dcb849f Upgrade Vagrant box to Xenial (#6421) Daniel King 2018-02-04 05:03:01 +00:00
4e4f1b0dcb Add option to show only local toots in timeline preview (#6292) Renato "Lond" Cerqueira 2018-02-04 06:00:10 +01:00
26f21fd5a0

CAS + SAML authentication feature (#6425) Eugen Rochko 2018-02-04 05:42:13 +01:00
530fcc1c14 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-02-04 03:17:11 +00:00
c14f59c542

Merge pull request #357 from KnzkDev/fix/detail-style David Yip 2018-02-03 20:20:58 -06:00
15a5b3372a

Fix detailed-status ncls7615 2018-02-04 10:35:09 +09:00
fa361ccc5e

change referrer policy to same-origin beatrix 2018-02-03 14:49:00 -05:00
9da81a1639 Isolate internal services from external networks in Docker configuration (#6369) Akihiko Odaki 2018-02-04 02:44:22 +09:00
d75d2a9f99 fix ColumnBackButtonSlim should extended from ColumnBackButton (#6417) takayamaki 2018-02-04 02:41:51 +09:00
f7bf36d8fc Require environment for generate_static_pages (#6420) Akihiko Odaki 2018-02-04 02:41:01 +09:00
4c1fd9a19c

Merge remote-tracking branch 'tootsuite/master' into merge-upstream David Yip 2018-02-02 08:39:52 -06:00
33f56811e3 Fix column header button (#6411) abcang 2018-02-02 21:31:28 +09:00
7e5c433dfc Fix saving of oEmbed image (#6409) abcang 2018-02-02 19:57:59 +09:00
c1efe0aa1d Set minimum height for mastodon on drawer (#6142) Akihiko Odaki 2018-02-02 19:56:50 +09:00
ac1093256c Allow HTTP caching of atom-rendered public toots (OStatus compatibility) (#6207) ThibG 2018-02-02 10:54:04 +01:00
af40824998 moved save button (#3792) Charlotte Fields 2018-02-02 20:45:43 +11:00
77dd9e7d27 Remove wave from list drawer (#6381) Akihiko Odaki 2018-02-02 18:32:41 +09:00
5da5c65db8 Unify links container implementation in about pages (#6382) Akihiko Odaki 2018-02-02 18:32:21 +09:00
0be9a1e321 Accept ActivityPub announce from the author of the original note (#6236) Akihiko Odaki 2018-02-02 18:22:15 +09:00
8e4cf6282b Allow retrieval of private statuses (single or in outbox) using HTTP signatures (#6225) puckipedia 2018-02-02 10:19:59 +01:00
04fef7b888 pam authentication (#5303) Alexander 2018-02-02 10:18:55 +01:00
1afc70c990 Fix mistake in cache deletion (#6408) abcang 2018-02-02 18:10:18 +09:00
f4bd51da1e Upgrade Paperclip > 5.2.1 (#6404) Rob Watson 2018-02-01 16:54:22 +00:00
ffb2b8ef8c Fix button hiding when header title is too long (#6406) abcang 2018-02-02 01:17:17 +09:00
ad3a2dfb66 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-01-31 23:17:13 +00:00
3ed194b67d Russian language updated (#6397) Evgeny Petrov 2018-02-01 01:33:54 +03:00
2cff744cdf fix ruby 2.5 rvm install in vagrant (#6396) Daniel King 2018-01-31 20:52:58 +00:00
f4b2478af1

Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-01-28 22:45:17 -06:00
e14c20582f

Bump version to 2.2.0 Eugen Rochko 2018-01-29 01:12:36 +01:00
47eda1e5fb

Fix padding bug in landing page column header (#6374) Eugen Rochko 2018-01-29 01:10:59 +01:00
97dcfb0f50

ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372) Eugen Rochko 2018-01-29 01:06:39 +01:00
79bc3d5845

Add direction tags to HTML e-mails for RTL languages (#6373) Eugen Rochko 2018-01-29 00:22:20 +01:00
106efba800 Weblate translations (#6370) Renato "Lond" Cerqueira 2018-01-28 14:48:09 +01:00
bd8d8ad894 l10n Occitan update (#6367) Quenty31 2018-01-27 00:51:03 +01:00
00ce2be148

Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-01-24 23:10:19 -06:00
7e07e61a30 Do not manually update system RubyGems (#6355) Akihiko Odaki 2018-01-25 12:23:29 +09:00
4a974c6db1 Do not require sudo on Travis CI (#6356) Akihiko Odaki 2018-01-25 12:23:09 +09:00
0e10667fbe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-01-24 19:17:11 +00:00
1b4d79acf8

Merge pull request #346 from KnzkDev/fix/travis David Yip 2018-01-24 13:09:13 -06:00
5a4de1cf0f

Merge pull request #349 from codl/patch-1 beatrix 2018-01-24 08:56:38 -05:00
a3c0a20373 Fix initial_state me in push_notification_register (#6349) abcang 2018-01-24 22:37:46 +09:00
9abb5becf4

remove escapes from server-side γaml handler codl 2018-01-24 14:23:25 +01:00
8cd2828e91 Fix hide and show media button on admin page (#6347) abcang 2018-01-24 21:29:46 +09:00
3d881eed27 Add packs volume to docker-compose.yml (#6348) Yamagishi Kazutoshi 2018-01-24 21:29:32 +09:00
7650506b39 l10n Occitan language update (#6346) Quenty31 2018-01-24 13:29:03 +01:00
e6db3427b7

Bump to 2.2.0rc2 Eugen Rochko 2018-01-24 04:16:30 +01:00
daefbd66a6

Fix style of legacy column headers (#6342) Eugen Rochko 2018-01-24 04:03:51 +01:00
b1daa71da5

Fix #6311: Replace relative URLs in CSS only for Premailer (#6335) Eugen Rochko 2018-01-24 02:57:14 +01:00
1cc44cba81

Fix #6331 (#6341) Eugen Rochko 2018-01-23 20:52:30 +01:00
c53d7196e6

Merge pull request #334 from ThibG/glitch-soc/cleanup-leftover-code David Yip 2018-01-23 10:27:13 -06:00
4ec9d8b4d9 Display deleted users' role as “Suspended” (#6339) ThibG 2018-01-23 14:31:31 +01:00
d966878e87

Update goldfinger, ostatus2 and http.rb versions (#6337) Eugen Rochko 2018-01-23 14:30:42 +01:00
2fc2725076

Fix e-mail icon for reblog being stretched (#6336) Eugen Rochko 2018-01-23 14:30:28 +01:00
2107891edb Remove some leftover code, I guess Thibaut Girka 2018-01-18 17:18:01 +01:00
0ddeed9377 add 'this.props' to fetchLists cwm 2018-01-23 01:23:56 -06:00
16d5f9e162

Fix travis.yml ncls7615 2018-01-23 15:50:59 +09:00
69f13e7bca

Fix regression from #6199: Make entire column header clickable (#6334) Eugen Rochko 2018-01-23 05:06:29 +01:00
939075899e remove unused openOnboardingModal from getting_started cwm 2018-01-22 19:38:34 -06:00
00be9eb3fe merge tootsuite pr #6313 into glitch cwm 2018-01-22 19:05:13 -06:00
613e7c7521 Rename ResolveRemoteAccountService to ResolveAccountService (#6327) Akihiko Odaki 2018-01-22 22:25:09 +09:00
17cecd75ca Rename FetchRemoteResourceService to ResolveURLService (#6328) Akihiko Odaki 2018-01-22 22:24:22 +09:00
8cc65cde27 Resolve URL for local account in follow authorization success view (#6324) Akihiko Odaki 2018-01-22 22:22:14 +09:00
b7f6ddeaf1 Weblate translations (#6323) Renato "Lond" Cerqueira 2018-01-22 14:20:58 +01:00
a90d0419d9

Merge pull request #343 from glitch-soc/merge-upstream-20180121 David Yip 2018-01-21 18:00:08 -06:00
143fb54ab9 Korean translation (#6322) Jeong Arm 2018-01-22 08:49:57 +09:00
48d79007f6

Merge remote-tracking branch 'origin/master' into merge-upstream-20180121 David Yip 2018-01-21 16:26:50 -06:00
81b78fac54

Update Vagrantfile to ubuntu/xenial64. David Yip 2018-01-21 16:09:40 -06:00
48cd6dc6ca armenian translations initial commit (#6320) Norayr Chilingarian 2018-01-22 00:02:23 +04:00
1253279feb

Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-01-21 13:36:10 -06:00
cfd2b06821 fix filter search index being too strict when looking for line breaks (#6318) codl 2018-01-21 13:23:17 +01:00
d613dda91d Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319) ThibG 2018-01-21 13:22:31 +01:00
112b1fa265 Redirect to 2FA creation page when otp_secret is not available (#6314) Aboobacker MK 2018-01-21 17:51:28 +05:30
31d1485887

Display number of follow requests in getting started menu, and (#6313) Eugen Rochko 2018-01-21 13:20:20 +01:00
1287de1b83

Fix invalid value passed to full_asset_url in mailers (#6312) Eugen Rochko 2018-01-21 13:20:00 +01:00
2c578a01d8

Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-01-20 16:42:57 -06:00
e7a0840f8c

Merge pull request #336 from ThibG/glitch-soc/features/tag-warning David Yip 2018-01-20 16:37:52 -06:00
24b6e4121f

Merge pull request #342 from glitch-soc/merge-upstream David Yip 2018-01-20 16:37:35 -06:00
72f9eab3d6 Change mailer avatar url (#6309) Iijima Yasushi 2018-01-21 03:27:13 +09:00
3cae362214

Merge new onboarding styles; delete refs to PNGs. David Yip 2018-01-20 11:23:06 -06:00
38f6d8130d

Eliminate stray conflict markers. David Yip 2018-01-20 10:46:43 -06:00
071c2c9c85

Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-01-20 10:45:43 -06:00
0b7a0d15c7

Bump version to 2.2.0rc1 Eugen Rochko 2018-01-20 16:27:19 +01:00
80b3ca0f6f Update Simplified Chinese translations (#6306) SerCom_KC 2018-01-20 23:11:21 +08:00
45afdf1781

Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views (#6305) Eugen Rochko 2018-01-20 03:49:06 +01:00
79b34a0fa2

Restore onboarding modal (#6303) Eugen Rochko 2018-01-20 01:32:37 +01:00
872a0d5bd8

Improve HTML e-mails based on Litmus tests (#6301) Eugen Rochko 2018-01-20 01:32:21 +01:00
01421999ae

Make text e-mails consistent with HTML ones in UserMailer (#6291) Eugen Rochko 2018-01-20 01:32:05 +01:00
2ca965c704

Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-01-19 15:22:10 -06:00
b8c6656ce9

Merge pull request #339 from ThibG/glitch-soc/features/timeline-tweaks David Yip 2018-01-19 15:17:20 -06:00
1619efd735 Do not discard statuses obtained via websocket when API request finishes Thibaut Girka 2018-01-19 21:59:12 +01:00
0b888acfd4 Do not throw away statuses obtained via websocket when API request finishes (#6302) ThibG 2018-01-19 21:48:00 +01:00
238de58e65 Change belongs_to_required_by_default to true (#5888) Yamagishi Kazutoshi 2018-01-20 04:56:47 +09:00
7233ac07d2 Add support Ruby v2.5.0 (#6097) Yamagishi Kazutoshi 2018-01-20 04:53:30 +09:00
b1e03197fa Process mentions and reblogs even from resolved threads (#6299) ThibG 2018-01-19 19:11:35 +01:00
7be53a10b0 Fix "tzinfo-data is not present" docker error (#6300) Pierre Ozoux 2018-01-19 19:11:19 +01:00
a0de3222dd Retry delivering toots over ActivityPub for about 2 days (#6298) ThibG 2018-01-19 15:49:48 +01:00
540b3f37ae

Replace drawer elephant graphic with a vector image (#6286) Eugen Rochko 2018-01-19 15:25:27 +01:00
852b48295f i18n: Update Polish translation (#6297) Marcin Mikołajczak 2018-01-19 13:49:25 +01:00
1287b2782b Display a warning when composing unlisted toots with something looking like a hashtag Thibaut Girka 2018-01-19 11:34:48 +01:00
2b2de41bc7

Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2018-01-18 23:40:37 -06:00
26ecee79bf

Merge pull request #332 from glitch-soc/merge-upstream David Yip 2018-01-18 22:00:11 -06:00
ae369bceb3

Merge pull request #333 from glitch-soc/win95-update David Yip 2018-01-18 13:35:24 -06:00
9b3b40df66

Fix regeneration marker not expiring (#6290) Eugen Rochko 2018-01-18 20:29:56 +01:00
d799921c75

Replace tutorial modal with welcome e-mail (#6273) Eugen Rochko 2018-01-18 19:17:25 +01:00
766d6aac44

Strip trailing whitespace on win95.scss David Yip 2018-01-18 10:54:50 -06:00
d3f64812a6

Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update David Yip 2018-01-18 10:54:12 -06:00
3896cd5d79

Use absolute paths for new working/not-found SVGs David Yip 2018-01-18 10:25:54 -06:00
bcd86404da

Port 7badad7797 to glitch frontend David Yip 2018-01-18 10:25:37 -06:00
1964a0f941

Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-01-18 09:17:58 -06:00
e27eedbd08

Merge branch 'gs-master' into merge-upstream David Yip 2018-01-18 09:14:28 -06:00
708ec07e27

Style fixes to make eslint happier, hopefully David Yip 2018-01-18 09:13:07 -06:00
e56404be41 When must_be_following_dm is on, only notify if recipient dm'ed user (#6283) Renato "Lond" Cerqueira 2018-01-18 16:12:10 +01:00
201e82686f

Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-01-17 18:37:09 -06:00
7badad7797

Fix home regeneration (#6251) Eugen Rochko 2018-01-17 23:56:03 +01:00
fe5c1f0803 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-01-17 22:17:14 +00:00
59797ee233 Weblate translations (#6284) Renato "Lond" Cerqueira 2018-01-17 23:00:23 +01:00
aa2bf07281 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-01-17 16:17:10 +00:00
fbe7756da6 implement web share target (#6278) りんすき 2018-01-18 01:08:10 +09:00
0a103c7749 Upgrade ESLint to version 4.x (#6276) Yamagishi Kazutoshi 2018-01-18 00:57:15 +09:00
fb16c37d2a Update Simplified Chinese translations (#6280) SerCom_KC 2018-01-17 23:47:25 +08:00
6f244ba82c

Use better reblog icon and improve contrast in HTML e-mails (#6272) Eugen Rochko 2018-01-17 14:12:59 +01:00
ea75ae2d1f Use be_within instead of eq for a to_f test match (#6275) Mike Burns 2018-01-17 06:45:09 -05:00
acb982fc66 Korean translate (#6277) Jeong Arm 2018-01-17 20:42:11 +09:00
eed7484cd6 Change mailer image url (#6279) mayaeh 2018-01-17 20:41:24 +09:00
02194838dd

HTML e-mails for NotificationMailer (#6263) Eugen Rochko 2018-01-16 20:20:15 +01:00
3323b4173e Change disclaimer in email according to #5817 (#6266) SerCom_KC 2018-01-16 13:44:57 +08:00
9a28052e92 Change image URL in mailer to full path (#6264) Yamagishi Kazutoshi 2018-01-16 14:26:46 +09:00
60ff086960 Fixed improper mailer import kibi! 2018-01-15 21:23:26 -08:00
cda845ae0e Fix mailer to use webpack core kibi! 2018-01-15 21:17:03 -08:00
e6fd4bea35 Stop duplicate CI with Pull Request (#6265) Yamagishi Kazutoshi 2018-01-16 14:15:28 +09:00
89a9d629f7

Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-01-15 22:17:48 -06:00
5276c0a090

HTML e-mails for UserMailer (#6256) Eugen Rochko 2018-01-16 03:29:11 +01:00
7861c5f108

Surround mid-text display names with bdi tags (#6257) Eugen Rochko 2018-01-15 18:55:10 +01:00