me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/javascript/mastodon/features
History
Claire 06a878c6b5 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/admin/base_controller.rb`:
  Minor conflict caused by glitch-soc's theming system.
- `app/javascript/mastodon/initial_state.js`:
  Minor conflict caused by glitch-soc making use of max_toot_chars.
- `app/models/form/admin_settings.rb`:
  Minor conflict caused by glitch-soc's theming system.
- `app/models/trends.rb`:
  Minor conflict caused by glitch-soc having more granular
  notification settings for trends.
- `app/views/admin/accounts/index.html.haml`:
  Minor conflict caused by glitch-soc's theming system.
- `app/views/admin/instances/show.html.haml`:
  Minor conflict caused by glitch-soc's theming system.
- `app/views/layouts/application.html.haml`:
  Minor conflict caused by glitch-soc's theming system.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Minor conflict caused by glitch-soc having more granular
  notification settings for trends.
- `config/navigation.rb`:
  Minor conflict caused by glitch-soc having additional
  navigation items for the theming system while upstream
  slightly changed every line.
2022-07-05 09:33:44 +02:00
..
account Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
account_gallery Add aliases for WebUI routes that were renamed in #16171 (#16772) 2021-09-27 07:23:48 +02:00
account_timeline Add limited attribute to accounts in REST API and a warning in web UI (#18344) 2022-05-10 09:44:35 +02:00
audio Add hotkeys for audio/video control (#15158) 2020-11-15 14:24:54 +01:00
blocks Fix block/mute lists showing a follow button when unblocking a user (#18364) 2022-05-09 23:20:19 +02:00
bookmarked_statuses Change "Direct" status visibility to "Only people I mention" in web UI (#18146) 2022-04-29 00:24:31 +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 2022-06-02 09:49:38 +02:00
direct_timeline Change "Conversations" back to "Direct messages" and add warning in web UI (#18289) 2022-05-03 09:09:09 +02:00
directory Change "Direct" status visibility to "Only people I mention" in web UI (#18146) 2022-04-29 00:24:31 +02:00
domain_blocks Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
emoji Replace deprecated String.prototype.substr() (#17949) 2022-04-04 12:19:45 -04:00
explore Change "Direct" status visibility to "Only people I mention" in web UI (#18146) 2022-04-29 00:24:31 +02:00
favourited_statuses Change "Direct" status visibility to "Only people I mention" in web UI (#18146) 2022-04-29 00:24:31 +02:00
favourites Change "Direct" status visibility to "Only people I mention" in web UI (#18146) 2022-04-29 00:24:31 +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 limited attribute to accounts in REST API and a warning in web UI (#18344) 2022-05-10 09:44:35 +02:00
following Add limited attribute to accounts in REST API and a warning in web UI (#18344) 2022-05-10 09:44:35 +02:00
generic_not_found Fix performance of home feed regeneration (#12084) 2019-10-06 22:11:17 +02:00
getting_started Change "Conversations" back to "Direct messages" and add warning in web UI (#18289) 2022-05-03 09:09:09 +02:00
hashtag_timeline Fix being able to add more than 4 hashtags to hashtag column in web UI (#17729) 2022-03-09 13:01:44 +01:00
home_timeline Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
keyboard_shortcuts Change "Conversations" back to "Direct messages" and add warning in web UI (#18289) 2022-05-03 09:09:09 +02: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 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 Fix block/mute lists showing a follow button when unblocking a user (#18364) 2022-05-09 23:20:19 +02:00
notifications Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
picture_in_picture Fix media modal footer's “external link” not being a link (#17561) 2022-02-25 01:20:41 +01:00
pinned_statuses Change "Direct" status visibility to "Only people I mention" in web UI (#18146) 2022-04-29 00:24:31 +02:00
public_timeline Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
reblogs Change "Direct" status visibility to "Only people I mention" in web UI (#18146) 2022-04-29 00:24:31 +02:00
report Fix empty “Server rules violation” report option (#18165) 2022-04-28 21:29:29 +02:00
standalone Add local only to hashtag timeline (#13502) 2020-04-18 21:52:39 +02:00
status Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
ui Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
video Replace deprecated String.prototype.substr() (#17949) 2022-04-04 12:19:45 -04:00