3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon-docker-playground/app/javascript/mastodon/features
History
Claire 25a46d9e59 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/fonts/montserrat.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/models/account.rb`:
  Textual conflict only caused by glitch-soc using a different value
  for character limits in a nearby line.
  Applied upstream's changes.
- `app/views/statuses/_simple_status.html.haml`:
  Attribute added to a tag modified by glitch-soc.
  Added upstream's attributes.
- `yarn.lock`:
  Upstream added/updated dependencies close to glitch-soc-only ones.
  Updated/added upstream dependencies.
 		2022-06-02 09:49:38 +02:00
..
account Add `limited` attribute to accounts in REST API and a warning in web UI (#18344) 2022-05-10 09:44:35 +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
…
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
…
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 Fix block/mute lists showing a follow button when unblocking a user (#18364) 2022-05-09 23:20:19 +02:00
notifications Change "Direct" status visibility to "Only people I mention" in web UI (#18146) 2022-04-29 00:24:31 +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 Replace leftover `envelope` icons with `at` icons (#18305) 2022-05-06 00:41:56 +02:00
ui Fix floating action button obscuring last element (#18332) 2022-05-06 21:40:49 +02:00
video Replace deprecated String.prototype.substr() (#17949) 2022-04-04 12:19:45 -04:00