CloudToys/puyopuyotetr.is
1
0
Fork 0
Code
4a70792b4a
puyopuyotetr.is/app/javascript/mastodon/features
History
Thibaut Girka 4a70792b4a Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, just a glitch-soc-only dependency too close to a
  dependency that got updated upstream. Updated as well.
- `app/models/status.rb`:
  Not a real conflict, just a change too close to glitch-soc-changed code
  for optionally showing boosts in public timelines.
  Applied upstream changes.
- `app/views/layouts/application.html.haml`:
  Upstream a new, static CSS file, conflict due to glitch-soc's theming
  system, include the file regardless of the theme.
- `config/initializers/content_security_policy.rb`:
  Upstream dropped 'unsafe-inline' from the 'style-src' directive, but
  both files are very different. Removed 'unsafe-inline' as well.
2020-05-10 16:19:56 +02:00
..
account/components Change the string "hidden" to "blocked" in WebUI (#13221) 2020-03-09 09:13:21 +01:00
account_gallery Add noopener and/or noreferrer (#12202) 2019-10-24 22:44:42 +02:00
account_timeline Add “account timeline” filter category (#12918) 2020-01-23 21:32:00 +01:00
audio Add tooltips to audio/video player buttons (#13203) 2020-03-05 15:52:15 +01:00
blocks Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445) 2020-04-12 13:38:00 +02:00
bookmarked_statuses Add bookmarks (#7107) 2019-11-13 23:02:10 +01:00
community_timeline Fix unread toot indicator not honoring onlyMedia in public and community timelines (#12330) 2019-11-11 00:05:02 +02:00
compose Merge branch 'master' into glitch-soc/merge-upstream 2020-05-03 21:23:49 +02:00
direct_timeline Improve toot clicking areas (#13327) 2020-03-31 19:40:23 +02:00
directory Fix unfollow confirmations in account directory (#12922) 2020-01-22 16:26:47 +01:00
domain_blocks Change the string "hidden" to "blocked" in WebUI (#13221) 2020-03-09 09:13:21 +01:00
emoji Update Twemoji to 12.1.5 (#13021) 2020-04-19 23:38:31 +02:00
favourited_statuses Fix scroll to top in single column UI (#11463) 2019-08-01 19:17:17 +02:00
favourites Code style improvements in JavaScript (#13159) 2020-03-08 16:02:36 +01:00
follow_requests Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445) 2020-04-12 13:38:00 +02:00
followers Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445) 2020-04-12 13:38:00 +02:00
following Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445) 2020-04-12 13:38:00 +02:00
generic_not_found Fix performance of home feed regeneration (#12084) 2019-10-06 22:11:17 +02:00
getting_started Fix frontend crash when deleting announcements (#13312) 2020-03-25 22:39:55 +01:00
hashtag_timeline Add local only to hashtag timeline (#13502) 2020-04-18 21:52:39 +02:00
home_timeline Change how unread announcements are handled (#13020) 2020-02-03 01:53:09 +01:00
introduction change "finish tutorial" text to "finish toot-orial" (#9905) 2019-02-04 04:45:29 +01:00
keyboard_shortcuts Add hotkey for opening media files (#12498) 2019-11-29 17:02:35 +01:00
list_adder Refactor icons in web UI to use Icon component (#9951) 2019-02-01 00:14:05 +01:00
list_editor Disable list title validation button when list title is empty (#11475) 2019-08-03 19:10:39 +02:00
list_timeline Fix scroll to top in single column UI (#11463) 2019-08-01 19:17:17 +02:00
lists Code style improvements in JavaScript (#13159) 2020-03-08 16:02:36 +01:00
mutes Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445) 2020-04-12 13:38:00 +02:00
notifications Add follow_request notification type (#12198) 2019-12-01 17:25:29 +01:00
pinned_statuses Fix scroll to top in single column UI (#11463) 2019-08-01 19:17:17 +02:00
public_timeline Add remote only to public timeline (#13504) 2020-05-10 10:36:18 +02:00
reblogs Code style improvements in JavaScript (#13159) 2020-03-08 16:02:36 +01:00
report Add blurhash (#10630) 2019-04-27 03:24:09 +02:00
search Add responsive panels to the single-column layout (#10820) 2019-05-25 21:27:00 +02:00
standalone Add local only to hashtag timeline (#13502) 2020-04-18 21:52:39 +02:00
status Fix expanded video player issues (#13541) 2020-04-25 12:16:05 +02:00
ui Add remote only to public timeline (#13504) 2020-05-10 10:36:18 +02:00
video Fix expanded video player issues (#13541) 2020-04-25 12:16:05 +02:00