1
0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Commit Graph

13475 Commits

Author SHA1 Message Date
Mashiro
dc86d814d9 [Glitch] add mouse scroll lock in image expand view
Port f645dad661 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-04 12:24:40 +01:00
Mashiro
40af1cf65b [Glitch] Add expand/compress image button on image view box
Port 6a2db10f76 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-04 12:24:40 +01:00
mayaeh
f5df3d1ae2 [Glitch] Fix width of content text fluctuating over time
Port 2ae751f19d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-04 12:24:40 +01:00
Mélanie Chauvel
078744f210 [Glitch] Make visibility icon clickable as part of the time of a toot
Port 1d07f51039 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-04 12:24:40 +01:00
Mélanie Chauvel
578e757d09 [Glitch] Make click area of video/audio player buttons bigger in WebUI
Port a5afbb62d2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-03 17:42:40 +01:00
ThibG
adfaf9551c [Glitch] Fix some account media gallery items having empty labels
Port 9d023ed4f6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-03 17:38:50 +01:00
fuyu
37dfb9dddc [Glitch] Fix wrong seek bar width on media player
Port 8d7fbe7dd9 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-03 17:37:53 +01:00
Mélanie Chauvel
3b96141633 [Glitch] Make “Mark media as sensitive” properly translatable
Port c5704e75ae to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-11-03 17:36:54 +01:00
Thibaut Girka
cd675fbe18 Merge branch 'master' into glitch-soc/merge-upstream 2020-11-03 17:28:54 +01:00
Mashiro
f645dad661
add mouse scroll lock in image expand view ()
* add mouse scroll lock in image expand view

* enhancement
2020-11-03 06:06:45 +01:00
Mashiro
6a2db10f76
Add expand/compress image button on image view box ()
* add zoom image button

* enhance zoom algorithm & add translation

* code structure

* code structure

* code structure

* enhance grab performance

* rm useless state

* fix behavior on Firefox & scroll lock & horizontal scroll with mousewheel

* remove scroll lock on MouseWheelEvent

* code structure

* enhance algorithm and code structure

* rm Gemfile.lock from tree

* codeclimate

* fix a stupid mistake
2020-11-02 21:16:38 +01:00
Patrice Ferlet
4b2ec4a2dc
Fix postrgres secret name for cronjob ()
The cronjob tries to get key from `mastodon` secret instead of
`mastodon-postgresql` - so the cronjob fails with this error:

Error: couldn't find key postgresql-password in Secret [NS]/mastodon

Another solution is to save the postgres password in mastodon secret,
but that means that the password is placed in two places.

Postgresql use <fullname>-postgresql name as secret name.
2020-11-02 06:16:51 +01:00
ThibG
fa929d8b81
Tweak signature verification ()
* Add more specific error message when request body digest is invalid

This may help other implementors debug their implementation.

* Relax Host parameter requirement to GET requests

The only POST requests processed by Mastodon need objects/actors (including
their host) to be explicitly mentioned in the request's body, so replaying
a legitimate request to another host should not be a security issue.

