Commit Graph

1331 Commits (c40b063bd44b1d33d4788e20dd42ce45cc009b5f)

Author SHA1 Message Date
Jeremy Kescher c40b063bd4
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	.github/workflows/build-image.yml
#	lib/mastodon/version.rb
2 years ago
Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/account.rb`:
  Conflict because we (glitch-soc) have disabled trending of posts without
  review.
  Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
  Just an extra setting in glitch-soc.
  Kept that extra setting.
2 years ago
Claire 93a6ebc83d
Fix WebUI crash when listing server blocks and rationale is not available (#20408)
Regression from #20391

Fixes #20405
2 years ago
Claire 31005aad12
Add the ability to edit media attachment metadata for any unattached media (#20402) 2 years ago
Cutls 553b169d48
Do not show drag&drop dialog when not logined (#20400)
* Cannot upload until login

* and do not fire upload

* change username props to context
2 years ago
Claire 5e796dc6f8
Remove “No description added” media warning in edit mode (#20393)
Editing media metadata is not currently possible in edit mode, the button would
open the modal but saving the changes would error out.
2 years ago
Eugen Rochko 6774c339b2
Fix domain blocks on about page not working well on small screens in web UI (#20391) 2 years ago
Jeremy Kescher 4886f1955b
Merge remote-tracking branch 'upstream/main' into develop 2 years ago
Claire c118918520 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/custom_emoji.rb`:
  Not a real conflict, just upstream changing a line too close to
  a glitch-soc-specific validation.
  Applied upstream changes.
- `app/models/public_feed.rb`:
  Not a real conflict, just upstream changing a line too close to
  a glitch-soc-specific parameter documentation.
  Applied upstream changes.
2 years ago
Eugen Rochko 16122761c5
Fix confusing wording in interaction modal in web UI (#20302) 2 years ago
Eugen Rochko ef582dc4f2
Add option to open original page in dropdowns of remote content in web UI (#20299)
Change profile picture click to open profile picture in modal in web UI
2 years ago
Jeremy Kescher 5b797a34df
Merge remote-tracking branch 'upstream/main' into develop 2 years ago
Sasha Sorokin d055d75172
Remove aria-pressed where it's redundant (#19912)
This commit removes aria-pressed attribute from all elements which
contents or other descriptive attributes change in active state,
effectively replacing the meaning of the button, in which case
aria-pressed, an attribute specified whether the button is currently
pressed, would create a confusion. (Spoiler: it's everywhere).

See https://github.com/mastodon/mastodon/issues/13545#issuecomment-1304886969
2 years ago
Claire a8c854b3ea Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
Jeremy Kescher ffa93fa157
Merge remote-tracking branch 'upstream/main' into develop 2 years ago
Claire 608343c135
Fix opening the language picker scrolling the single-column view to the top (#19983)
Fixes #19915
2 years ago
Claire be7032b9cf Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
Sunny Ripert 8515bc7962
Add form element on focal point modal (#19834)
* Add form element on focal point modal

* Add type="button" for detection button
2 years ago
Claire 6c0a6097ff Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
Sunny Ripert 34c269310d
Fix console log error on column settings load (#19886) 2 years ago
Jeremy Kescher 03f50f2f00
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	app/javascript/flavours/glitch/features/ui/components/link_footer.js
#	lib/mastodon/version.rb
#	public/avatars/original/missing.png
2 years ago
Jeremy Kescher 996267fc8b
Fix vanilla flavor being broken due to incorrect imports 2 years ago
Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
2 years ago
Jeremy Kescher 5ab1ac972b
Show about tab if explore tab wouldn't show any statuses 2 years ago
Jeremy Kescher b0be4764b4
Keep showing explore tab, only statuses are hidden 2 years ago
Jeremy Kescher da8c3bed5c
Don't show trending statuses in public web UI 2 years ago
Eugen Rochko ca8d52c2a4
Change design of new list form in web UI (#19801) 2 years ago
Eugen Rochko a442f481f8
Fix missing interpolation of domain in disabled account banner in web UI (#19788) 2 years ago
Eugen Rochko 7c65f52692
Change design of moved account banner in web UI (#19790) 2 years ago
Claire 312d616371
Change sign-in banner to reflect disabled or moved account status (#19773) 2 years ago
Sunny Ripert 887976814a
Fix JavaScript console warning when loading notifications (#19772) 2 years ago
Sunny Ripert c95d9aab56
Fix JavaScript console error on upload editing status (#19769) 2 years ago
Claire 9616f5bb22
Fix compose form submission reloading web interface (#19762)
* Fix compose form submission reloading web interface

Fix regression introduced by #19742

* Fix various compose form buttons being handled like submit buttons

* Fix coding style issue

* Fix missing onClick prop check
2 years ago
Sunny Ripert 0165449e3a
A11y: Explicit <form> element around compose area (#19742) 2 years ago
Eugen Rochko e02812d5b6
Add assets from Twemoji 14.0 (#19733) 2 years ago
Eugen Rochko 139ea4c981
Fix limited account hint referencing "your" server when logged out (#19711) 2 years ago
Eugen Rochko 5825402ed5
Fix design of verified links in web UI (#19709) 2 years ago
Claire cbb440bbc2
Fix being unable to withdraw follow request when confirmation modal is disabled (#19687)
* Fix being unable to withdraw follow request when unfollow confirmation modal is disabled

Fixes #19569

* Fix “unfollow” being inadequately used for withdrawing follow requests from account card
2 years ago
Jeremy Kescher c3bffb95b6
Vanilla flavor: Reduce amount of data stored in initial state for min_options on polls 2 years ago
Jeremy Kescher 9c8fb2d475
Improve min poll options, expose value in API 2 years ago
Jeremy Kescher 7f6215984b
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	.github/workflows/build-image.yml
2 years ago
Eugen Rochko 2d9a85db6e
Change design of link footer (#19562) 2 years ago
Claire eee36267d6 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
  Upstream change too close to a glitch-soc-specific string.
  The glitch-soc-specific string should not have been in this file, so it
  has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
  Upstream refactored a part, that as usual is split and duplicated in various
  pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
  Upstream fixed custom.css path in a different way than we did, went with
  upstream's change.
2 years ago
Eugen Rochko 30ef110224
Fix upload progress not communicating processing phase in web UI (#19530) 2 years ago
Eugen Rochko 55af04b253
Fix logged out search and changed logged-in search placeholder (#19514) 2 years ago
Claire b514998dc1 Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
Eugen Rochko 5fa340931e
Fix closed registrations message not appearing in web UI (#19508)
Regression from #19486
2 years ago
Claire cb19be67d1 Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
Eugen Rochko 371d969403
Fix missing delete and redraft link in web UI (#19485) 2 years ago
Eugen Rochko d2eb726962
Fix notifications about deleted reports not being also deleted (#19475)
* Fix notifications about deleted reports not being also deleted

* Fix notification with empty report crashing web UI

Fix #18909
2 years ago