Commit graph

10052 commits

Author SHA1 Message Date
Thibaut Girka
6b21ce2daa [Glitch] When sending a toot, ensure a CW is only set if the CW field is visible
Partial port of fa7866c9c8 to glitch-soc

It doesn't ensure the field isn't changed, just that it isn't submitted if
the field isn't visible. Ensuring the field isn't changed would require
reworking the “always show CW field” feature.
2019-06-30 14:35:03 +02:00
ThibG
c49a57e989 [Glitch] Optimize makeGetStatus
Port ff65c494a6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-30 11:06:04 +02:00
ThibG
68e998de21 [Glitch] Use ScrollToOptions for smooth scrolling if supported
Port 20b1f8dcf6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-30 11:01:01 +02:00
Thibaut Girka
5c23174a2f Merge branch 'master' into glitch-soc/merge-upstream 2019-06-30 10:59:45 +02:00
ThibG
ff65c494a6 Optimize makeGetStatus (#11211)
* Optimize makeGetStatus

Because `ImmutableList.filter` always returns a new object and `createSelector`
memoizes based on object identity, the selector returned by `makeGetStatus`
would *always* execute.

To avoid that, we wrap `getFilters` into a new memoizer that memoizes based on
deep equality, thus returning the same object as long as the filters haven't
changed, allowing the memoization of `makeGetStatus` to work.

Furthermore, we memoize the compiled regexs instead of recomputing them each
time the selector is called.

* Fix memoized result being cleared too often

* Make notifications use memoized getFiltersRegex
2019-06-30 00:12:38 +02:00
ThibG
fa7866c9c8 When sending a toot, ensure a CW is only set if the CW field is visible (#11206)
In some occasions, such as the browser or a browser extension auto-filling
the existing but disabled/hidden CW field, a CW can be set without the user
knowing.
2019-06-29 18:32:36 +02:00
ThibG
20b1f8dcf6 Use ScrollToOptions for smooth scrolling if supported (#11207) 2019-06-29 18:32:06 +02:00
ThibG
48260a9a54 Merge pull request #1146 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-06-28 22:35:54 +02:00
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>
2019-06-28 21:42:37 +02:00
ThibG
284ff65022 [Glitch] Fix swiping columns on mobile sometimes failing
Port 9668e42afd to glitch-soc
2019-06-28 21:38:34 +02:00
Thibaut Girka
6739c423ff Merge branch 'master' into glitch-soc/merge-upstream 2019-06-28 21:36:50 +02:00
ThibG
72dc1b3e60 Display FTS warning based on actual search term, not the one being typed (#11202)
Follow-up to #11112
2019-06-28 19:29:11 +02:00
ThibG
3bb035f8be Merge pull request #1145 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-06-28 19:11:06 +02:00
ThibG
a393529547 [Glitch] Add message telling FTS is disabled when no toot can be found because of this
Port 0943e994dd to glitch-soc
2019-06-28 18:54:56 +02:00
Eugen Rochko
1c612f24e4 Add categories for custom emojis (#11196)
Fix #7940
2019-06-28 15:54:10 +02:00
ThibG
9668e42afd Fix swiping columns on mobile sometimes failing (#11200)
Fixes #9779
2019-06-28 13:52:15 +02:00
Thibaut Girka
8176d21824 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-28 12:11:45 +02:00
Thibaut Girka
ad4ebd172a Change search components classes and styling to match upstream 2019-06-28 11:13:41 +02:00
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
2019-06-27 21:12:26 +02:00
ThibG
8adac384ed Fix account URI in UpdatePollSerializer (#11194)
* Fix account URI in UpdatePollSerializer

Fixes #11185

* Add specs
2019-06-27 19:41:55 +02:00
Thibaut Girka
ec1fcf1584 Use a redis-cached feed for the DM timeline 2019-06-27 16:44:12 +02:00
ThibG
eead3a7c91 Merge pull request #1142 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-06-27 16:43:55 +02:00
Thibaut Girka
b445d2fbc0 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-27 15:48:23 +02:00
mayaeh
9fb7c513e3 Fix NameError (#11192) 2019-06-27 09:16:55 +02:00
ThibG
dd97db20d0 [Glitch] Add option to disable blurhash previews
Port 4b3d91dc2c to glitch-soc
2019-06-26 23:19:26 +02:00
PatOnTheBack
426758b619 [Glitch] Removed extra pipes from regex.
Port 9a216634a1 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-26 23:19:26 +02:00
ThibG
105d248fea [Glitch] Apply filters to poll options in WebUI
Port 42c803fe61 to glitch-soc
2019-06-26 23:19:26 +02:00
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
2019-06-26 23:19:22 +02:00
ThibG
4b3d91dc2c Add option to disable blurhash previews (#11188)
* Add option to disable blurhash previews

* Update option text

* Change options order
2019-06-26 19:33:04 +02:00
ThibG
28806d5d6d Add support for Audio activities (#11189)
Fixes #11127
2019-06-26 19:32:36 +02:00
ThibG
1af85ca177 Scroll to compose form rather than reply indicator on focus (#11182) 2019-06-26 14:28:36 +02:00
Thibaut Girka
883160b769 Scroll to compose form rather than reply indicator on focus 2019-06-26 10:46:11 +02:00
PatOnTheBack
9a216634a1 Removed extra pipes from regex. (#11181) 2019-06-26 02:16:24 +02:00
ThibG
86bd851941 Merge pull request #1138 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-06-25 22:43:33 +02:00
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>
2019-06-25 20:51:35 +02:00
Eugen Rochko
8ed78f0b85 Fix unnecessary SQL query performed on unauthenticated requests (#11179) 2019-06-25 20:18:15 +02:00
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>
2019-06-25 22:51:57 +09:00
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>
2019-06-25 22:49:44 +09:00
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>
2019-06-25 22:45:32 +09:00
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>
2019-06-25 22:39:35 +09:00
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>
2019-06-25 22:37:26 +09:00
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>
2019-06-25 22:36:57 +09:00
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>
2019-06-25 22:32:58 +09:00
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>
2019-06-25 22:24:49 +09:00
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
2019-06-25 14:45:14 +02:00
Thibaut Girka
cfb9b3db87 Change .env.production.sample to specify that MAX_VIDEO_SIZE also applies to audio files 2019-06-24 16:27:10 +02:00
Thibaut Girka
b99f77bd31 Use a different icon for audio attachments 2019-06-24 16:16:16 +02:00
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>
2019-06-24 16:00:42 +02:00
Eugen Rochko
b02325e820 [Glitch] Add audio uploads
Port front-end changes from d7e2f554fb to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-24 16:00:42 +02:00
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
2019-06-24 15:02:59 +02:00