luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-17 20:32:56 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/about
History
Claire 1fbd1fa5c4 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Conflicts due to us having more user settings and upstream dropping
  `hide_network` (to replace it with an account attribute, properly migrated).
  Dropped `hide_network` like upstream.
- `app/lib/user_settings_decorator.rb`:
  Conflicts due to us having more user settings and upstream dropping
  `hide_network` (to replace it with an account attribute, properly migrated).
  Dropped `hide_network` like upstream.
- `app/models/status.rb`:
  Conflict because of slight change in how glitch-soc handles the scope to
  filter out local-only posts for anonymous viewers.
  Took upstream's changes and re-applied glitch-soc's change.
- `app/models/user.rb`:
  Conflicts due to us having more user settings and upstream dropping
  `hide_network` (to replace it with an account attribute, properly migrated).
  Dropped `hide_network` like upstream.
- `app/views/directories/index.html.haml`:
  Conflict because upstream redesigned that page while glitch-soc had a minor
  change to support hiding the number of followers.
  Ported glitch-soc's change on top of upstream's redesign.

Additional changes:
- `app/models/account_statuses_filter.rb`:
  See change to `app/models/status.rb`.
2022-03-08 20:22:54 +01:00
..
_domain_blocks.html.haml Add option to obfuscate domain name in public list of domain blocks (#15355) 2020-12-18 08:30:41 +01:00
_logged_in.html.haml Redesign /about when already logged in (#17348) 2022-03-03 16:14:44 +01:00
_login.html.haml Add OMNIAUTH_ONLY environment variable to enforce externa log-in (#17288) 2022-01-23 15:52:58 +01:00
_registration.html.haml Change autocomplete type of password input box (#17702) 2022-03-05 05:57:50 +01:00
more.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
show.html.haml Redesign /about when already logged in (#17348) 2022-03-03 16:14:44 +01:00
terms.html.haml Update /terms and /about/more to use public layout (#8142) 2018-08-09 12:58:20 +02:00