Commit Graph

8438 Commits (db1f81553e696a8e032e0b47e900097f8ba809e1)

Author SHA1 Message Date
Thibaut Girka db1f81553e Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
ThibG d41433f651 Fix crashes in SuspendAccountService/UnsuspendAccountService (#15100)
* Fix crashes in SuspendAccountService/UnsuspendAccountService

* Catch filesystem errors
2020-11-07 13:16:54 +01:00
ThibG c11e8737dd Fix suspension/unsuspension not working because of FeedManager change (#15099) 2020-11-07 13:16:00 +01:00
Eugen Rochko 79f71206de Add subresource integrity for JS and CSS assets (#15096)
Fix #2744
2020-11-06 11:56:31 +01:00
Mélanie Chauvel 87042c99ee Display “Show newer” and “Show older” instead of “Show more” in public pages (#15052) 2020-11-04 21:15:45 +01:00
ThibG b1a78a5cce Change order of announcements in admin page to sort them newest-first (#15091)
* Change order of announcements in admin page to sort show newly-created first

Fixes #15090

* Use reverse-chronological rather than creation date only
2020-11-04 21:15:22 +01:00
Takeshi Umeda 385c2eac6f Add account sensitized (#14361)
* Add account sensitized

* Fix i18n normalize

* Fix description and spec

* Fix spec

* Fix wording
2020-11-04 20:45:01 +01:00
Mashiro 7f3497bd7f Add limitation of image's max zoom rate (max to the original size of image) (#15094)
* limit image max scale rate to fit the actual image size

* replace with MIN_SCALE

* fix behavior on touch screen
2020-11-04 20:43:31 +01:00
Thibaut Girka 34b08796de Fix unsightly re-layout delay for media previews 2020-11-04 18:53:52 +01:00
Thibaut Girka 0b30bdedf6 Fix hiding video breaking playback
Also make the video player code closer to upstream
2020-11-04 18:53:39 +01:00
dependabot[bot] 88dd5d3ee1 Bump detect-passive-events from 1.0.5 to 2.0.1 (#15003)
* Bump detect-passive-events from 1.0.5 to 2.0.1

Bumps [detect-passive-events](https://github.com/rafgraph/detect-passive-events) from 1.0.5 to 2.0.1.
- [Release notes](https://github.com/rafgraph/detect-passive-events/releases)
- [Commits](https://github.com/rafgraph/detect-passive-events/compare/v1.0.5...v2.0.1)

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

* Migrate to detect-passive-events v2

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2020-11-05 02:21:05 +09:00
Mashiro a8712fbcfd [Glitch] add mouse scroll lock in image expand view
Port 00c6280294 to glitch-soc

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

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

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

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

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

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

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

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

* enhancement
2020-11-03 06:06:45 +01:00
Mashiro 315356cf23 Add expand/compress image button on image view box (#15068)
* 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
ThibG 9500d00e5f Tweak signature verification (#15069)
* 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 2d5f0a0002 Fix some account media gallery items having empty labels (#15073)
Remove the labels entirely for images instead of putting an empty label.
2020-11-01 18:31:39 +01:00
Thibaut Girka 44cbf37295 Fix crash when viewing a profile with a filtered out pinned toot 2020-11-01 16:53:03 +01:00
ThibG 2b0491bb3c Fix poll ending notifications being created for each vote (#15071)
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 a0b695b0c6 Show announcements in reverse chronological order (#15065) 2020-10-30 13:09:51 +01:00
fuyu 5ba6548e62 Fix wrong seek bar width on media player (#15060) 2020-10-30 13:09:20 +01:00
Thibaut Girka a56cf3be14 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 c15c3b01eb Fix width of content text fluctuating over time (#15055) 2020-10-27 13:34:02 +01:00
Thibaut Girka 0b5d0e5318 Add option to hide notification markers 2020-10-27 11:20:11 +01:00
Mélanie Chauvel 6c072d8dec Make “Mark media as sensitive” properly translatable (#15051) 2020-10-27 03:05:50 +01:00
Mélanie Chauvel f7eae6d264 Make visibility icon clickable as part of the time of a toot (#15053)
- 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 c93e98ad47 Sort filters by “keyword or phrase” in Settings (#15050) 2020-10-27 03:00:06 +01:00
Mélanie Chauvel 988d029417 Make click area of video/audio player buttons bigger in WebUI (#15049) 2020-10-27 02:58:47 +01:00
Thibaut Girka a984e2c4cb Add local setting for pop-in player position 2020-10-26 20:51:28 +01:00
Thibaut Girka 1b724e0738 Add setting to disable the pop-in player 2020-10-26 20:31:54 +01:00
Thibaut Girka 18b0bfe497 Respect glitch-soc's reply counter setting in the pop-in player 2020-10-26 20:31:54 +01:00
Eugen Rochko 3b41ec371e [Glitch] Fix regressions in icon buttons in web UI
Port 5c10211bcd to glitch-soc

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

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-26 19:51:09 +01:00
ThibG 006201214e [Glitch] Fix follow request notifications
Port df120d667c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-26 15:50:48 +01:00
Thibaut Girka b03d3117c3 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 df120d667c Fix follow request notifications (#15048) 2020-10-26 15:41:28 +01:00
ThibG a9b5dd584f Fix followers synchronization mechanism not being triggered on mentions (#15026)
e.g. if someone on an instance that previously had followers gets mentioned
in a private toot, before this PR, they would not receive a
Collection-Synchronization header and may show the toot to the former followers
in addition to the mentioned person.
2020-10-23 14:22:16 +02:00
ThibG 06aef3817a Fix account processing failing because of large collections (#15027)
Fixes #15025
2020-10-23 14:21:31 +02:00
mayaeh 598f032fa0 [Glitch] Fix strings that could not be translated
Port f1b2eea474 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21 21:49:46 +02:00
Eugen Rochko f4524cbfcd [Glitch] Change how missing desktop notifications permission is displayed
Port 10ff8b1205 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21 21:49:46 +02:00
Thibaut Girka 7770807825 Move columns-related CSS rules into the appropriate files 2020-10-21 21:28:47 +02:00
ThibG 8fb1cbf6fe [Glitch] Fix browser notification permission request logic
Port 592fa427e3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21 21:28:47 +02:00
OSAMU SATO 8fb24fc735 [Glitch] Add duration parameter to muting.
Port ba9252b32d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21 21:28:47 +02:00