]> cat aescling's git repositories - mastodon.git/log
mastodon.git
6 years agoAllow rel=tag in status text
Thibaut Girka [Thu, 23 May 2019 10:15:46 +0000 (12:15 +0200)]
Allow rel=tag in status text

Fixes tag links in local Markdown or HTML-authored statuses

6 years agoFix local text/html toots not being sanitized
Thibaut Girka [Tue, 21 May 2019 20:57:59 +0000 (22:57 +0200)]
Fix local text/html toots not being sanitized

6 years agoRefactor contentType selection in glitch composer
Thibaut Girka [Mon, 20 May 2019 08:05:11 +0000 (10:05 +0200)]
Refactor contentType selection in glitch composer

6 years agoUse glitch-soc's poll component instead of upstream's
Thibaut Girka [Sun, 19 May 2019 21:02:32 +0000 (23:02 +0200)]
Use glitch-soc's poll component instead of upstream's

6 years agoMerge pull request #1055 from ThibG/glitch-soc/merge-upstream
ThibG [Sun, 19 May 2019 20:07:42 +0000 (22:07 +0200)]
Merge pull request #1055 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 19 May 2019 19:53:44 +0000 (21:53 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoMerge pull request #1054 from ThibG/glitch-soc/merge-upstream
ThibG [Sun, 19 May 2019 19:52:27 +0000 (21:52 +0200)]
Merge pull request #1054 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoFix “invited by” not showing up for invited accounts in admin interface (#10791)
ThibG [Sun, 19 May 2019 19:40:36 +0000 (21:40 +0200)]
Fix “invited by” not showing up for invited accounts in admin interface (#10791)

6 years agosk.yml grammar update (#10786)
Marek Ľach [Sun, 19 May 2019 17:27:32 +0000 (19:27 +0200)]
sk.yml grammar update (#10786)

* sk.yml grammar update

* bundle exec i18n-tasks normalize

6 years agofix `isSubmitting` prop case (#10785)
Hinaloe [Sun, 19 May 2019 16:41:41 +0000 (01:41 +0900)]
fix `isSubmitting` prop case (#10785)

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 19 May 2019 15:46:31 +0000 (17:46 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoSmall corrections for sk translation (#10784)
Marek Ľach [Sun, 19 May 2019 13:42:10 +0000 (15:42 +0200)]
Small corrections for sk translation (#10784)

6 years agoAdd post-deployment migration script to delete public-boosts-of-private-toots (#10783)
ThibG [Sun, 19 May 2019 11:49:31 +0000 (13:49 +0200)]
Add post-deployment migration script to delete public-boosts-of-private-toots (#10783)

6 years agoUpgrade redis in docker-compose.yml from 4 to 5 (#9063)
Shlee [Sun, 19 May 2019 09:29:26 +0000 (17:29 +0800)]
Upgrade redis in docker-compose.yml from 4 to 5 (#9063)

6 years agoI18n: Update Czech translation (#10781)
Aditoo17 [Sun, 19 May 2019 05:39:16 +0000 (07:39 +0200)]
I18n: Update Czech translation (#10781)

6 years agoadd og:image:alt for media attachments in embeds (#10779)
Ben Lubar [Sat, 18 May 2019 18:57:45 +0000 (13:57 -0500)]
add og:image:alt for media attachments in embeds (#10779)

6 years agoChange poll options to alphabetic letters when status text is hidden (#10685)
Eugen Rochko [Sat, 18 May 2019 12:41:16 +0000 (14:41 +0200)]
Change poll options to alphabetic letters when status text is hidden (#10685)

Fix #10569

6 years agoRemove 'Weblate' from CONTRIBUTING.md (#10778)
Yusuke Nakamura [Sat, 18 May 2019 12:40:55 +0000 (21:40 +0900)]
Remove 'Weblate' from CONTRIBUTING.md (#10778)

The mastodon project no longer used weblate to translate UI
sentences. (ref #10385)

6 years agoMerge pull request #1053 from ThibG/glitch-soc/merge-upstream
ThibG [Sat, 18 May 2019 08:18:52 +0000 (10:18 +0200)]
Merge pull request #1053 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sat, 18 May 2019 08:04:32 +0000 (10:04 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoPrevent from publicly boosting one's own private toots (#10775)
ThibG [Fri, 17 May 2019 22:28:51 +0000 (00:28 +0200)]
Prevent from publicly boosting one's own private toots (#10775)

6 years agoMinor optimization
Thibaut Girka [Fri, 17 May 2019 09:14:09 +0000 (11:14 +0200)]
Minor optimization

6 years agoExport fallback content type and use it as default in WebUI
Thibaut Girka [Fri, 17 May 2019 08:52:27 +0000 (10:52 +0200)]
Export fallback content type and use it as default in WebUI

6 years agoProperly escape HTML in code blocks
Thibaut Girka [Fri, 17 May 2019 08:43:17 +0000 (10:43 +0200)]
Properly escape HTML in code blocks

6 years agoAdd option for default toot content-type
Thibaut Girka [Mon, 13 May 2019 12:42:39 +0000 (14:42 +0200)]
Add option for default toot content-type

6 years agoFix autolinking, and newlines in code blocks
Thibaut Girka [Sun, 12 May 2019 20:13:36 +0000 (22:13 +0200)]
Fix autolinking, and newlines in code blocks

Autolinking is now performed *after* the Markdown pass, by replacing HTML
tags with zero-width spaces and running the twitter-text extractor as usual,
except it does not auto-link URLs to avoid links in links…

6 years agoHide content-type dropdown by default
Thibaut Girka [Sun, 12 May 2019 19:55:44 +0000 (21:55 +0200)]
Hide content-type dropdown by default

6 years agoContent-Type Dropdown: use the selected option icon for the menu
Haelwenn (lanodan) Monnier [Fri, 1 Mar 2019 10:45:16 +0000 (11:45 +0100)]
Content-Type Dropdown: use the selected option icon for the menu

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoSupport proper content-type in Delete & Redraft
Thibaut Girka [Sun, 12 May 2019 18:35:58 +0000 (20:35 +0200)]
Support proper content-type in Delete & Redraft

6 years agoAdd status content type dropdown to compose box.
KokaKiwi [Sun, 17 Feb 2019 22:53:51 +0000 (23:53 +0100)]
Add status content type dropdown to compose box.

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoAdd API support for setting status content-type
Thibaut Girka [Sun, 12 May 2019 18:15:39 +0000 (20:15 +0200)]
Add API support for setting status content-type

6 years agoSerialize content-type on Delete & Redraft
Thibaut Girka [Sun, 12 May 2019 18:34:22 +0000 (20:34 +0200)]
Serialize content-type on Delete & Redraft

6 years agoAdd support for HTML-formatted toots
Thibaut Girka [Sun, 12 May 2019 19:33:37 +0000 (21:33 +0200)]
Add support for HTML-formatted toots

6 years agoAdd support for markdown-formatted toots
Thibaut Girka [Sun, 12 May 2019 18:20:05 +0000 (20:20 +0200)]
Add support for markdown-formatted toots

6 years agoAdd database row to hold status content type
Thibaut Girka [Sun, 12 May 2019 18:14:35 +0000 (20:14 +0200)]
Add database row to hold status content type

6 years agoBump aws-sdk-s3 from 1.38.0 to 1.39.0 (#10773)
dependabot[bot] [Fri, 17 May 2019 06:23:21 +0000 (15:23 +0900)]
Bump aws-sdk-s3 from 1.38.0 to 1.39.0 (#10773)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.38.0 to 1.39.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.38.0...v1.39.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoi18n: Update Corsican translation (#10770)
Alix Rossi [Fri, 17 May 2019 04:32:46 +0000 (06:32 +0200)]
i18n: Update Corsican translation (#10770)

* i18n: update Corsican translation

* Fix typo in co.yml

6 years agoBump capybara from 3.19.1 to 3.20.0 (#10768)
dependabot[bot] [Thu, 16 May 2019 07:13:52 +0000 (16:13 +0900)]
Bump capybara from 3.19.1 to 3.20.0 (#10768)

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.19.1 to 3.20.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.19.1...3.20.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoBump aws-sdk-s3 from 1.36.1 to 1.38.0 (#10769)
dependabot[bot] [Thu, 16 May 2019 06:00:24 +0000 (15:00 +0900)]
Bump aws-sdk-s3 from 1.36.1 to 1.38.0 (#10769)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.36.1 to 1.38.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.36.1...v1.38.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoMerge pull request #1049 from ThibG/glitch-soc/merge-upstream
ThibG [Wed, 15 May 2019 16:44:21 +0000 (18:44 +0200)]
Merge pull request #1049 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Wed, 15 May 2019 15:11:40 +0000 (17:11 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoUpdate simple_form.fr.yml (#10756)
manuelviens [Wed, 15 May 2019 05:52:11 +0000 (01:52 -0400)]
Update simple_form.fr.yml (#10756)

Remplacement des ' par des ’

6 years agoMinor performance improvements and cleanup in formatter (#10765)
ThibG [Wed, 15 May 2019 04:54:06 +0000 (06:54 +0200)]
Minor performance improvements and cleanup in formatter (#10765)

6 years agoAdds click-able div that expands status (#10733) (#10766)
Neil Moore [Wed, 15 May 2019 04:53:23 +0000 (00:53 -0400)]
Adds click-able div that expands status (#10733) (#10766)

The clickable div is positioned under the account avatar and covers
all empty space below it to the end of the status.

6 years agoRecord account suspend/silence time and keep track of domain blocks (#10660)
ThibG [Tue, 14 May 2019 17:05:02 +0000 (19:05 +0200)]
Record account suspend/silence time and keep track of domain blocks (#10660)

* Record account suspend/silence time and keep track of domain blocks

* Also unblock users who were suspended/silenced before dates were recorded

* Add tests

* Keep track of suspending date for users suspended through the CLI

* Show accurate number of accounts that would be affected by unsuspending an instance

* Change migration to set silenced_at and suspended_at

* Revert "Also unblock users who were suspended/silenced before dates were recorded"

This reverts commit a015c65d2d1e28c7b7cfab8b3f8cd5fb48b8b71c.

* Switch from using suspended and silenced to suspended_at and silenced_at

* Add post-deployment migration script to remove `suspended` and `silenced` columns

* Use Account#silence! and Account#suspend! instead of updating the underlying property

* Add silenced_at and suspended_at migration to post-migration

* Change account fabricator to translate suspended and silenced attributes

* Minor fixes

* Make unblocking domains always retroactive

6 years agoUpdate slovak simple_forms (#10763)
Marek Ľach [Tue, 14 May 2019 10:55:47 +0000 (12:55 +0200)]
Update slovak simple_forms (#10763)

6 years agoBump capybara from 3.18.0 to 3.19.1 (#10758)
dependabot[bot] [Tue, 14 May 2019 06:01:47 +0000 (15:01 +0900)]
Bump capybara from 3.18.0 to 3.19.1 (#10758)

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.18.0 to 3.19.1.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.18.0...3.19.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoBump brakeman from 4.5.0 to 4.5.1 (#10757)
dependabot[bot] [Tue, 14 May 2019 06:01:22 +0000 (15:01 +0900)]
Bump brakeman from 4.5.0 to 4.5.1 (#10757)

Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.5.0...v4.5.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoBump rubocop from 0.68.1 to 0.69.0 (#10762)
dependabot[bot] [Tue, 14 May 2019 06:00:58 +0000 (15:00 +0900)]
Bump rubocop from 0.68.1 to 0.69.0 (#10762)

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.68.1 to 0.69.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.68.1...v0.69.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoFix rich text style in reply indicator
Thibaut Girka [Mon, 13 May 2019 13:06:09 +0000 (15:06 +0200)]
Fix rich text style in reply indicator

6 years agoFix rich text styling on public pages
Thibaut Girka [Mon, 13 May 2019 13:01:00 +0000 (15:01 +0200)]
Fix rich text styling on public pages

6 years agoFix text color of some formatted elements in notifications
Thibaut Girka [Sun, 12 May 2019 17:11:08 +0000 (19:11 +0200)]
Fix text color of some formatted elements in notifications

6 years agoFix some colors in light theme (#10754)
nzws [Sun, 12 May 2019 03:15:42 +0000 (12:15 +0900)]
Fix some colors in light theme (#10754)

* Fix typo in light theme

* Fix background color of empty column

6 years agoFix incorrect reference to raw_content (it is raw_text instead) (#10753)
ThibG [Sat, 11 May 2019 21:56:07 +0000 (23:56 +0200)]
Fix incorrect reference to raw_content (it is raw_text instead) (#10753)

6 years agoMerge pull request #1044 from ThibG/glitch-soc/merge-upstream
ThibG [Sat, 11 May 2019 20:05:39 +0000 (22:05 +0200)]
Merge pull request #1044 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years ago[Glitch] Use raw content if available on Delete & Redraft
ThibG [Sat, 11 May 2019 04:46:43 +0000 (06:46 +0200)]
[Glitch] Use raw content if available on Delete & Redraft

Port front-end changes from 6d44f2441bf2aa14d11e481d9d2cfe82a74d81ed to glitch-soc

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sat, 11 May 2019 16:23:46 +0000 (18:23 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoUse a checkbox for the “Mark media as sensitive” composer button
Thibaut Girka [Fri, 10 May 2019 11:59:41 +0000 (13:59 +0200)]
Use a checkbox for the “Mark media as sensitive” composer button

Fixes #1039

6 years agoMerge pull request #1043 from ThibG/glitch-soc/merge-upstream
ThibG [Sat, 11 May 2019 10:35:25 +0000 (12:35 +0200)]
Merge pull request #1043 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoAdd toot source to delete result to ease Delete & Redraft (#10669)
ThibG [Sat, 11 May 2019 04:46:43 +0000 (06:46 +0200)]
Add toot source to delete result to ease Delete & Redraft (#10669)

* Return Status with raw text in raw_content when deleting a status

* Use raw content if available on delete & redraft

* Rename raw_content to text; do not serialize formatted content when source is requested

6 years agoUse local time in audit log (#10751)
nzws [Sat, 11 May 2019 04:46:02 +0000 (13:46 +0900)]
Use local time in audit log (#10751)

6 years ago[Glitch] Improve poll link accessibility
Maciek Baron [Thu, 9 May 2019 20:03:32 +0000 (21:03 +0100)]
[Glitch] Improve poll link accessibility

Port 0402c52f28b73824d7c81c702a16d39fd97808cf to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Fix some colors of high contrast theme
nzws [Tue, 7 May 2019 21:53:58 +0000 (06:53 +0900)]
[Glitch] Fix some colors of high contrast theme

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago[Glitch] Add confirm modal for unboosting toots
Aurélien Reeves [Thu, 9 May 2019 20:39:27 +0000 (22:39 +0200)]
[Glitch] Add confirm modal for unboosting toots

Port fe8a8f779e36e25286b6a7ddc7bcd08e2a4e2890 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoi18n: Update French translations (#10747)
Alix Rossi [Fri, 10 May 2019 16:09:47 +0000 (18:09 +0200)]
i18n: Update French translations (#10747)

* Update French JSON

* i18n: Update fr.yml

* i18n: Update simple_form.fr.yml

* Update simple_form.fr.yml

* Update fr.yml

6 years agoi18n: Update Corsican translations (#10746)
Alix Rossi [Fri, 10 May 2019 16:09:34 +0000 (18:09 +0200)]
i18n: Update Corsican translations (#10746)

* i18n: Update Corsican translations

* Update co.yml

* Fix a translation in co.yml

6 years agoChange icon and label depending on whether media is marked as sensitive (#10748)
ThibG [Fri, 10 May 2019 15:59:57 +0000 (17:59 +0200)]
Change icon and label depending on whether media is marked as sensitive (#10748)

* Change icon and label depending on whether media is marked as sensitive

* WiP use a checkbox

6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Fri, 10 May 2019 15:09:12 +0000 (17:09 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system

6 years agoFix media description confirmation modal
Thibaut Girka [Fri, 10 May 2019 09:27:59 +0000 (11:27 +0200)]
Fix media description confirmation modal

Fixes #1040

6 years agoUpdate simple_form.fr.yml (#10726)
manuelviens [Thu, 9 May 2019 21:16:24 +0000 (17:16 -0400)]
Update simple_form.fr.yml (#10726)

* Minor modif and add

Modified '' by ’ and added invite_request

* Update simple_form.fr.yml

Modifications suggérées par ThibG

* Update simple_form.fr.yml

Remplacement des ' par des ’.

* Update simple_form.fr.yml

Ajout de deux petits espaces devant sessions:

6 years agoAdd strings for Slovak (#10734)
Marek Ľach [Thu, 9 May 2019 21:16:05 +0000 (23:16 +0200)]
Add strings for Slovak (#10734)

* Add strings for Slovak

* Update sk.yml

6 years agoUpdate fr.yml (#10727)
manuelviens [Thu, 9 May 2019 21:15:39 +0000 (17:15 -0400)]
Update fr.yml (#10727)

* Update fr.yml

Added missing lines

* Update fr.yml

Application des modifications de ThibG

* Update fr.yml

Modifications proposées par ThibG

6 years agoAdd ES_PREFIX in .env.production.sample (#10087)
Stanislas [Thu, 9 May 2019 20:41:27 +0000 (22:41 +0200)]
Add ES_PREFIX in .env.production.sample (#10087)

6 years agoAdd confirm modal for unboosting toots (#10287)
Aurélien Reeves [Thu, 9 May 2019 20:39:27 +0000 (22:39 +0200)]
Add confirm modal for unboosting toots (#10287)

[#3815]

Display the boost modal also when unboosting toots.

6 years agoAdd emoji suggestions to CW and poll option fields (#10555)
ThibG [Thu, 9 May 2019 20:10:27 +0000 (22:10 +0200)]
Add emoji suggestions to CW and poll option fields (#10555)

* Refactor selectComposeSuggestion so that different paths can be updated

* Add suggestions in CW field

* Add emoji suggestion to poll options

* Attempt to fix CSS

* Hide suggestions by default

They will be enabled if the input has focus

6 years agoPrevent silenced local users from notifying remote users not following them (#10575)
ThibG [Thu, 9 May 2019 20:05:43 +0000 (22:05 +0200)]
Prevent silenced local users from notifying remote users not following them (#10575)

* Prevent silenced local users from notifying remote users not following them

This is an attempt to extend the local restrictions of silenced users to the
federation.

* Add tests

* Add tests for making sure private status don't get sent over OStatus

6 years agoAdd some caching for HTML versions of statuses pages (#10701)
ThibG [Thu, 9 May 2019 20:03:44 +0000 (22:03 +0200)]
Add some caching for HTML versions of statuses pages (#10701)

6 years agoImprove poll link accessibility (#10720)
Maciek Baron [Thu, 9 May 2019 20:03:32 +0000 (21:03 +0100)]
Improve poll link accessibility (#10720)

* Add distinction between hover and active/focus states
* Resolves #10198

6 years agoRemove custom emojis on "tootctl domains purge" (#10721)
Jeong Arm [Thu, 9 May 2019 20:03:21 +0000 (05:03 +0900)]
Remove custom emojis on "tootctl domains purge" (#10721)

* Remove custom emojis on domains purge

* Change message "Removing" to "Removed"

6 years agoRecord deleted(by mod) status to prevent re-appear (#10732)
Jeong Arm [Thu, 9 May 2019 20:03:03 +0000 (05:03 +0900)]
Record deleted(by mod) status to prevent re-appear (#10732)

* Record deleted(by mod) status to prevent re-appear

* Move to Tombstone

* Add missing migration script

6 years agoBring back crossed eye icon on gallery (#10715)
Jeong Arm [Wed, 8 May 2019 16:01:33 +0000 (01:01 +0900)]
Bring back crossed eye icon on gallery (#10715)

6 years agoFix tabs bar on mobile
Thibaut Girka [Tue, 7 May 2019 22:04:48 +0000 (00:04 +0200)]
Fix tabs bar on mobile

Fixes #1037

6 years agoFix some colors of high contrast theme (#10711)
nzws [Tue, 7 May 2019 21:53:58 +0000 (06:53 +0900)]
Fix some colors of high contrast theme (#10711)

* Fix "nothing here" text color of high contrast

* Fix counter border color of high contrast

6 years agoFix front-end crash when a video has a blurhash and is hidden behind a CW
Thibaut Girka [Tue, 7 May 2019 20:12:11 +0000 (22:12 +0200)]
Fix front-end crash when a video has a blurhash and is hidden behind a CW

6 years agoBump redis from 4.1.0 to 4.1.1 (#10722)
dependabot[bot] [Tue, 7 May 2019 05:47:46 +0000 (14:47 +0900)]
Bump redis from 4.1.0 to 4.1.1 (#10722)

Bumps [redis](https://github.com/redis/redis-rb) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/redis/redis-rb/releases)
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v4.1.0...v4.1.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoi18n Update Catalan translation (#10719)
spla [Mon, 6 May 2019 15:55:37 +0000 (17:55 +0200)]
i18n Update Catalan translation (#10719)

* Updated Catalan strings

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* bundle exec i18n-tasks

* Update ca.json

* Update simple_form.ca.yml

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translation

* i18n Update Catalan translation

6 years agoBump parallel_tests from 2.28.0 to 2.29.0 (#10716)
dependabot[bot] [Mon, 6 May 2019 06:12:55 +0000 (15:12 +0900)]
Bump parallel_tests from 2.28.0 to 2.29.0 (#10716)

Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.28.0 to 2.29.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.28.0...v2.29.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoAdd description on hover in media gallery (#10713)
ThibG [Mon, 6 May 2019 03:33:56 +0000 (05:33 +0200)]
Add description on hover in media gallery (#10713)

6 years agoFix content warning button displaying a link icon when no status card is set
Thibaut Girka [Sun, 5 May 2019 19:09:45 +0000 (21:09 +0200)]
Fix content warning button displaying a link icon when no status card is set

6 years agoi18n: Update Japanese translations (#10706)
mayaeh [Sun, 5 May 2019 19:34:32 +0000 (04:34 +0900)]
i18n: Update Japanese translations (#10706)

* Update Japanese translations.

run yarn manage:translations

This commit includes translations by some users that were done at the transifex.

* Reduce translation text because it becomes two lines.

6 years ago1 NL string update (#10709)
jeroenpraat [Sun, 5 May 2019 19:33:24 +0000 (21:33 +0200)]
1 NL string update (#10709)

* 1 NL string update

No that weblate isn't used anymore, it would be fine if, or the english strings are update, or there is somewhere an explanation how to generate new strings for a language

* Update nl.json

6 years agofix pinned columns ’s Media-only button
Kirishima21 [Sun, 5 May 2019 18:31:21 +0000 (03:31 +0900)]
fix pinned columns ’s Media-only button

Media-only toggles could not be used on pinned columns.
The commit fixes this problem.

6 years agoMerge pull request #1032 from ThibG/glitch-soc/merge-upstream
ThibG [Sun, 5 May 2019 18:53:07 +0000 (20:53 +0200)]
Merge pull request #1032 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

6 years agoBump version to 2.8.2 (#10703)
Eugen Rochko [Sun, 5 May 2019 15:14:15 +0000 (17:14 +0200)]
Bump version to 2.8.2 (#10703)

6 years ago[Glitch] Make sure the instance banner is never cropped
Baptiste Gelez [Sat, 4 May 2019 23:07:15 +0000 (00:07 +0100)]
[Glitch] Make sure the instance banner is never cropped

Port 21209c2b52d1ed1d1dee2dad2d725ffc7714701b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 5 May 2019 10:28:10 +0000 (12:28 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

6 years agoMinor Slovak locale update (#10705)
Marek Ľach [Sun, 5 May 2019 08:25:35 +0000 (10:25 +0200)]
Minor Slovak locale update (#10705)

6 years agoI18n: Update Czech translation 🇨🇿 (#10704)
Aditoo17 [Sun, 5 May 2019 06:33:33 +0000 (08:33 +0200)]
I18n: Update Czech translation 🇨🇿 (#10704)

* I18n: Update Czech translation

* Tiny fix

6 years agoMake sure the instance banner is never cropped (#10702)
Baptiste Gelez [Sat, 4 May 2019 23:07:15 +0000 (00:07 +0100)]
Make sure the instance banner is never cropped (#10702)

6 years agoMinor style fixes
Thibaut Girka [Sat, 4 May 2019 21:05:43 +0000 (23:05 +0200)]
Minor style fixes