tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Mastodon/app/javascript/mastodon/features
History
Claire b3bf32a21e Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/reports/show.html.haml`:
  Conflicts due to glitch-soc's theming system.
2022-01-17 10:45:25 +01:00
..
account
Remove Keybase integration (#17045)
2021-11-26 05:58:18 +01:00
account_gallery
Add aliases for WebUI routes that were renamed in #16171 (#16772)
2021-09-27 07:23:48 +02:00
account_timeline
Remove Keybase integration (#17045)
2021-11-26 05:58:18 +01:00
audio
…
blocks
Improve modal flow and back button handling (#16499)
2021-07-13 15:45:17 +02:00
bookmarked_statuses
Improve modal flow and back button handling (#16499)
2021-07-13 15:45:17 +02:00
community_timeline
Improve modal flow and back button handling (#16499)
2021-07-13 15:45:17 +02:00
compose
Merge branch 'main' into glitch-soc/merge-upstream
2021-10-14 21:44:57 +02:00
direct_timeline
Fix incorrect use of old WebUI paths (#16773)
2021-09-27 07:24:04 +02:00
directory
Change routing paths to use usernames in web UI (#16171)
2021-09-26 05:46:13 +02:00
domain_blocks
Improve modal flow and back button handling (#16499)
2021-07-13 15:45:17 +02:00
emoji
Update emoji codepoint mappings to v13.1 (#16352)
2021-06-03 16:08:07 +02:00
favourited_statuses
Improve modal flow and back button handling (#16499)
2021-07-13 15:45:17 +02:00
favourites
Improve modal flow and back button handling (#16499)
2021-07-13 15:45:17 +02:00
follow_recommendations
Fix incorrect use of old WebUI paths (#16773)
2021-09-27 07:24:04 +02:00
follow_requests
Change routing paths to use usernames in web UI (#16171)
2021-09-26 05:46:13 +02:00
followers
Add aliases for WebUI routes that were renamed in #16171 (#16772)
2021-09-27 07:23:48 +02:00
following
Add aliases for WebUI routes that were renamed in #16171 (#16772)
2021-09-27 07:23:48 +02:00
generic_not_found
…
getting_started
Add graphs and retention metrics to admin dashboard (#16829)
2021-10-14 20:44:59 +02:00
hashtag_timeline
Fix tag rendering error in hashtag column settings (#17184)
2021-12-26 19:22:05 +01:00
home_timeline
Improve modal flow and back button handling (#16499)
2021-07-13 15:45:17 +02:00
introduction
…
keyboard_shortcuts
…
list_adder
…
list_editor
…
list_timeline
Improve modal flow and back button handling (#16499)
2021-07-13 15:45:17 +02:00
lists
Change routing paths to use usernames in web UI (#16171)
2021-09-26 05:46:13 +02:00
mutes
Improve modal flow and back button handling (#16499)
2021-07-13 15:45:17 +02:00
notifications
Split context for filter bar and unread markers (#16865)
2021-10-25 16:32:28 +02:00
picture_in_picture
Change routing paths to use usernames in web UI (#16171)
2021-09-26 05:46:13 +02:00
pinned_statuses
Improve modal flow and back button handling (#16499)
2021-07-13 15:45:17 +02:00
public_timeline
Improve modal flow and back button handling (#16499)
2021-07-13 15:45:17 +02:00
reblogs
Improve modal flow and back button handling (#16499)
2021-07-13 15:45:17 +02:00
report
…
search
…
standalone
…
status
Add notifications for statuses deleted by moderators (#17204)
2022-01-17 09:41:33 +01:00
ui
Fix incorrect use of old WebUI paths (#16773)
2021-09-27 07:24:04 +02:00
video
…