about summary refs log tree commit diff
path: root/app/views
AgeCommit message (Collapse)Author
2022-11-10Merge branch 'main' into glitch-soc/merge-upstreamClaire
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.
2022-11-09Fix being able to spoof link verification (#20217)Eugen Rochko
- Change verification to happen in `default` queue - Change verification worker to only be queued if there's something to do - Add `link` tags from metadata fields to page header of profiles
2022-11-08Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-11-08Add password autocomplete hints (#20071)Claire
Fixes #20067 Our password autocomplete hints were “off” but that does not prevent current browsers from trying to autocomplete them anyway, so use `current-password` and `new-password` so they don't put a newly-generated password in a password confirmation prompt, or the old password for a password renewal prompt.
2022-11-07Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-11-07Fix links to the Web UI in notifications (#19981)Claire
Most of the old routes are broken because of the /web removal.
2022-11-07Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-11-07Tag the OTP field with autocomplete for password managers (#19946)Chris Rose
This is modeled on #19833, and based on the attribute values documented in https://developer.apple.com/documentation/security/password_autofill/enabling_password_autofill_on_an_html_input_element?language=objc
2022-11-07Add null check on application in dispute viewer (#19851)Jeremy Kescher
2022-11-07Set autocomplete attr for email field on signup page (#19833)rcombs
The email address will be used as the "username" for sign-in purposes, so it's the value that should be stored in password managers. We can inform the password manager of this by setting `autocomplete="email"`. Without this hint, password managers may instead store the `username` field, which isn't valid for sign-in (this happens with iCloud Keychain in Safari, for instance).
2022-11-06Merge branch 'main' into glitch-soc/merge-upstreamClaire
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.
2022-11-04Remove meta tag for official iOS app (#19656)SJang1
2022-10-30Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-10-30Fix invites (#19560)Claire
Fixes #19507 Fix regression from #19296
2022-10-30Merge branch 'main' into glitch-soc/merge-upstreamClaire
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.
2022-10-30Fix sidebar and tabs on settings on small screens in admin UI (#19533)Eugen Rochko
2022-10-29Fix wrong host being used for custom.css when asset host configured (#19521)Eugen Rochko
2022-10-28Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-10-28Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-10-28Change admin announcement edition interface to use datetime-local (#18321)Claire
* Change admin announcement edition interface to use datetime-local * Dynamically set announcement stop date as required if start date is set, set minimum date for stop date * Change `all_day` to not be bound to presence of time-range * Add pattern and placeholder as minimal fallback for browsers not supporting datetime-local * Display datetime-local inputs as local time Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2022-10-26Add ability to view previous edits of a status in admin UI (#19462)Eugen Rochko
* Add ability to view previous edits of a status in admin UI * Change moderator access to posts to be controlled by a separate policy
2022-10-26Revert "Remove preference to aggregate reblogs in home/list feeds (#18112)" ↵Eugen Rochko
(#19463) This reverts commit af396fa35f589e1f759c7a3a0dad7932f1862309.
2022-10-23Change floating action button to be a button in header in web UI (#19422)Eugen Rochko
- Fix theme color - Fix elephant being too big on error page on small screens - Remove "Follows and Followers" link from navigation panel
2022-10-22Change settings area to be separated into categories in admin UI (#19407)Eugen Rochko
And update all descriptions
2022-10-21Fix featured tag display name in setting (#19404)Takeshi Umeda
2022-10-21Use DEFAULT_FIELDS_SIZE/MAX_PROFILE_FIELDS value in settings form hint (#1870)prplecake
Use `Account::DEFAULT_FIELDS_SIZE` in the hint, which would fallback to 4 if the environment variable isn't set.
2022-10-20Change public accounts pages to mount the web UI (#19319)Eugen Rochko
* Change public accounts pages to mount the web UI * Fix handling of remote usernames in routes - When logged in, serve web app - When logged out, redirect to permalink - Fix `app-body` class not being set sometimes due to name conflict * Fix missing `multiColumn` prop * Fix failing test * Use `discoverable` attribute to control indexing directives * Fix `<ColumnLoading />` not using `multiColumn` * Add `noindex` to accounts in REST API * Change noindex directive to not be rendered by default before a route is mounted * Add loading indicator for detailed status in web UI * Fix missing indicator appearing while account is loading in web UI
2022-10-18Fix error on migration page (#19386)Eugen Rochko
2022-10-13Change about page to be mounted in the web UI (#19345)Eugen Rochko
2022-10-13Add image processing and generate blurhash for server thumbnail (#19348)Eugen Rochko
Remove separate server hero setting
2022-10-09Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)Eugen Rochko
Cherry-picked d2528b26b6da34f34b5d7a392e263428d3c09d69 Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream changed stuff, we had extra attributes. Applied upstream changes while keeping our extra attributes. - `app/serializers/rest/instance_serializer.rb`: Upstream actually moved that to `app/serializers/rest/v1/instance_serializer.rb`, so updated that file by keeping our extra attributes, and took upstream's version of `app/serializers/rest/instance_serializer.rb`. - `spec/views/about/show.html.haml_spec.rb`: Took upstream's version.
2022-10-09[Glitch] Allow non-logged users to access /webEugen Rochko
Port 43b5d5e38d2b8ad8f1d1ad0911c3c1718159c912 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-08Add support for language preferences for trending statuses and links (#18288)Eugen Rochko
2022-10-08Change privacy policy to be rendered in web UI, add REST API (#19310)Eugen Rochko
Source string no longer localized, Markdown instead of raw HTML
2022-10-06Remove setting that disables account deletes (#17683)Eugen Rochko
2022-10-06Change public statuses pages to mount the web UI (#19301)Eugen Rochko
2022-10-06Remove previous landing page (#19300)Eugen Rochko
2022-10-06Remove unnecessary sections from welcome e-mail (#19299)Eugen Rochko
2022-10-05Add server rules to sign-up flow (#19296)Eugen Rochko
2022-10-05Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)Eugen Rochko
2022-10-04Remove code for rendering public and hashtag timelines outside the web UI ↵Eugen Rochko
(#19257)
2022-10-02Revert server-side part of "Add logged-out access to the web UI"Claire
2022-10-02Revert "Change "Allow trends without prior review" setting to include ↵Claire
statuses (#17977)" This reverts commit 546672e292dc3218e996048464c4c52e5d00f766.
2022-10-02Merge branch 'main' into glitch-soc/merge-upstreamClaire
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-09-29Change path of privacy policy page (#19249)Eugen Rochko
2022-09-29Add logged-out access to the web UI (#18961)Eugen Rochko
2022-09-27Add retention policy for cached content and media (#19232)Eugen Rochko
2022-08-31Fix error when accessing /filters/:id/statuses on glitch-soc (#1837)Claire
I failed to account for glitch-soc's theming system when merging from upstream.
2022-08-28Revert "Remove preference to aggregate reblogs in home/list feeds (#18112)"Claire
This reverts commit af396fa35f589e1f759c7a3a0dad7932f1862309.
2022-08-28Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change.
generated by cgit-pink (git 2.37.1) at 2024-11-07 04:28:59 +0000