* Support Digest headers using multiple algorithms or lowercase alogirthm names
2020-11-01 23:38:31 +01:00
ThibG
9d023ed4f6
Fix some account media gallery items having empty labels ()
Remove the labels entirely for images instead of putting an empty label.
2020-11-01 18:31:39 +01:00
Thibaut Girka
b8e790c3c2 Fix crash when viewing a profile with a filtered out pinned toot 2020-11-01 16:53:03 +01:00
ThibG
c49805efb1
Fix poll ending notifications being created for each vote ()
On a poll ending, notifications were created for each vote instead
of for each voter.
2020-11-01 06:34:43 +01:00
Darius Kazemi
f1f0400adc
Show announcements in reverse chronological order () 2020-10-30 13:09:51 +01:00
fuyu
8d7fbe7dd9
Fix wrong seek bar width on media player () 2020-10-30 13:09:20 +01:00
dependabot[bot]
d56e14a9cb
Bump mini-css-extract-plugin from 0.11.3 to 1.2.0 ()
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 0.11.3 to 1.2.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.11.3...v1.2.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-30 17:02:55 +09:00
dependabot[bot]
c79626493a
Bump css-loader from 4.3.0 to 5.0.0 ()
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 4.3.0 to 5.0.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v4.3.0...v5.0.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-30 16:55:59 +09:00
Thibaut Girka
5a41704f89 Fix IP blocks in admin panel
It was broken due to discrepancies between upstream and glitch-soc's
theming system.
2020-10-28 23:55:41 +01:00
mayaeh
2ae751f19d
Fix width of content text fluctuating over time () 2020-10-27 13:34:02 +01:00
Thibaut Girka
a81bb14abe Add option to hide notification markers 2020-10-27 11:20:11 +01:00
Mélanie Chauvel
c5704e75ae
Make “Mark media as sensitive” properly translatable () 2020-10-27 03:05:50 +01:00
Mélanie Chauvel
1d07f51039
Make visibility icon clickable as part of the time of a toot ()
- Makes permalink to a toot more easily clickable
- Fix clicking between icon and time in fact clicking the display name
- Fix clicking slightly under time in fact clicking the display name
2020-10-27 03:00:47 +01:00
Mélanie Chauvel
0a8ab822e2
Sort filters by “keyword or phrase” in Settings () 2020-10-27 03:00:06 +01:00
Mélanie Chauvel
a5afbb62d2
Make click area of video/audio player buttons bigger in WebUI () 2020-10-27 02:58:47 +01:00
dependabot[bot]
4a509d5722
Bump jest from 26.5.3 to 26.6.1 ()
Bumps [jest](https://github.com/facebook/jest) from 26.5.3 to 26.6.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v26.5.3...v26.6.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-27 09:06:10 +09:00
dependabot[bot]
d388e5ce2f
Bump babel-jest from 26.5.2 to 26.6.1 ()
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 26.5.2 to 26.6.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v26.6.1/packages/babel-jest)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-27 08:36:39 +09:00
ThibG
c762ca49dc
Merge pull request from ThibG/glitch-soc/features/upstream-pop-in
Port upstream's pop-in player to glitch-soc
2020-10-26 22:54:50 +01:00
Thibaut Girka
49ee69f75f Add local setting for pop-in player position 2020-10-26 20:51:28 +01:00
Thibaut Girka
ea5298ab9b Add setting to disable the pop-in player 2020-10-26 20:31:54 +01:00
Thibaut Girka
5ee2b860f9 Respect glitch-soc's reply counter setting in the pop-in player 2020-10-26 20:31:54 +01:00
Eugen Rochko
47edac871c [Glitch] Fix regressions in icon buttons in web UI
Port a549415868 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-26 19:51:09 +01:00
Eugen Rochko
8f950e540b [Glitch] Add pop-out player for audio/video in web UI
port d88a79b456 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-26 19:51:09 +01:00
dependabot[bot]
2089290849
Bump axios from 0.20.0 to 0.21.0 ()
Bumps [axios](https://github.com/axios/axios) from 0.20.0 to 0.21.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.20.0...v0.21.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-27 02:54:31 +09:00
dependabot[bot]
444ed97099
Bump react-test-renderer from 16.13.1 to 16.14.0 ()
Bumps [react-test-renderer](https://github.com/facebook/react/tree/HEAD/packages/react-test-renderer) from 16.13.1 to 16.14.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.14.0/packages/react-test-renderer)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-27 02:52:38 +09:00
dependabot[bot]
e63c1f12c4
Bump eslint from 7.11.0 to 7.12.0 ()
Bumps [eslint](https://github.com/eslint/eslint) from 7.11.0 to 7.12.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/v7.11.0...v7.12.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-27 02:51:12 +09:00
dependabot[bot]
56939e1037
Bump @testing-library/jest-dom from 5.11.4 to 5.11.5 ()
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.11.4 to 5.11.5.
- [Release notes](https://github.com/testing-library/jest-dom/releases)
- [Changelog](https://github.com/testing-library/jest-dom/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.11.4...v5.11.5)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-27 02:47:24 +09:00
dependabot[bot]
336b6a3c3f
Bump tzinfo-data from 1.2020.3 to 1.2020.4 ()
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2020.3 to 1.2020.4.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases)
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2020.3...v1.2020.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-27 02:44:48 +09:00
dependabot[bot]
0a30a138b2
Bump sass-loader from 10.0.3 to 10.0.4 ()
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 10.0.3 to 10.0.4.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v10.0.3...v10.0.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-27 02:44:27 +09:00
dependabot[bot]
0e04878e23
Bump eslint-plugin-react from 7.21.4 to 7.21.5 ()
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.21.4 to 7.21.5.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.21.4...v7.21.5)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-27 02:43:57 +09:00
dependabot[bot]
1eda0a9a25
Bump strong_migrations from 0.7.1 to 0.7.2 ()
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.7.1 to 0.7.2.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.7.1...v0.7.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-27 02:43:19 +09:00
dependabot[bot]
8b4654fd85
Bump simplecov from 0.19.0 to 0.19.1 ()
Bumps [simplecov](https://github.com/simplecov-ruby/simplecov) from 0.19.0 to 0.19.1.
- [Release notes](https://github.com/simplecov-ruby/simplecov/releases)
- [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md)
- [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.19.0...v0.19.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-27 02:41:36 +09:00
dependabot[bot]
652f6269f9
Bump aws-sdk-s3 from 1.83.0 to 1.83.1 ()
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.83.0 to 1.83.1.
- [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/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-27 02:41:15 +09:00
dependabot[bot]
853d2761e4
Bump stackprof from 0.2.15 to 0.2.16 ()
Bumps [stackprof](https://github.com/tmm1/stackprof) from 0.2.15 to 0.2.16.
- [Release notes](https://github.com/tmm1/stackprof/releases)
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tmm1/stackprof/compare/v0.2.15...v0.2.16)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-27 02:40:37 +09:00
ThibG
9c88792f0a
Merge pull request from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2020-10-26 16:11:58 +01:00
ThibG
ddbb9f0ec4 [Glitch] Fix follow request notifications
Port 3678b10823 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-26 15:50:48 +01:00
Thibaut Girka
9c34090db8 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/services/process_mentions_service.rb`:
  glitch-soc local-only handling, ported upstream changes
2020-10-26 15:48:16 +01:00
ThibG
3678b10823
Fix follow request notifications () 2020-10-26 15:41:28 +01:00