]>
cat aescling's git repositories - mastodon.git/log
ThibG [Fri, 28 Jun 2019 17:11:06 +0000 (19:11 +0200)]
Merge pull request #1145 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
ThibG [Thu, 27 Jun 2019 19:12:26 +0000 (21:12 +0200)]
[Glitch] Add message telling FTS is disabled when no toot can be found because of this
Port
ca8944728f4568bbef8edae99382cd44cbc144d6 to glitch-soc
Thibaut Girka [Fri, 28 Jun 2019 10:11:45 +0000 (12:11 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Thu, 27 Jun 2019 20:30:55 +0000 (22:30 +0200)]
Change search components classes and styling to match upstream
ThibG [Thu, 27 Jun 2019 19:12:26 +0000 (21:12 +0200)]
Add message telling FTS is disabled when no toot can be found because of this (#11112)
* Add message telling FTS is disabled when no toot can be found because of this
Fixes #11082
* Remove info icon and reword message
ThibG [Thu, 27 Jun 2019 17:41:55 +0000 (19:41 +0200)]
Fix account URI in UpdatePollSerializer (#11194)
* Fix account URI in UpdatePollSerializer
Fixes #11185
* Add specs
Thibaut Girka [Tue, 25 Jun 2019 20:56:32 +0000 (22:56 +0200)]
Use a redis-cached feed for the DM timeline
ThibG [Thu, 27 Jun 2019 14:43:55 +0000 (16:43 +0200)]
Merge pull request #1142 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Thibaut Girka [Thu, 27 Jun 2019 13:48:23 +0000 (15:48 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream
mayaeh [Thu, 27 Jun 2019 07:16:55 +0000 (16:16 +0900)]
Fix NameError (#11192)
ThibG [Wed, 26 Jun 2019 17:33:04 +0000 (19:33 +0200)]
[Glitch] Add option to disable blurhash previews
Port
3086c645fde2345d34e401bdf3e2f19f19da3294 to glitch-soc
PatOnTheBack [Wed, 26 Jun 2019 00:16:24 +0000 (20:16 -0400)]
[Glitch] Removed extra pipes from regex.
Port
5b20284f6f7ebb2514d81fb27fcaa40f8edf14ff to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
ThibG [Tue, 25 Jun 2019 12:45:14 +0000 (14:45 +0200)]
[Glitch] Apply filters to poll options in WebUI
Port
47ef4a6c7a74072daff8b23c4af3e300bb75ba1a to glitch-soc
Thibaut Girka [Wed, 26 Jun 2019 20:54:09 +0000 (22:54 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml
ThibG [Wed, 26 Jun 2019 17:33:04 +0000 (19:33 +0200)]
Add option to disable blurhash previews (#11188)
* Add option to disable blurhash previews
* Update option text
* Change options order
ThibG [Wed, 26 Jun 2019 17:32:36 +0000 (19:32 +0200)]
Add support for Audio activities (#11189)
Fixes #11127
ThibG [Wed, 26 Jun 2019 12:28:36 +0000 (14:28 +0200)]
Scroll to compose form rather than reply indicator on focus (#11182)
Thibaut Girka [Tue, 25 Jun 2019 20:57:56 +0000 (22:57 +0200)]
Scroll to compose form rather than reply indicator on focus
PatOnTheBack [Wed, 26 Jun 2019 00:16:24 +0000 (20:16 -0400)]
Removed extra pipes from regex. (#11181)
ThibG [Tue, 25 Jun 2019 20:43:33 +0000 (22:43 +0200)]
Merge pull request #1138 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
dependabot-preview[bot] [Tue, 25 Jun 2019 18:51:35 +0000 (20:51 +0200)]
Bump stringz from 1.0.0 to 2.0.0 (#11168)
Bumps [stringz](https://github.com/sallar/stringz) from 1.0.0 to 2.0.0.
- [Release notes](https://github.com/sallar/stringz/releases)
- [Changelog](https://github.com/sallar/stringz/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sallar/stringz/commits)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Eugen Rochko [Tue, 25 Jun 2019 18:18:15 +0000 (20:18 +0200)]
Fix unnecessary SQL query performed on unauthenticated requests (#11179)
dependabot-preview[bot] [Tue, 25 Jun 2019 13:51:57 +0000 (22:51 +0900)]
Bump eslint from 5.11.1 to 5.16.0 (#11165)
Bumps [eslint](https://github.com/eslint/eslint) from 5.11.1 to 5.16.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v5.11.1...v5.16.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Tue, 25 Jun 2019 13:49:44 +0000 (22:49 +0900)]
Bump derailed_benchmarks from 1.3.5 to 1.3.6 (#11171)
Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks) from 1.3.5 to 1.3.6.
- [Release notes](https://github.com/schneems/derailed_benchmarks/releases)
- [Changelog](https://github.com/schneems/derailed_benchmarks/blob/master/CHANGELOG.md)
- [Commits](https://github.com/schneems/derailed_benchmarks/compare/v1.3.5...v1.3.6)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Tue, 25 Jun 2019 13:45:32 +0000 (22:45 +0900)]
Bump aws-sdk-s3 from 1.42.0 to 1.43.0 (#11172)
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.42.0 to 1.43.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.42.0...v1.43.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Tue, 25 Jun 2019 13:39:35 +0000 (22:39 +0900)]
Bump parallel_tests from 2.29.0 to 2.29.1 (#11169)
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.29.0 to 2.29.1.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.29.0...v2.29.1)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Tue, 25 Jun 2019 13:37:26 +0000 (22:37 +0900)]
Bump dotenv-rails from 2.7.2 to 2.7.4 (#11170)
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.7.2 to 2.7.4.
- [Release notes](https://github.com/bkeepers/dotenv/releases)
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md)
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.7.2...v2.7.4)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Tue, 25 Jun 2019 13:36:57 +0000 (22:36 +0900)]
Bump mini-css-extract-plugin from 0.5.0 to 0.7.0 (#11167)
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 0.5.0 to 0.7.0.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v0.5.0...v0.7.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Tue, 25 Jun 2019 13:32:58 +0000 (22:32 +0900)]
Bump webpack-dev-server from 3.5.1 to 3.7.2 (#11166)
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.5.1 to 3.7.2.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.5.1...v3.7.2)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Tue, 25 Jun 2019 13:24:49 +0000 (22:24 +0900)]
Bump babel-loader from 8.0.5 to 8.0.6 (#11164)
Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.0.5 to 8.0.6.
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel-loader/compare/v8.0.5...v8.0.6)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
ThibG [Tue, 25 Jun 2019 12:45:14 +0000 (14:45 +0200)]
Apply filters to poll options (#11174)
* Apply filters to poll options in WebUI
Fixes #11128
* Apply filters to poll options server-side
* Add poll options to searchable text
Thibaut Girka [Mon, 24 Jun 2019 14:27:10 +0000 (16:27 +0200)]
Change .env.production.sample to specify that MAX_VIDEO_SIZE also applies to audio files
Thibaut Girka [Mon, 24 Jun 2019 14:16:16 +0000 (16:16 +0200)]
Use a different icon for audio attachments
Eugen Rochko [Fri, 21 Jun 2019 20:59:44 +0000 (22:59 +0200)]
[Glitch] Add media description as title to links of unknown media attachments
Port front-end changes from
49ebda4d49af50b375126e4a8285686fb6448a60 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Eugen Rochko [Wed, 19 Jun 2019 21:42:38 +0000 (23:42 +0200)]
[Glitch] Add audio uploads
Port front-end changes from
f7f23b4a19a84371f44ec5297125e96ba81681a1 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Thibaut Girka [Mon, 24 Jun 2019 12:47:48 +0000 (14:47 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
Upstream added a few fields
- config/application.rb
Upstream added a different paperclip transcoder
Eugen Rochko [Sat, 22 Jun 2019 16:13:52 +0000 (18:13 +0200)]
Fix unconverted PRs in the changelog (#11155)
Eugen Rochko [Sat, 22 Jun 2019 15:28:26 +0000 (17:28 +0200)]
Bump version to 2.9.2 (#11152)
Eugen Rochko [Sat, 22 Jun 2019 15:26:09 +0000 (17:26 +0200)]
New Crowdin translations (#11144)
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations doorkeeper.en.yml (Catalan)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Galician)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (German)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
Eugen Rochko [Sat, 22 Jun 2019 14:54:06 +0000 (16:54 +0200)]
Fix audio-only OGG and WebM files not being processed as such (#11151)
Also, because Chrome sends audio/mp3 instead of audio/mpeg as it's
supposed to, we need to whitelist that mime type as well
koyu [Sat, 22 Jun 2019 13:29:25 +0000 (15:29 +0200)]
Change camera icon to paperclip icon in upload form (#11149)
Eugen Rochko [Sat, 22 Jun 2019 10:08:16 +0000 (12:08 +0200)]
Add `short_description` and `approval_required` to `GET /api/v1/instance` (#11146)
Eugen Rochko [Sat, 22 Jun 2019 00:50:36 +0000 (02:50 +0200)]
Fix audio not being downloaded from remote servers (#11145)
Eugen Rochko [Fri, 21 Jun 2019 23:51:27 +0000 (01:51 +0200)]
Bump version to 2.9.1 (#11143)
Eugen Rochko [Fri, 21 Jun 2019 22:57:48 +0000 (00:57 +0200)]
New Crowdin translations (#11116)
* New translations devise.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations devise.en.yml (Chinese Traditional)
[ci skip]
* New translations activerecord.en.yml (Thai)
[ci skip]
* New translations activerecord.en.yml (Slovak)
[ci skip]
* New translations activerecord.en.yml (French)
[ci skip]
* New translations activerecord.en.yml (Hungarian)
[ci skip]
* New translations activerecord.en.yml (Hebrew)
[ci skip]
* New translations activerecord.en.yml (Greek)
[ci skip]
* New translations activerecord.en.yml (German)
[ci skip]
* New translations activerecord.en.yml (Georgian)
[ci skip]
* New translations activerecord.en.yml (Galician)
[ci skip]
* New translations activerecord.en.yml (Esperanto)
[ci skip]
* New translations activerecord.en.yml (Danish)
[ci skip]
* New translations activerecord.en.yml (Czech)
[ci skip]
* New translations activerecord.en.yml (Corsican)
[ci skip]
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations activerecord.en.yml (Indonesian)
[ci skip]
* New translations activerecord.en.yml (Japanese)
[ci skip]
* New translations activerecord.en.yml (Swedish)
[ci skip]
* New translations activerecord.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations activerecord.en.yml (Spanish)
[ci skip]
* New translations activerecord.en.yml (Slovenian)
[ci skip]
* New translations devise.en.yml (Ido)
[ci skip]
* New translations activerecord.en.yml (Serbian (Latin))
[ci skip]
* New translations activerecord.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations activerecord.en.yml (Russian)
[ci skip]
* New translations activerecord.en.yml (Portuguese)
[ci skip]
* New translations activerecord.en.yml (Kazakh)
[ci skip]
* New translations activerecord.en.yml (Polish)
[ci skip]
* New translations activerecord.en.yml (Persian)
[ci skip]
* New translations activerecord.en.yml (Occitan)
[ci skip]
* New translations activerecord.en.yml (Norwegian)
[ci skip]
* New translations activerecord.en.yml (Korean)
[ci skip]
* New translations devise.en.yml (Hungarian)
[ci skip]
* New translations devise.en.yml (Indonesian)
[ci skip]
* New translations doorkeeper.en.yml (Ido)
[ci skip]
* New translations doorkeeper.en.yml (Korean)
[ci skip]
* New translations doorkeeper.en.yml (Kazakh)
[ci skip]
* New translations doorkeeper.en.yml (Japanese)
[ci skip]
* New translations doorkeeper.en.yml (Indonesian)
[ci skip]
* New translations doorkeeper.en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Norwegian)
[ci skip]
* New translations doorkeeper.en.yml (Hebrew)
[ci skip]
* New translations doorkeeper.en.yml (Greek)
[ci skip]
* New translations doorkeeper.en.yml (German)
[ci skip]
* New translations doorkeeper.en.yml (Georgian)
[ci skip]
* New translations doorkeeper.en.yml (Galician)
[ci skip]
* New translations doorkeeper.en.yml (French)
[ci skip]
* New translations doorkeeper.en.yml (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Occitan)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Ukrainian)
[ci skip]
* New translations doorkeeper.en.yml (Turkish)
[ci skip]
* New translations doorkeeper.en.yml (Thai)
[ci skip]
* New translations doorkeeper.en.yml (Swedish)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations doorkeeper.en.yml (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Persian)
[ci skip]
* New translations doorkeeper.en.yml (Serbian (Latin))
[ci skip]
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations doorkeeper.en.yml (Russian)
[ci skip]
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations doorkeeper.en.yml (Portuguese)
[ci skip]
* New translations doorkeeper.en.yml (Polish)
[ci skip]
* New translations doorkeeper.en.yml (Esperanto)
[ci skip]
* New translations doorkeeper.en.yml (Danish)
[ci skip]
* New translations devise.en.yml (Persian)
[ci skip]
* New translations devise.en.yml (Serbian (Latin))
[ci skip]
* New translations devise.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations devise.en.yml (Russian)
[ci skip]
* New translations devise.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations devise.en.yml (Portuguese)
[ci skip]
* New translations devise.en.yml (Polish)
[ci skip]
* New translations devise.en.yml (Occitan)
[ci skip]
* New translations devise.en.yml (Slovenian)
[ci skip]
* New translations devise.en.yml (Norwegian)
[ci skip]
* New translations activerecord.en.yml (Chinese Simplified)
[ci skip]
* New translations devise.en.yml (Korean)
[ci skip]
* New translations devise.en.yml (Kazakh)
[ci skip]
* New translations devise.en.yml (Japanese)
[ci skip]
* New translations devise.en.yml (Slovak)
[ci skip]
* New translations devise.en.yml (Spanish)
[ci skip]
* New translations doorkeeper.en.yml (Czech)
[ci skip]
* New translations doorkeeper.en.yml (Croatian)
[ci skip]
* New translations doorkeeper.en.yml (Corsican)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Traditional)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Simplified)
[ci skip]
* New translations doorkeeper.en.yml (Catalan)
[ci skip]
* New translations doorkeeper.en.yml (Bulgarian)
[ci skip]
* New translations doorkeeper.en.yml (Basque)
[ci skip]
* New translations devise.en.yml (Swedish)
[ci skip]
* New translations doorkeeper.en.yml (Asturian)
[ci skip]
* New translations devise.en.yml (Welsh)
[ci skip]
* New translations devise.en.yml (Ukrainian)
[ci skip]
* New translations devise.en.yml (Turkish)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Welsh)
[ci skip]
* New translations activerecord.en.yml (Catalan)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Bulgarian)
[ci skip]
* New translations en.yml (Bengali)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.yml (Georgian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Ido)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Croatian)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations devise.en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations simple_form.en.yml (Occitan)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Ido)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hebrew)
[ci skip]
* New translations simple_form.en.yml (Greek)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Portuguese)
[ci skip]
* New translations simple_form.en.yml (Galician)
[ci skip]
* New translations activerecord.en.yml (Basque)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Swedish)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Slovenian)
[ci skip]
* New translations simple_form.en.yml (Slovak)
[ci skip]
* New translations simple_form.en.yml (Serbian (Latin))
[ci skip]
* New translations simple_form.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Romanian)
[ci skip]
* New translations simple_form.en.yml (Georgian)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Serbian (Latin))
[ci skip]
* New translations en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Malay)
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations simple_form.en.yml (Finnish)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Danish)
[ci skip]
* New translations simple_form.en.yml (Croatian)
[ci skip]
* New translations simple_form.en.yml (Corsican)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations en.yml (Telugu)
[ci skip]
* New translations simple_form.en.yml (Bulgarian)
[ci skip]
* New translations simple_form.en.yml (Basque)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations doorkeeper.en.yml (Welsh)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations activerecord.en.yml (Finnish)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations doorkeeper.en.yml (Japanese)
[ci skip]
* New translations doorkeeper.en.yml (Greek)
[ci skip]
* New translations doorkeeper.en.yml (Italian)
[ci skip]
* New translations doorkeeper.en.yml (Italian)
[ci skip]
* New translations en.yml (Italian)
[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 doorkeeper.en.yml (Polish)
[ci skip]
* New translations doorkeeper.en.yml (Czech)
[ci skip]
* New translations doorkeeper.en.yml (Corsican)
[ci skip]
* New translations doorkeeper.en.yml (Corsican)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (German)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
Eugen Rochko [Fri, 21 Jun 2019 22:39:09 +0000 (00:39 +0200)]
Remove expensive counters from federation page in admin UI (#11139)
Eugen Rochko [Fri, 21 Jun 2019 22:13:10 +0000 (00:13 +0200)]
Change domain blocks to automatically support subdomains (#11138)
* Change domain blocks to automatically support subdomains
If a more authoritative domain is blocked (example.com), then the
same block will be applied to a subdomain (foo.example.com)
* Match subdomains of existing accounts when blocking/unblocking domains
* Improve code style
Eugen Rochko [Fri, 21 Jun 2019 20:59:44 +0000 (22:59 +0200)]
Change audio format from ogg to mp3 for wider compatibility (#11141)
* Change audio format from ogg to mp3 for wider compatibility
* Add media description as title to links of unknown media attachments
Thibaut Girka [Wed, 19 Jun 2019 13:41:17 +0000 (15:41 +0200)]
Fix NavigationBar styling
Thibaut Girka [Wed, 19 Jun 2019 13:16:18 +0000 (15:16 +0200)]
Add NavigationBar to getting started column in single-column mode
Fixes #1131
ThibG [Thu, 20 Jun 2019 17:19:30 +0000 (19:19 +0200)]
Merge pull request #1134 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Eugen Rochko [Thu, 20 Jun 2019 08:52:36 +0000 (10:52 +0200)]
Fix converted media being saved with original extension and mime type (#11130)
Eugen Rochko [Thu, 20 Jun 2019 00:52:34 +0000 (02:52 +0200)]
Add moderation API (#9387)
Fix #8580
Fix #7143
Acid Chicken (硫酸鶏) [Thu, 20 Jun 2019 00:18:06 +0000 (09:18 +0900)]
Fix layout of identity proofs settings (#11126)
Eugen Rochko [Wed, 19 Jun 2019 21:42:38 +0000 (23:42 +0200)]
Add audio uploads (#11123)
* Add audio uploads
Fix #4827
Accept uploads of OGG, WAV, FLAC, OPUS and MP3 files, and converts
them to OGG. Media attachments get a new `audio` type. In the UI,
audio uploads are displayed identically to video uploads.
* Improve code style
ThibG [Tue, 18 Jun 2019 16:23:08 +0000 (18:23 +0200)]
[Glitch] Completely hide toots matched by “irreversible” filters even if they got to the client
Thibaut Girka [Wed, 19 Jun 2019 16:49:25 +0000 (18:49 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/admin/settings/edit.html.haml
Conflict on theme VS flavour/skin handling.
Keep our version.
Thibaut Girka [Wed, 19 Jun 2019 14:19:32 +0000 (16:19 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/lib/sanitize_config.rb
Keep our version, we support the tags upstream transforms.
- package.json
- yarn.lock
Eugen Rochko [Wed, 19 Jun 2019 16:25:06 +0000 (18:25 +0200)]
Fix inconsistent interpolation in sk.yml (#11124)
Alix Rossi [Wed, 19 Jun 2019 15:30:08 +0000 (17:30 +0200)]
Add label for admin theme selector (#11121)
* Add simple_form default for admin theme selector
* Revert "Add simple_form default for admin theme selector"
This reverts commit
0b736f78a87d61075f9b9f774d8da80e1e897b47 .
* Add setting_theme label to admin theme selector
Thibaut Girka [Sun, 16 Jun 2019 19:04:09 +0000 (21:04 +0200)]
Change preferences link in local settings modal from sliders to cog for consistency
Thibaut Girka [Mon, 17 Jun 2019 19:01:22 +0000 (21:01 +0200)]
Fix bottom margin of lists in toots
Thibaut Girka [Tue, 18 Jun 2019 14:26:10 +0000 (16:26 +0200)]
Change plaintext icon in composer options
Eugen Rochko [Tue, 18 Jun 2019 20:58:18 +0000 (22:58 +0200)]
New Crowdin translations (#11077)
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations simple_form.en.yml (Dutch)
[ci skip]
* New translations activerecord.en.yml (Dutch)
[ci skip]
* New translations devise.en.yml (Dutch)
[ci skip]
* New translations doorkeeper.en.yml (Dutch)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations simple_form.en.yml (Greek)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations activerecord.en.yml (Persian)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations simple_form.en.yml (Welsh)
[ci skip]
* New translations simple_form.en.yml (Welsh)
[ci skip]
* New translations simple_form.en.yml (Welsh)
[ci skip]
* New translations activerecord.en.yml (Welsh)
[ci skip]
* New translations devise.en.yml (Welsh)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations simple_form.en.yml (Welsh)
[ci skip]
* New translations devise.en.yml (Welsh)
[ci skip]
* New translations doorkeeper.en.yml (Welsh)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations activerecord.en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations doorkeeper.en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Slovak)
[ci skip]
* New translations devise.en.yml (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Thai)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations activerecord.en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations devise.en.yml (Arabic)
[ci skip]
* New translations doorkeeper.en.yml (Arabic)
[ci skip]
* New translations doorkeeper.en.yml (Welsh)
[ci skip]
* New translations doorkeeper.en.yml (German)
[ci skip]
* New translations doorkeeper.en.yml (German)
[ci skip]
* New translations doorkeeper.en.yml (German)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations activerecord.en.yml (Japanese)
[ci skip]
* New translations devise.en.yml (Japanese)
[ci skip]
* New translations doorkeeper.en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations activerecord.en.yml (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations devise.en.yml (Hungarian)
[ci skip]
* New translations devise.en.yml (Hungarian)
[ci skip]
* New translations devise.en.yml (Hungarian)
[ci skip]
* New translations devise.en.yml (Hungarian)
[ci skip]
* New translations devise.en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations activerecord.en.yml (Hungarian)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
Thibaut Girka [Tue, 18 Jun 2019 17:54:36 +0000 (19:54 +0200)]
Fix rendering of emoji in public pages
ThibG [Tue, 18 Jun 2019 16:23:08 +0000 (18:23 +0200)]
Completely hide toots matched by “irreversible” filters even if they got to the client (#11113)
Fixes #11090
ThibG [Tue, 18 Jun 2019 16:22:02 +0000 (18:22 +0200)]
Fix User#active scope only returning suspended users (#11111)
Fix a regression from #10660
Thibaut Girka [Tue, 18 Jun 2019 13:58:01 +0000 (15:58 +0200)]
Fix streaming server crashing when updating filters
dependabot-preview[bot] [Mon, 17 Jun 2019 15:28:28 +0000 (00:28 +0900)]
Bump enzyme-adapter-react-16 from 1.7.1 to 1.14.0 (#11105)
Bumps [enzyme-adapter-react-16](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme-adapter-react-16) from 1.7.1 to 1.14.0.
- [Release notes](https://github.com/airbnb/enzyme/releases)
- [Changelog](https://github.com/airbnb/enzyme/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/enzyme/commits/enzyme-adapter-react-16@1.14.0/packages/enzyme-adapter-react-16)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Mon, 17 Jun 2019 15:20:54 +0000 (00:20 +0900)]
Bump webpack-cli from 3.3.2 to 3.3.4 (#11106)
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.2 to 3.3.4.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.2...v3.3.4)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Mon, 17 Jun 2019 15:19:00 +0000 (00:19 +0900)]
Bump webpack from 4.29.6 to 4.34.0 (#11108)
Bumps [webpack](https://github.com/webpack/webpack) from 4.29.6 to 4.34.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.29.6...v4.34.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Mon, 17 Jun 2019 15:04:24 +0000 (00:04 +0900)]
Bump enzyme from 3.8.0 to 3.10.0 (#11107)
Bumps [enzyme](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme) from 3.8.0 to 3.10.0.
- [Release notes](https://github.com/airbnb/enzyme/releases)
- [Changelog](https://github.com/airbnb/enzyme/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/enzyme/commits/enzyme@3.10.0/packages/enzyme)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Mon, 17 Jun 2019 14:23:13 +0000 (23:23 +0900)]
Bump capybara from 3.22.0 to 3.24.0 (#11100)
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.22.0 to 3.24.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.22.0...3.24.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Mon, 17 Jun 2019 14:14:52 +0000 (23:14 +0900)]
Bump file-loader from 3.0.1 to 4.0.0 (#11104)
Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 3.0.1 to 4.0.0.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v3.0.1...v4.0.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Mon, 17 Jun 2019 13:50:20 +0000 (22:50 +0900)]
Bump ox from 2.10.1 to 2.11.0 (#11101)
Bumps ox from 2.10.1 to 2.11.0.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Mon, 17 Jun 2019 12:23:29 +0000 (21:23 +0900)]
Bump lograge from 0.11.1 to 0.11.2 (#11102)
Bumps [lograge](https://github.com/roidrage/lograge) from 0.11.1 to 0.11.2.
- [Release notes](https://github.com/roidrage/lograge/releases)
- [Changelog](https://github.com/roidrage/lograge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/roidrage/lograge/compare/v0.11.1...v0.11.2)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Mon, 17 Jun 2019 12:17:45 +0000 (21:17 +0900)]
Bump webmock from 3.5.1 to 3.6.0 (#11031)
Bumps [webmock](https://github.com/bblimke/webmock) from 3.5.1 to 3.6.0.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.5.1...v3.6.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Mon, 17 Jun 2019 12:17:32 +0000 (21:17 +0900)]
Bump rellax from 1.7.1 to 1.10.0 (#11040)
Bumps [rellax](https://github.com/dixonandmoe/rellax) from 1.7.1 to 1.10.0.
- [Release notes](https://github.com/dixonandmoe/rellax/releases)
- [Commits](https://github.com/dixonandmoe/rellax/commits)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Mon, 17 Jun 2019 12:17:11 +0000 (21:17 +0900)]
Bump webpack-bundle-analyzer from 3.1.0 to 3.3.2 (#11039)
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 3.1.0 to 3.3.2.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases)
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v3.1.0...v3.3.2)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Mon, 17 Jun 2019 12:17:02 +0000 (21:17 +0900)]
Bump autoprefixer from 9.5.1 to 9.6.0 (#11038)
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.5.1 to 9.6.0.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/9.5.1...9.6.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Mon, 17 Jun 2019 12:16:47 +0000 (21:16 +0900)]
Bump eslint-plugin-import from 2.14.0 to 2.17.3 (#11037)
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.14.0 to 2.17.3.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.14.0...v2.17.3)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Mon, 17 Jun 2019 12:16:22 +0000 (21:16 +0900)]
Bump httplog from 1.3.0 to 1.3.1 (#11034)
Bumps [httplog](https://github.com/trusche/httplog) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/trusche/httplog/releases)
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md)
- [Commits](https://github.com/trusche/httplog/compare/v1.3.0...v1.3.1)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Mon, 17 Jun 2019 12:16:15 +0000 (21:16 +0900)]
Bump pghero from 2.2.0 to 2.2.1 (#11033)
Bumps [pghero](https://github.com/ankane/pghero) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/ankane/pghero/releases)
- [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/pghero/compare/v2.2.0...v2.2.1)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Mon, 17 Jun 2019 12:16:03 +0000 (21:16 +0900)]
Bump rubocop-rails from 2.0.0 to 2.0.1 (#11032)
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.0.0...v2.0.1)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Mon, 17 Jun 2019 12:15:33 +0000 (21:15 +0900)]
Bump aws-sdk-s3 from 1.41.0 to 1.42.0 (#11030)
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.41.0 to 1.42.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.41.0...v1.42.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Eugen Rochko [Sun, 16 Jun 2019 19:46:36 +0000 (21:46 +0200)]
Fix sanitizer making block level elements unreadable (#10836)
Fix #10834
Thibaut Girka [Sun, 16 Jun 2019 18:41:03 +0000 (20:41 +0200)]
Fix styling of poll options on public pages in glitch flavour
ThibG [Sun, 16 Jun 2019 19:25:37 +0000 (21:25 +0200)]
Merge pull request #1121 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Thibaut Girka [Sun, 16 Jun 2019 19:09:19 +0000 (21:09 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 16 Jun 2019 14:02:26 +0000 (16:02 +0200)]
Do not scroll in the compose panel on single-column
Eugen Rochko [Sun, 16 Jun 2019 17:12:12 +0000 (19:12 +0200)]
Fix check-i18n builds (#11084)
* Fix check-i18n builds
* Remove check for missing plural forms
ThibG [Sun, 16 Jun 2019 16:46:55 +0000 (18:46 +0200)]
Do not scroll in the compose panel on single-column (#11093)
Yusuke Nakamura [Sun, 16 Jun 2019 16:36:47 +0000 (01:36 +0900)]
Update translating platform has changed to crowdin (CONTRIBUTING.md) (#11094)
Restore and change from
89096860
Thibaut Girka [Sun, 16 Jun 2019 13:18:53 +0000 (15:18 +0200)]
Fix composer buttons overflowing the composer box in single-column
Eugen Rochko [Sat, 8 Jun 2019 13:30:06 +0000 (15:30 +0200)]
[Glitch] Change full logo to use primary text color of the given theme
Port
20dda5cca0a4015a743250b4e584a3101e7675f2 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Thibaut Girka [Fri, 14 Jun 2019 10:59:59 +0000 (12:59 +0200)]
Fix replying not automatically switching to compose form on mobile
Dan Hunsaker [Fri, 14 Jun 2019 12:52:32 +0000 (06:52 -0600)]
Resync Nanobox files with the 2.9.0 release (#11083)
ThibG [Thu, 13 Jun 2019 21:53:21 +0000 (23:53 +0200)]
Merge pull request #1111 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Thibaut Girka [Thu, 13 Jun 2019 20:38:22 +0000 (22:38 +0200)]
Include necessary JS in auth pages
ThibG [Thu, 13 Jun 2019 15:04:52 +0000 (17:04 +0200)]
[Glitch] List attachments in boost modal
Port
dd45c63921f6f64096fa6a1693cc84d6aa33c54f to glitch-soc