]> cat aescling's git repositories - mastodon.git/log
mastodon.git
6 years agoFix boosting private toots in detailed view
Thibaut Girka [Sun, 9 Feb 2020 20:37:06 +0000 (21:37 +0100)]
Fix boosting private toots in detailed view

6 years agoMerge pull request #1280 from ThibG/glitch-soc/merge-upstream
ThibG [Sun, 9 Feb 2020 11:56:12 +0000 (12:56 +0100)]
Merge pull request #1280 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoFix tests
Thibaut Girka [Sun, 9 Feb 2020 11:32:33 +0000 (12:32 +0100)]
Fix tests

Well, kinda, it's actually a bug from glitch-soc, but we will have to address it separately.

6 years ago[Glitch] Fix unread indicator on announcements not being aligned with text in web UI
Eugen Rochko [Sat, 8 Feb 2020 22:44:01 +0000 (23:44 +0100)]
[Glitch] Fix unread indicator on announcements not being aligned with text in web UI

Port 90f04ea06425d5774c200818caf08219c172b6f8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Fix native share button not being displayed for unlisted toots
ThibG [Fri, 7 Feb 2020 12:21:25 +0000 (13:21 +0100)]
[Glitch] Fix native share button not being displayed for unlisted toots

Port 02236332bab7c5cc4ddf4a3a778fd956f6851322 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 9 Feb 2020 11:15:55 +0000 (12:15 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `Gemfile`:
  We updated httplog in a separate commit.
  Took upstream's change which updated it further.
- `Gemfile.lock`:
  We updated httplog in a separate commit.
  Took upstream's change which updated it further.
- `app/lib/sanitize_config.rb`:
  Upstream added better unsupported link stripping,
  while we had different sanitizing configs.
  Took only upstream's link stripping code.
- `config/locales/simple_form.pl.yml`:
  Strings unused in glitch-soc had been removed from
  glitch-soc, reintroduced them even if they are not
  useful, to reduce the risk of later merge conflicts.

6 years agoBump httplog from 1.4.1 to 1.4.2 (#13059)
mayaeh [Sun, 9 Feb 2020 11:05:31 +0000 (20:05 +0900)]
Bump httplog from 1.4.1 to 1.4.2 (#13059)

6 years agoupdate gemfile.lock for httplog 1.4.1
Lynne [Sun, 9 Feb 2020 06:39:55 +0000 (16:39 +1000)]
update gemfile.lock for httplog 1.4.1

6 years agoupdate gemfile to reflect yanked httplog 1.4.0
Lynne [Sun, 9 Feb 2020 06:38:57 +0000 (16:38 +1000)]
update gemfile to reflect yanked httplog 1.4.0

6 years agoBump version to 3.1.0 (#13053)
Eugen Rochko [Sat, 8 Feb 2020 23:02:08 +0000 (00:02 +0100)]
Bump version to 3.1.0 (#13053)

6 years agoFix unread indicator on announcements not being aligned with text in web UI (#13052)
Eugen Rochko [Sat, 8 Feb 2020 22:44:01 +0000 (23:44 +0100)]
Fix unread indicator on announcements not being aligned with text in web UI (#13052)

6 years agoNew Crowdin translations (#13036)
Eugen Rochko [Sat, 8 Feb 2020 22:33:22 +0000 (23:33 +0100)]
New Crowdin translations (#13036)

* New translations en.json (Finnish)
[ci skip]

* New translations en.yml (Finnish)
[ci skip]

* New translations simple_form.en.yml (Finnish)
[ci skip]

* New translations doorkeeper.en.yml (Finnish)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations doorkeeper.en.yml (Ido)
[ci skip]

* New translations en.yml (Croatian)
[ci skip]

* New translations en.json (Malay)
[ci skip]

* New translations en.yml (Malay)
[ci skip]

* New translations en.yml (Malayalam)
[ci skip]

* New translations simple_form.en.yml (Malayalam)
[ci skip]

* New translations doorkeeper.en.yml (Malayalam)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.yml (Marathi)
[ci skip]

* New translations doorkeeper.en.yml (Marathi)
[ci skip]

* New translations en.yml (Macedonian)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations simple_form.en.yml (Norwegian)
[ci skip]

* New translations doorkeeper.en.yml (Norwegian)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations simple_form.en.yml (Occitan)
[ci skip]

* New translations doorkeeper.en.yml (Occitan)
[ci skip]

* New translations simple_form.en.yml (Persian)
[ci skip]

* New translations en.json (Macedonian)
[ci skip]

* New translations simple_form.en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (Kazakh)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations doorkeeper.en.yml (Japanese)
[ci skip]

* New translations en.json (Kannada)
[ci skip]

* New translations en.yml (Kannada)
[ci skip]

* New translations en.json (Kazakh)
[ci skip]

* New translations en.yml (Kazakh)
[ci skip]

* New translations doorkeeper.en.yml (Kazakh)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations doorkeeper.en.yml (Korean)
[ci skip]

* New translations en.json (Latvian)
[ci skip]

* New translations en.yml (Latvian)
[ci skip]

* New translations en.json (Lithuanian)
[ci skip]

* New translations en.yml (Lithuanian)
[ci skip]

* New translations simple_form.en.yml (Croatian)
[ci skip]

* New translations doorkeeper.en.yml (Galician)
[ci skip]

* New translations en.json (Croatian)
[ci skip]

* New translations simple_form.en.yml (Norwegian Nynorsk)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations doorkeeper.en.yml (German)
[ci skip]

* New translations doorkeeper.en.yml (Greek)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations doorkeeper.en.yml (Italian)
[ci skip]

* New translations en.yml (Norwegian Nynorsk)
[ci skip]

* New translations doorkeeper.en.yml (Norwegian Nynorsk)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations simple_form.en.yml (Icelandic)
[ci skip]

* New translations doorkeeper.en.yml (Icelandic)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations simple_form.en.yml (Corsican)
[ci skip]

* New translations doorkeeper.en.yml (Kabyle)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.yml (Breton)
[ci skip]

* New translations en.json (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations simple_form.en.yml (Arabic)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations doorkeeper.en.yml (Basque)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations doorkeeper.en.yml (Chinese Simplified)
[ci skip]

* New translations doorkeeper.en.yml (Corsican)
[ci skip]

* New translations en.yml (Danish)
[ci skip]

* New translations simple_form.en.yml (Kabyle)
[ci skip]

* New translations doorkeeper.en.yml (Dutch)
[ci skip]

* New translations doorkeeper.en.yml (Bulgarian)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations simple_form.en.yml (Basque)
[ci skip]

* New translations en.json (Bengali)
[ci skip]

* New translations en.yml (Bengali)
[ci skip]

* New translations simple_form.en.yml (Bengali)
[ci skip]

* New translations en.json (Bulgarian)
[ci skip]

* New translations en.yml (Bulgarian)
[ci skip]

* New translations simple_form.en.yml (Bulgarian)
[ci skip]

* New translations simple_form.en.yml (Asturian)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations simple_form.en.yml (Catalan)
[ci skip]

* New translations doorkeeper.en.yml (Catalan)
[ci skip]

* New translations en.json (Chinese Traditional)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]

* New translations doorkeeper.en.yml (Chinese Traditional)
[ci skip]

* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.json (Albanian)
[ci skip]

* New translations en.yml (Albanian)
[ci skip]

* New translations simple_form.en.yml (Albanian)
[ci skip]

* New translations doorkeeper.en.yml (Albanian)
[ci skip]

* New translations doorkeeper.en.yml (Arabic)
[ci skip]

* New translations simple_form.en.yml (Danish)
[ci skip]

* New translations doorkeeper.en.yml (Spanish)
[ci skip]

* New translations doorkeeper.en.yml (Slovenian)
[ci skip]

* New translations en.yml (Welsh)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations doorkeeper.en.yml (Serbian (Latin))
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations simple_form.en.yml (Slovenian)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Welsh)
[ci skip]

* New translations doorkeeper.en.yml (Swedish)
[ci skip]

* New translations en.json (Swedish)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations doorkeeper.en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Telugu)
[ci skip]

* New translations simple_form.en.yml (Tamil)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations simple_form.en.yml (Turkish)
[ci skip]

* New translations doorkeeper.en.yml (Turkish)
[ci skip]

* New translations en.yml (Serbian (Latin))
[ci skip]

* New translations doorkeeper.en.yml (Tamil)
[ci skip]

* New translations simple_form.en.yml (Ukrainian)
[ci skip]

* New translations doorkeeper.en.yml (Ukrainian)
[ci skip]

* New translations en.json (Urdu (Pakistan))
[ci skip]

* New translations en.yml (Urdu (Pakistan))
[ci skip]

* New translations en.json (Welsh)
[ci skip]

* New translations en.json (Telugu)
[ci skip]

* New translations simple_form.en.yml (Serbian (Latin))
[ci skip]

* New translations simple_form.en.yml (Vietnamese)
[ci skip]

* New translations en.json (Serbian (Latin))
[ci skip]

* New translations doorkeeper.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations doorkeeper.en.yml (Persian)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations simple_form.en.yml (Portuguese)
[ci skip]

* New translations doorkeeper.en.yml (Portuguese)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations simple_form.en.yml (Slovak)
[ci skip]

* New translations simple_form.en.yml (Swedish)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations doorkeeper.en.yml (Thai)
[ci skip]

* New translations doorkeeper.en.yml (Vietnamese)
[ci skip]

* New translations en.json (Vietnamese)
[ci skip]

* New translations doorkeeper.en.yml (Slovak)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations doorkeeper.en.yml (Serbian (Cyrillic))
[ci skip]

* New translations simple_form.en.yml (Serbian (Cyrillic))
[ci skip]

* New translations en.yml (Serbian (Cyrillic))
[ci skip]

* New translations en.json (Serbian (Cyrillic))
[ci skip]

* New translations doorkeeper.en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (Romanian)
[ci skip]

* New translations en.json (Slovak)
[ci skip]

* New translations en.yml (Romanian)
[ci skip]

* New translations en.json (Romanian)
[ci skip]

* New translations doorkeeper.en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Polish)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.json (Polish)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations doorkeeper.en.yml (Welsh)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations doorkeeper.en.yml (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations doorkeeper.en.yml (Kabyle)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations simple_form.en.yml (Kabyle)
[ci skip]

* New translations en.json (Catalan)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations simple_form.en.yml (Kabyle)
[ci skip]

* New translations doorkeeper.en.yml (Kabyle)
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations en.json (Welsh)
[ci skip]

* New translations en.json (Welsh)
[ci skip]

* New translations en.yml (Welsh)
[ci skip]

* New translations en.json (Slovak)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.json (Polish)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.json (Polish)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations devise.en.yml (Polish)
[ci skip]

* New translations devise.en.yml (Polish)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Polish)
[ci skip]

* New translations doorkeeper.en.yml (Polish)
[ci skip]

* New translations en.json (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.json (Galician)
[ci skip]

* New translations en.json (Galician)
[ci skip]

* New translations en.json (Galician)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations simple_form.en.yml (Kabyle)
[ci skip]

* New translations doorkeeper.en.yml (Kabyle)
[ci skip]

* New translations devise.en.yml (Japanese)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations simple_form.en.yml (Kabyle)
[ci skip]

* New translations doorkeeper.en.yml (Kabyle)
[ci skip]

* New translations devise.en.yml (Kabyle)
[ci skip]

* i18n-tasks normalize

* yarn manage:translations

6 years agoBump httplog from 1.4.0 to 1.4.1. (#13051)
mayaeh [Sat, 8 Feb 2020 20:39:44 +0000 (05:39 +0900)]
Bump httplog from 1.4.0 to 1.4.1. (#13051)

httplog 1.4.0 is yanked.

6 years agoFix rendering `<a>` without `href` when scheme unsupported (#13040)
Eugen Rochko [Sat, 8 Feb 2020 20:22:38 +0000 (21:22 +0100)]
Fix rendering `<a>` without `href` when scheme unsupported (#13040)

- Disallow links with relative paths
- Disallow iframes with non-http protocols and relative paths

Close #13037

6 years agoFix unfiltered params error when generating ActivityPub tag pagination (#13049)
Eugen Rochko [Sat, 8 Feb 2020 16:29:40 +0000 (17:29 +0100)]
Fix unfiltered params error when generating ActivityPub tag pagination (#13049)

6 years agoFix malformed HTML causing uncaught error (#13042)
Eugen Rochko [Fri, 7 Feb 2020 14:24:22 +0000 (15:24 +0100)]
Fix malformed HTML causing uncaught error (#13042)

Fix OEmbed preview API leaking existence of private statuses (see #12930)

6 years agoFix native share button not being displayed for unlisted toots (#13045)
ThibG [Fri, 7 Feb 2020 12:21:25 +0000 (13:21 +0100)]
Fix native share button not being displayed for unlisted toots (#13045)

6 years agoMerge pull request #1278 from ThibG/glitch-soc/merge-upstream
ThibG [Thu, 6 Feb 2020 21:48:26 +0000 (22:48 +0100)]
Merge pull request #1278 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years ago[Glitch] Fix dates (without time) being rendered as datetimes in public pages
ThibG [Mon, 3 Feb 2020 16:48:56 +0000 (17:48 +0100)]
[Glitch] Fix dates (without time) being rendered as datetimes in public pages

Port c31d61d7f2d576b42ea82ab01470bce7e6e5a3a7 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Don't display toggle reveal button in video modal when full screen
fuyu [Mon, 3 Feb 2020 11:26:00 +0000 (20:26 +0900)]
[Glitch] Don't display toggle reveal button in video modal when full screen

Port 5711899c59147252a01e21371994ca6a60418628 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Thu, 6 Feb 2020 20:36:38 +0000 (21:36 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoAdd environment variable to specify extra data hosts
Thibaut Girka [Thu, 6 Feb 2020 10:25:18 +0000 (11:25 +0100)]
Add environment variable to specify extra data hosts

Fixes #1276

6 years agoFix typo in about page (#13038)
ThibG [Mon, 3 Feb 2020 22:29:42 +0000 (23:29 +0100)]
Fix typo in about page (#13038)

6 years agoFix punycode being returned in some entities instead of unicode in REST API (#13035)
Eugen Rochko [Mon, 3 Feb 2020 20:16:37 +0000 (21:16 +0100)]
Fix punycode being returned in some entities instead of unicode in REST API (#13035)

6 years agoFix remote convertible media attachments not being saved (#13032)
Eugen Rochko [Mon, 3 Feb 2020 17:45:56 +0000 (18:45 +0100)]
Fix remote convertible media attachments not being saved (#13032)

Because the file name was set after loading the file, Paperclip
was flagging the differing file extension as content type spoofing

Fix #12938

6 years agoFix punycode being rendered instead of unicode in some places (#13030)
Eugen Rochko [Mon, 3 Feb 2020 17:44:54 +0000 (18:44 +0100)]
Fix punycode being rendered instead of unicode in some places (#13030)

6 years agoFix dates (without time) being rendered as datetimes in public pages (#13034)
ThibG [Mon, 3 Feb 2020 16:48:56 +0000 (17:48 +0100)]
Fix dates (without time) being rendered as datetimes in public pages (#13034)

6 years agoChange signature verification to ignore signatures with invalid host (#13033)
Eugen Rochko [Mon, 3 Feb 2020 16:48:23 +0000 (17:48 +0100)]
Change signature verification to ignore signatures with invalid host (#13033)

Instead of returning a signature verification error, pretend there
was no signature (i.e., this does not allow access to resources that
need a valid signature), so public resources can still be fetched

Fix #13011

6 years agoNew Crowdin translations (#12953)
Eugen Rochko [Mon, 3 Feb 2020 14:52:20 +0000 (15:52 +0100)]
New Crowdin translations (#12953)

* New translations en.json (Romanian)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.json (Serbian (Cyrillic))
[ci skip]

* New translations en.json (Serbian (Latin))
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* New translations en.json (Lithuanian)
[ci skip]

* New translations en.json (Macedonian)
[ci skip]

* New translations en.json (Malay)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Norwegian)
[ci skip]

* New translations en.json (Occitan)
[ci skip]

* New translations en.json (Estonian)
[ci skip]

* New translations en.json (Portuguese)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations en.json (Icelandic)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.json (German)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.json (Indonesian)
[ci skip]

* New translations en.json (Slovak)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Chinese Simplified)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.json (Corsican)
[ci skip]

* New translations en.json (Chinese Traditional)
[ci skip]

* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.json (Bulgarian)
[ci skip]

* New translations en.json (Croatian)
[ci skip]

* New translations en.json (Czech)
[ci skip]

* New translations en.json (Danish)
[ci skip]

* New translations en.json (Esperanto)
[ci skip]

* New translations en.json (Catalan)
[ci skip]

* New translations en.json (Albanian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.json (Bengali)
[ci skip]

* New translations en.json (Basque)
[ci skip]

* New translations en.json (Welsh)
[ci skip]

* New translations en.json (Ukrainian)
[ci skip]

* New translations en.json (Telugu)
[ci skip]

* New translations en.json (Turkish)
[ci skip]

* New translations en.json (Urdu (Pakistan))
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Vietnamese)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations en.json (Spanish, Argentina)
[ci skip]

* New translations en.json (Swedish)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.json (German)
[ci skip]

* New translations en.json (Portuguese)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.json (French)
[ci skip]

* New translations en.json (Galician)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.json (Turkish)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.json (German)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations simple_form.en.yml (Kabyle)
[ci skip]

* New translations doorkeeper.en.yml (Kabyle)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.json (Greek)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.json (Korean)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.json (Norwegian)
[ci skip]

* New translations doorkeeper.en.yml (Norwegian)
[ci skip]

* New translations en.json (Basque)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations simple_form.en.yml (Basque)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations en.json (Occitan)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations doorkeeper.en.yml (Occitan)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations en.json (Corsican)
[ci skip]

* New translations en.json (Indonesian)
[ci skip]

* New translations en.json (Catalan)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Kazakh)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations en.json (Hungarian)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations simple_form.en.yml (Finnish)
[ci skip]

* New translations en.json (Spanish, Argentina)
[ci skip]

* New translations en.json (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Norwegian Nynorsk)
[ci skip]

* New translations doorkeeper.en.yml (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.json (Esperanto)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations en.json (Icelandic)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations simple_form.en.yml (Esperanto)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.json (Turkish)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.json (Estonian)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations doorkeeper.en.yml (Dutch)
[ci skip]

* New translations simple_form.en.yml (Dutch)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations simple_form.en.yml (Dutch)
[ci skip]

* New translations simple_form.en.yml (Estonian)
[ci skip]

* New translations simple_form.en.yml (Dutch)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations simple_form.en.yml (Asturian)
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations doorkeeper.en.yml (Asturian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations doorkeeper.en.yml (Asturian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Kazakh)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations devise.en.yml (Persian)
[ci skip]

* New translations devise.en.yml (Persian)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations en.json (Korean)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations en.json (Ukrainian)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations simple_form.en.yml (Dutch)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations simple_form.en.yml (Dutch)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations en.json (Occitan)
[ci skip]

* New translations simple_form.en.yml (Occitan)
[ci skip]

* New translations simple_form.en.yml (Occitan)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations doorkeeper.en.yml (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations simple_form.en.yml (Occitan)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations devise.en.yml (Asturian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.json (Italian)
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.json (Asturian)
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations en.json (Chinese Simplified)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* i18n-tasks normalize

* yarn manage:translations

6 years agoDon't display toggle reveal button in video modal when full screen (#13026)
fuyu [Mon, 3 Feb 2020 11:26:00 +0000 (20:26 +0900)]
Don't display toggle reveal button in video modal when full screen (#13026)

6 years agoFix poll compose form being broken on single-column layout
Thibaut Girka [Mon, 3 Feb 2020 10:40:41 +0000 (11:40 +0100)]
Fix poll compose form being broken on single-column layout

6 years agoMerge pull request #1274 from ThibG/glitch-soc/merge-upstream
ThibG [Mon, 3 Feb 2020 09:27:07 +0000 (10:27 +0100)]
Merge pull request #1274 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years ago[Glitch] Change how unread announcements are handled
ThibG [Mon, 3 Feb 2020 00:53:09 +0000 (01:53 +0100)]
[Glitch] Change how unread announcements are handled

Port 3adc722d1cdd28d87d2724b8952d7ec52d241b52 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Add "Show thread" button to public profiles
Sasha Sorokin [Wed, 29 Jan 2020 16:35:54 +0000 (11:35 -0500)]
[Glitch] Add "Show thread" button to public profiles

Port 50cd73e5d7e39600203c9c3f591f04289f41e297 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Fix mascot being too large, and a code style issue
Eugen Rochko [Wed, 29 Jan 2020 15:18:33 +0000 (16:18 +0100)]
[Glitch] Fix mascot being too large, and a code style issue

Port bba0269d9741c8c4daaa9048c265a1321d93fbba to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Mon, 3 Feb 2020 08:22:58 +0000 (09:22 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoChange how unread announcements are handled (#13020)
ThibG [Mon, 3 Feb 2020 00:53:09 +0000 (01:53 +0100)]
Change how unread announcements are handled (#13020)

* Change meaning of /api/v1/announcements/:id/dismiss to mark an announcement as read

* Change how unread announcements are counted in UI

* Add unread marker to announcements and mark announcements as unread as they are displayed

* Fixups

6 years agoWhen submitting markers, use last displayed notification, not last received one
Thibaut Girka [Sat, 1 Feb 2020 16:53:28 +0000 (17:53 +0100)]
When submitting markers, use last displayed notification, not last received one

6 years agoFetch last read notification id to update unread notification count on load
Thibaut Girka [Sat, 1 Feb 2020 16:03:39 +0000 (17:03 +0100)]
Fetch last read notification id to update unread notification count on load

6 years agoSearch account domain in lowercase (#13016)
abcang [Sat, 1 Feb 2020 14:42:24 +0000 (23:42 +0900)]
Search account domain in lowercase (#13016)

* Search account domain in lowercase

* fix rubocop error

* fix spec/models/account_spec.rb

6 years agoFix error when sending moderation notification (#13014)
Renato "Lond" Cerqueira [Sat, 1 Feb 2020 14:42:12 +0000 (15:42 +0100)]
Fix error when sending moderation notification (#13014)

Since the statuses helper is not loaded, the rtl helper cannot be found
and the email cannot be sent.

6 years agoFix Node version in Vagrant (#13008)
Даниил Пронин [Thu, 30 Jan 2020 11:05:56 +0000 (21:05 +1000)]
Fix Node version in Vagrant (#13008)

6 years agoFix english wording (#13003)
ThibG [Wed, 29 Jan 2020 17:39:44 +0000 (18:39 +0100)]
Fix english wording (#13003)

6 years agoAdd "Show thread" button to public profiles (#13000)
Sasha Sorokin [Wed, 29 Jan 2020 16:35:54 +0000 (11:35 -0500)]
Add "Show thread" button to public profiles (#13000)

This adds "Show thread" button to the status view which is used in
profiles. The logic to display the button is mimicking logic in
web app available at app/javascript/mastodon/components/status.js#L439.

* The little change in components CSS required to remove enforced
  underline for all links on public pages on our button.

6 years agoFix mascot being too large, and a code style issue (#13002)
Eugen Rochko [Wed, 29 Jan 2020 15:18:33 +0000 (16:18 +0100)]
Fix mascot being too large, and a code style issue (#13002)

6 years agoBump version to 3.1.0rc2 (#12999)
Eugen Rochko [Tue, 28 Jan 2020 19:56:32 +0000 (20:56 +0100)]
Bump version to 3.1.0rc2 (#12999)

6 years agoUpdate Dockerfile (#12997)
Shlee [Tue, 28 Jan 2020 19:33:09 +0000 (03:33 +0800)]
Update Dockerfile (#12997)

6 years agoAdd missing translations (#12996)
Sasha Sorokin [Tue, 28 Jan 2020 19:28:38 +0000 (14:28 -0500)]
Add missing translations (#12996)

This commit adds missing translations for #12966 and #12954.

6 years agoAdd support for xmpp: and magnet: URIs to misleading link detection code
Thibaut Girka [Sun, 26 Jan 2020 14:26:03 +0000 (15:26 +0100)]
Add support for xmpp: and magnet: URIs to misleading link detection code

6 years agoMerge pull request #1272 from ThibG/glitch-soc/merge-upstream
ThibG [Tue, 28 Jan 2020 18:38:37 +0000 (19:38 +0100)]
Merge pull request #1272 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years ago[Glitch] Fix design of announcements in admin UI
Eugen Rochko [Tue, 28 Jan 2020 01:21:00 +0000 (02:21 +0100)]
[Glitch] Fix design of announcements in admin UI

Port 305abc9e05ddb2db6a40a6eda01578e01e58791f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Change announcements to be collapsed on page load in web UI
Eugen Rochko [Tue, 28 Jan 2020 01:20:47 +0000 (02:20 +0100)]
[Glitch] Change announcements to be collapsed on page load in web UI

Port 0fcc4b1c566e4365e07ce5a1c87743db76c07fe6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Tue, 28 Jan 2020 18:15:03 +0000 (19:15 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoFix Gemfile.lock (#12995)
ThibG [Tue, 28 Jan 2020 17:50:44 +0000 (18:50 +0100)]
Fix Gemfile.lock (#12995)

* Use bundle install in deployment mode for Continuous Integration to catch Gemfile.lock issues

* Fix deprecation warnings

* Fix Gemfile.lock

* More changes to catch Gemfile.lock issues

6 years agoUpdate changelog for 3.1.0rc1 (#12992)
Eugen Rochko [Tue, 28 Jan 2020 16:19:42 +0000 (17:19 +0100)]
Update changelog for 3.1.0rc1 (#12992)

6 years agoBump Rack from 2.0.8 to 2.1.2 (#12991)
Shlee [Tue, 28 Jan 2020 14:23:16 +0000 (22:23 +0800)]
Bump Rack from 2.0.8 to 2.1.2 (#12991)

* Update Gemfile

* Update Gemfile.lock

6 years agoFix regressions caused by #12961 (#12961)
Sasha Sorokin [Tue, 28 Jan 2020 01:21:18 +0000 (20:21 -0500)]
Fix regressions caused by #12961 (#12961)

This commit attempts to fix most of regressions caused by #12961
pull request which added even spread of space between tabs.

The following fixes were done:

- Don't hide overflow in tabs

   As tabs use ::after and ::before pseudo-elements to create arrow on
   the bottom of selected tab, "overflow: hidden" will cause this arrow
   to look split from the bottom container.

   For the future we probably should use slider element instead, which
   would align according to currently selected tab, instead of relying
   on pseudo-elements. Such method would also allow smooth transitions.

- Disallow wrapping tab text on insufficient space

   This would fix some unwanted behavior[1] when on insufficient width,
   renderer might attempt wrapping text to not overtake others' space.

   [1]: https://mastodon.social/@Gargron/103546083813829165

6 years agoFix design of announcements in admin UI (#12989)
Eugen Rochko [Tue, 28 Jan 2020 01:21:00 +0000 (02:21 +0100)]
Fix design of announcements in admin UI (#12989)

6 years agoChange announcements to be collapsed on page load in web UI (#12990)
Eugen Rochko [Tue, 28 Jan 2020 01:20:47 +0000 (02:20 +0100)]
Change announcements to be collapsed on page load in web UI (#12990)

6 years agoMerge pull request #1271 from ThibG/glitch-soc/merge-upstream
ThibG [Mon, 27 Jan 2020 16:26:53 +0000 (17:26 +0100)]
Merge pull request #1271 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years ago[Glitch] Change number animations direction based on decrease or increase
Eugen Rochko [Mon, 27 Jan 2020 10:04:11 +0000 (11:04 +0100)]
[Glitch] Change number animations direction based on decrease or increase

Port 10e209d8e0601ded06e05df573e76935e175cb1c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Add animations to announcement reactions
Eugen Rochko [Mon, 27 Jan 2020 10:03:45 +0000 (11:03 +0100)]
[Glitch] Add animations to announcement reactions

Port dd4eec6bf647a082b9bac2bed09a0105fe14c733 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Change last_status_at to be a date, not datetime
ThibG [Sun, 26 Jan 2020 22:13:48 +0000 (23:13 +0100)]
[Glitch] Change last_status_at to be a date, not datetime

Port 42d2a915e4aa31533032e37aaa46354cee2386da to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Fix link colors in announcements
Eugen Rochko [Sun, 26 Jan 2020 21:26:50 +0000 (22:26 +0100)]
[Glitch] Fix link colors in announcements

Port 2f8c3c17ee26dc21ce94959b0ea18984e7bc5560 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Add streaming API updates for announcements being modified or deleted
Eugen Rochko [Sun, 26 Jan 2020 19:07:26 +0000 (20:07 +0100)]
[Glitch] Add streaming API updates for announcements being modified or deleted

Port b9d74d407673a6dbdc87c3310618b22c85358c85 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Fix status overflowing in report dialog
ThibG [Sat, 25 Jan 2020 21:59:00 +0000 (22:59 +0100)]
[Glitch] Fix status overflowing in report dialog

Port 389e3f6094bfcc4d0338947d29434113320c8142 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Mon, 27 Jan 2020 14:46:50 +0000 (15:46 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/serializers/rest/account_serializer.rb`:
  Upstream added code too close to glitch-soc-specific followers-hiding code.
  Ported upstream changes.

6 years agoRevert "Avoid using uppercase text-transform (#12684)" (#12987)
Eugen Rochko [Mon, 27 Jan 2020 12:44:29 +0000 (13:44 +0100)]
Revert "Avoid using uppercase text-transform (#12684)" (#12987)

This reverts commit 7da54001fe21d1fd10ede5ac78e5c76f25afc08e.

6 years agoExplicitly install rack gem (#12972)
Daigo 3 Dango [Mon, 27 Jan 2020 10:06:34 +0000 (00:06 -1000)]
Explicitly install rack gem (#12972)

Pin rack version to 2.0.8. Rack-2.1.0 and 2.1.1 are known to record error below upon requests to `/sidekiq`:

```
NoMethodError - undefined method `transform_keys' for #<ActionDispatch::Request::Session:0x...>
```

6 years agoAdd publish/unpublish controls to announcements in admin UI (#12967)
Eugen Rochko [Mon, 27 Jan 2020 10:05:33 +0000 (11:05 +0100)]
Add publish/unpublish controls to announcements in admin UI (#12967)

6 years agoFix interactive delays in database migrations with no TTY (#12969)
Eugen Rochko [Mon, 27 Jan 2020 10:04:42 +0000 (11:04 +0100)]
Fix interactive delays in database migrations with no TTY (#12969)

Fix #12587

6 years agoChange number animations direction based on decrease or increase (#12971)
Eugen Rochko [Mon, 27 Jan 2020 10:04:11 +0000 (11:04 +0100)]
Change number animations direction based on decrease or increase (#12971)

6 years agoAdd animations to announcement reactions (#12970)
Eugen Rochko [Mon, 27 Jan 2020 10:03:45 +0000 (11:03 +0100)]
Add animations to announcement reactions (#12970)

6 years agoChange last_status_at to be a date, not datetime (#12966)
ThibG [Sun, 26 Jan 2020 22:13:48 +0000 (23:13 +0100)]
Change last_status_at to be a date, not datetime (#12966)

* Return last_status_at as date, not datetime

* Fix relative timestamp for dates when delay is inferior to 1 day

* Also fix public directory

* Fix error when last_status_at isn't set

6 years agoFix expired announcements being re-published (#12964)
Eugen Rochko [Sun, 26 Jan 2020 21:43:18 +0000 (22:43 +0100)]
Fix expired announcements being re-published (#12964)

6 years agoFix link colors in announcements (#12965)
Eugen Rochko [Sun, 26 Jan 2020 21:26:50 +0000 (22:26 +0100)]
Fix link colors in announcements (#12965)

6 years agoAdd streaming API updates for announcements being modified or deleted (#12963)
Eugen Rochko [Sun, 26 Jan 2020 19:07:26 +0000 (20:07 +0100)]
Add streaming API updates for announcements being modified or deleted (#12963)

Change `all_day` to be a visual client-side cue only

Publish immediately if `scheduled_at` is in the past

Add `published_at` and `updated_at` to announcements JSON

6 years agoRefactor notifications cleaning mode
Thibaut Girka [Sun, 26 Jan 2020 11:17:20 +0000 (12:17 +0100)]
Refactor notifications cleaning mode

6 years agoAdd kabyle language to Mastodon (#12962)
ButterflyOfFire [Sun, 26 Jan 2020 13:42:35 +0000 (14:42 +0100)]
Add kabyle language to Mastodon (#12962)

* Add kabyle language to settings_helper

* Adding kabyle language to application.rb

6 years agoFix status overflowing in report dialog (#12959)
ThibG [Sat, 25 Jan 2020 21:59:00 +0000 (22:59 +0100)]
Fix status overflowing in report dialog (#12959)

Fixes #12942

6 years agoMerge pull request #1268 from ThibG/glitch-soc/merge-upstream
ThibG [Sat, 25 Jan 2020 19:31:22 +0000 (20:31 +0100)]
Merge pull request #1268 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years ago[Glitch] Fix “new items glow” being displayed above settings and announcements
ThibG [Sat, 25 Jan 2020 18:40:36 +0000 (19:40 +0100)]
[Glitch] Fix “new items glow” being displayed above settings and announcements

Port 90b13ffd009a431dbe98c37bc92ee59a6f0535f2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Fix spurious error and incorrect state change when adding a reaction twice
ThibG [Sat, 25 Jan 2020 17:19:24 +0000 (18:19 +0100)]
[Glitch] Fix spurious error and incorrect state change when adding a reaction twice

Port c06d2ff43718af5940987e219379094f1a2de180 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sat, 25 Jan 2020 18:46:24 +0000 (19:46 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoFix “new items glow” being displayed above settings and announcements (#12958)
ThibG [Sat, 25 Jan 2020 18:40:36 +0000 (19:40 +0100)]
Fix “new items glow” being displayed above settings and announcements (#12958)

6 years agoMerge pull request #1267 from ThibG/glitch-soc/merge-upstream
ThibG [Sat, 25 Jan 2020 18:07:32 +0000 (19:07 +0100)]
Merge pull request #1267 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoFix spurious error and incorrect state change when adding a reaction twice (#12957)
ThibG [Sat, 25 Jan 2020 17:19:24 +0000 (18:19 +0100)]
Fix spurious error and incorrect state change when adding a reaction twice (#12957)

* Fix spurious error and incorrect state change when adding a reaction twice

* Remove superfluous top border for announcements box

6 years ago[Glitch] Improve announcements design
ThibG [Sat, 25 Jan 2020 15:35:33 +0000 (16:35 +0100)]
[Glitch] Improve announcements design

Port 48c55b6392661cde8e28cf076c3d132c22d17a0f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sat, 25 Jan 2020 15:50:24 +0000 (16:50 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoImprove announcements design (#12954)
ThibG [Sat, 25 Jan 2020 15:35:33 +0000 (16:35 +0100)]
Improve announcements design (#12954)

* Move announcements above scroll container; add button to temporarily hide them

* Remove interface for dismissing announcements

* Display number of unread announcements

* Count unread announcements accurately

* Fix size of announcement box not fitting the currently displayed announcement

* Fix announcement box background color to match button color

6 years agoFix validations of reactions limit (#12955)
Eugen Rochko [Sat, 25 Jan 2020 15:00:29 +0000 (16:00 +0100)]
Fix validations of reactions limit (#12955)

6 years agoMerge pull request #1266 from ThibG/glitch-soc/merge-upstream
ThibG [Sat, 25 Jan 2020 11:23:47 +0000 (12:23 +0100)]
Merge pull request #1266 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoNew Crowdin translations (#12936)
Eugen Rochko [Sat, 25 Jan 2020 10:54:10 +0000 (11:54 +0100)]
New Crowdin translations (#12936)

* New translations simple_form.en.yml (Turkish)
[ci skip]

* New translations en.json (Welsh)
[ci skip]

* New translations en.json (Serbian (Latin))
[ci skip]

* New translations en.json (Urdu (Pakistan))
[ci skip]

* New translations doorkeeper.en.yml (Ukrainian)
[ci skip]

* New translations simple_form.en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations en.json (Ukrainian)
[ci skip]

* New translations doorkeeper.en.yml (Turkish)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations en.json (Swedish)
[ci skip]

* New translations en.json (Turkish)
[ci skip]

* New translations en.yml (Telugu)
[ci skip]

* New translations en.json (Telugu)
[ci skip]

* New translations doorkeeper.en.yml (Tamil)
[ci skip]

* New translations simple_form.en.yml (Tamil)
[ci skip]

* New translations en.yml (Kannada)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations doorkeeper.en.yml (Swedish)
[ci skip]

* New translations doorkeeper.en.yml (Galician)
[ci skip]

* New translations en.json (Kannada)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Portuguese)
[ci skip]

* New translations doorkeeper.en.yml (Portuguese)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations doorkeeper.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations simple_form.en.yml (Swedish)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations en.json (Portuguese)
[ci skip]

* New translations doorkeeper.en.yml (Thai)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations en.json (Icelandic)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations simple_form.en.yml (Icelandic)
[ci skip]

* New translations doorkeeper.en.yml (Icelandic)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations simple_form.en.yml (Kabyle)
[ci skip]

* New translations doorkeeper.en.yml (Kabyle)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations doorkeeper.en.yml (Persian)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations doorkeeper.en.yml (Dutch)
[ci skip]

* New translations en.json (Indonesian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations en.json (Slovak)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations simple_form.en.yml (Slovak)
[ci skip]

* New translations doorkeeper.en.yml (Slovak)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations doorkeeper.en.yml (German)
[ci skip]

* New translations doorkeeper.en.yml (Greek)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations doorkeeper.en.yml (Italian)
[ci skip]

* New translations en.yml (Norwegian Nynorsk)
[ci skip]

* New translations simple_form.en.yml (Norwegian Nynorsk)
[ci skip]

* New translations doorkeeper.en.yml (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Vietnamese)
[ci skip]

* New translations simple_form.en.yml (Vietnamese)
[ci skip]

* New translations doorkeeper.en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Hungarian)
[ci skip]

* New translations en.json (Hebrew)
[ci skip]

* New translations en.yml (Hebrew)
[ci skip]

* New translations simple_form.en.yml (Hebrew)
[ci skip]

* New translations doorkeeper.en.yml (Hebrew)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.yml (Hindi)
[ci skip]

* New translations en.json (Hungarian)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations doorkeeper.en.yml (Hungarian)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.json (Ido)
[ci skip]

* New translations en.yml (Ido)
[ci skip]

* New translations simple_form.en.yml (Ido)
[ci skip]

* New translations doorkeeper.en.yml (Ido)
[ci skip]

* New translations doorkeeper.en.yml (Indonesian)
[ci skip]

* New translations en.json (Italian)
[ci skip]

* New translations simple_form.en.yml (Italian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Greek)
[ci skip]

* New translations en.json (Greek)
[ci skip]

* New translations doorkeeper.en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Finnish)
[ci skip]

* New translations simple_form.en.yml (Dutch)
[ci skip]

* New translations en.json (Esperanto)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations simple_form.en.yml (Esperanto)
[ci skip]

* New translations doorkeeper.en.yml (Esperanto)
[ci skip]

* New translations en.json (Estonian)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations simple_form.en.yml (Estonian)
[ci skip]

* New translations doorkeeper.en.yml (Estonian)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations simple_form.en.yml (Finnish)
[ci skip]

* New translations doorkeeper.en.yml (Georgian)
[ci skip]

* New translations doorkeeper.en.yml (Finnish)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations doorkeeper.en.yml (French)
[ci skip]

* New translations simple_form.en.yml (Galician)
[ci skip]

* New translations en.json (Georgian)
[ci skip]

* New translations en.yml (Georgian)
[ci skip]

* New translations simple_form.en.yml (Georgian)
[ci skip]

* New translations doorkeeper.en.yml (Welsh)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.json (Korean)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Galician)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (Russian)
[ci skip]

* New translations en.json (Galician)
[ci skip]

* New translations en.json (Galician)
[ci skip]

* New translations en.json (Galician)
[ci skip]

* New translations simple_form.en.yml (Galician)
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations en.json (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations en.yml (Kazakh)
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations activerecord.en.yml (Kabyle)
[ci skip]

* New translations devise.en.yml (Kabyle)
[ci skip]

* New translations activerecord.en.yml (Spanish)
[ci skip]

* New translations devise.en.yml (Spanish)
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations devise.en.yml (Catalan)
[ci skip]

* New translations activerecord.en.yml (Catalan)
[ci skip]

* New translations en.json (Turkish)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations simple_form.en.yml (Turkish)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations simple_form.en.yml (Turkish)
[ci skip]

* New translations en.json (Greek)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations simple_form.en.yml (Greek)
[ci skip]

* New translations simple_form.en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.json (Slovak)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations simple_form.en.yml (Czech)
[ci skip]

* New translations en.json (Ukrainian)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations simple_form.en.yml (Ukrainian)
[ci skip]

* New translations doorkeeper.en.yml (Ukrainian)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.json (Breton)
[ci skip]

* New translations en.json (Corsican)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations simple_form.en.yml (Corsican)
[ci skip]

* New translations en.json (Basque)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations simple_form.en.yml (Basque)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations simple_form.en.yml (Corsican)
[ci skip]

* New translations simple_form.en.yml (Norwegian)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations simple_form.en.yml (Basque)
[ci skip]

* New translations simple_form.en.yml (Norwegian)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations simple_form.en.yml (Norwegian)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations simple_form.en.yml (Norwegian)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations simple_form.en.yml (Norwegian)
[ci skip]

* New translations en.json (Norwegian)
[ci skip]

* New translations simple_form.en.yml (Norwegian)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations en.json (Hungarian)
[ci skip]

* New translations simple_form.en.yml (Hungarian)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations en.json (Catalan)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations devise.en.yml (Catalan)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations simple_form.en.yml (Catalan)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.yml (Norwegian Nynorsk)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.json (Galician)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.json (Galician)
[ci skip]

* New translations en.yml (Kazakh)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Indonesian)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* i18n-tasks normalize

* yarn manage:translations

6 years ago[Glitch] Add limit of 8 different reaction types per announcement
Eugen Rochko [Sat, 25 Jan 2020 04:23:33 +0000 (05:23 +0100)]
[Glitch] Add limit of 8 different reaction types per announcement

Port f816da9c6474ddf437681fbf7f5346672436ccdf to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Add number animations
Eugen Rochko [Sat, 25 Jan 2020 04:23:05 +0000 (05:23 +0100)]
[Glitch] Add number animations

Port 76f1ed834efd3b58b6ebc8e951b661bbc1b7bf9b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Change font size of announcements to be the same as statuses
Eugen Rochko [Sat, 25 Jan 2020 03:20:06 +0000 (04:20 +0100)]
[Glitch] Change font size of announcements to be the same as statuses

Port b89e6cfe7071901a43d1bfbde9dc7b872443e1b2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Fix unlocalized dropdown button title
Sasha Sorokin [Fri, 24 Jan 2020 21:37:04 +0000 (16:37 -0500)]
[Glitch] Fix unlocalized dropdown button title

Port 1268e3b5726b0650afda20410a714995aa9aeae7 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoRename DropdownMenu's ariaLabel to title, to reduce unnecessary changes with upstream
Thibaut Girka [Sat, 25 Jan 2020 09:17:13 +0000 (10:17 +0100)]
Rename DropdownMenu's ariaLabel to title, to reduce unnecessary changes with upstream

6 years ago[Glitch] minor server-sent events fixes
Ben Lubar [Fri, 24 Jan 2020 19:51:33 +0000 (13:51 -0600)]
[Glitch] minor server-sent events fixes

Port front-end changes from 0dfba0884e8885cf242010e0d9da6b328b3560a6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sat, 25 Jan 2020 09:04:41 +0000 (10:04 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream