me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/javascript/mastodon/features
History
Claire a4fc7ac922 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/home_controller.rb`:
  Upstream made it so `/web` is available to non-logged-in users
  and `/` redirects to `/web` instead of `/about`.
  Kept our version since glitch-soc's WebUI doesn't have what's
  needed yet and I think /about is still a much better landing
  page anyway.
- `app/models/form/admin_settings.rb`:
  Upstream added new settings, and glitch-soc had an extra setting.
  Not really a conflict.
  Added upstream's new settings.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a new `server` initial state object.
  Not really a conflict.
  Merged upstream's changes.
- `app/views/admin/settings/edit.html.haml`:
  Upstream added new settings.
  Not really a conflict.
  Merged upstream's changes.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
  Upstream refactored that part and removed the file.
  Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb`
- `config/settings.yml`:
  Upstream added new settings.
  Not a real conflict.
  Added upstream's new settings.
2022-10-02 18:46:22 +02:00
..
account Add logged-out access to the web UI (#18961) 2022-09-29 04:39:33 +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 ability to filter followed accounts' posts by language (#19095) 2022-09-20 23:51:21 +02:00
audio Add warning for sensitive audio posts (#17885) 2022-08-13 15:39:05 +02: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 Add logged-out access to the web UI (#18961) 2022-09-29 04:39:33 +02:00
compose Merge branch 'main' into glitch-soc/merge-upstream 2022-08-25 05:07:39 +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 Add logged-out access to the web UI (#18961) 2022-09-29 04:39:33 +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 Add logged-out access to the web UI (#18961) 2022-09-29 04:39:33 +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
filters Add ability to filter individual posts (#18945) 2022-08-25 04:27:47 +02:00
follow_recommendations Fix wrong logo on start screen in web UI (#19254) 2022-09-29 08:55:14 +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 Add logged-out access to the web UI (#18961) 2022-09-29 04:39:33 +02: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 Add logged-out access to the web UI (#18961) 2022-09-29 04:39:33 +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 Add privacy icons to report modal (#19190) 2022-09-21 22:46:57 +02:00
standalone Add local only to hashtag timeline (#13502) 2020-04-18 21:52:39 +02:00
status Add logged-out access to the web UI (#18961) 2022-09-29 04:39:33 +02:00
subscribed_languages_modal Add ability to filter followed accounts' posts by language (#19095) 2022-09-20 23:51:21 +02:00
ui Change path of privacy policy page (#19249) 2022-09-29 06:22:12 +02:00
video Replace deprecated String.prototype.substr() (#17949) 2022-04-04 12:19:45 -04:00