ThibG
48260a9a54
Merge pull request #1146 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
Eugen Rochko
a3cd9e432d
[Glitch] Add categories for custom emojis
...
Port front-end changes from 1c612f24e4
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
ThibG
284ff65022
[Glitch] Fix swiping columns on mobile sometimes failing
...
Port 9668e42afd
to glitch-soc
5 years ago
Thibaut Girka
6739c423ff
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ThibG
72dc1b3e60
Display FTS warning based on actual search term, not the one being typed ( #11202 )
...
Follow-up to #11112
5 years ago
ThibG
3bb035f8be
Merge pull request #1145 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
ThibG
a393529547
[Glitch] Add message telling FTS is disabled when no toot can be found because of this
...
Port 0943e994dd
to glitch-soc
5 years ago
Eugen Rochko
1c612f24e4
Add categories for custom emojis ( #11196 )
...
Fix #7940
5 years ago
ThibG
9668e42afd
Fix swiping columns on mobile sometimes failing ( #11200 )
...
Fixes #9779
5 years ago
Thibaut Girka
8176d21824
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Thibaut Girka
ad4ebd172a
Change search components classes and styling to match upstream
5 years ago
ThibG
0943e994dd
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
5 years ago
ThibG
8adac384ed
Fix account URI in UpdatePollSerializer ( #11194 )
...
* Fix account URI in UpdatePollSerializer
Fixes #11185
* Add specs
5 years ago
Thibaut Girka
ec1fcf1584
Use a redis-cached feed for the DM timeline
5 years ago
ThibG
eead3a7c91
Merge pull request #1142 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
Thibaut Girka
b445d2fbc0
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
mayaeh
9fb7c513e3
Fix NameError ( #11192 )
5 years ago
ThibG
dd97db20d0
[Glitch] Add option to disable blurhash previews
...
Port 4b3d91dc2c
to glitch-soc
5 years ago
PatOnTheBack
426758b619
[Glitch] Removed extra pipes from regex.
...
Port 9a216634a1
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
ThibG
105d248fea
[Glitch] Apply filters to poll options in WebUI
...
Port 42c803fe61
to glitch-soc
5 years ago
Thibaut Girka
acbed64f3d
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
5 years ago
ThibG
4b3d91dc2c
Add option to disable blurhash previews ( #11188 )
...
* Add option to disable blurhash previews
* Update option text
* Change options order
5 years ago
ThibG
28806d5d6d
Add support for Audio activities ( #11189 )
...
Fixes #11127
5 years ago
ThibG
1af85ca177
Scroll to compose form rather than reply indicator on focus ( #11182 )
5 years ago
Thibaut Girka
883160b769
Scroll to compose form rather than reply indicator on focus
5 years ago
PatOnTheBack
9a216634a1
Removed extra pipes from regex. ( #11181 )
5 years ago
ThibG
86bd851941
Merge pull request #1138 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
dependabot-preview[bot]
0474162ddb
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>
5 years ago
Eugen Rochko
8ed78f0b85
Fix unnecessary SQL query performed on unauthenticated requests ( #11179 )
5 years ago
dependabot-preview[bot]
4dddee9b8d
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>
5 years ago
dependabot-preview[bot]
04714cfcf2
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>
5 years ago
dependabot-preview[bot]
2516308057
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>
5 years ago
dependabot-preview[bot]
8601be38f3
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>
5 years ago
dependabot-preview[bot]
0412adc10e
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>
5 years ago
dependabot-preview[bot]
371121b4f3
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>
5 years ago
dependabot-preview[bot]
095bf5f5a0
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>
5 years ago
dependabot-preview[bot]
dd2f0c03bf
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>
5 years ago
ThibG
42c803fe61
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
5 years ago
Thibaut Girka
cfb9b3db87
Change .env.production.sample to specify that MAX_VIDEO_SIZE also applies to audio files
5 years ago
Thibaut Girka
b99f77bd31
Use a different icon for audio attachments
5 years ago
Eugen Rochko
a0abbbe8cd
[Glitch] Add media description as title to links of unknown media attachments
...
Port front-end changes from a266d7f1a2
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
Eugen Rochko
b02325e820
[Glitch] Add audio uploads
...
Port front-end changes from d7e2f554fb
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
Thibaut Girka
1177694c3e
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
5 years ago
Eugen Rochko
ca07b67ba1
Fix unconverted PRs in the changelog ( #11155 )
5 years ago
Eugen Rochko
2080807d5f
Bump version to 2.9.2 ( #11152 )
5 years ago
Eugen Rochko
47e6cb8ee5
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
5 years ago
Eugen Rochko
297e15baa0
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
5 years ago
koyu
a317acfa72
Change camera icon to paperclip icon in upload form ( #11149 )
5 years ago
Eugen Rochko
3208a52d36
Add `short_description` and `approval_required` to `GET /api/v1/instance` ( #11146 )
5 years ago
Eugen Rochko
d85b2a734b
Fix audio not being downloaded from remote servers ( #11145 )
5 years ago