| Age | Commit message (Collapse) | Author |
|---|
|
Ctrl+click usually allows opening a link in a new tab. This
was prevented for hashtag or user links in toots.
|
|
Merge upstream changes
|
|
|
|
Port WebUI changes from f2404de871f0bdfda5c9aeeeb4c6c4d10a8da8ab to glitch-soc
|
|
Port various commits to glitch-soc, mainly commits
0dcc1950d14cc4a7725ea1572d253c538a1f74e8 and
5b8603879f06573d51c5c33edda6f410d1af7a02.
|
|
Port the SCSS part of f2404de871f0bdfda5c9aeeeb4c6c4d10a8da8ab to glitch-soc
|
|
Conflicts:
app/controllers/accounts_controller.rb
app/javascript/mastodon/locales/pl.json
app/views/about/more.html.haml
Conflicts in `accounts_controller.rb` resolved by taking upstream's
version + our `use_pack`.
Conflicts in `pl.json` resolved by taking upstream's changes.
Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.
|
|
|
|
Follow-up to #8142
|
|
#7780 means that asset compilation happens as a build step.
Having the assets and packs volumes defined in `docker-compose.yml` breaks this. For people who run under Docker Compose, I believe this will fix their CSS (which even running the asset recompilation separately did not).
|
|
|
|
|
|
|
|
* [RU] Translation update:
• Added translation to Welcome timeline
• Doorkeeper: changed date format to more common in Russia
• Doorkeeper: added translation to scopes
• Added translation to Dashboard settings (I didn't have a chance to test it on Live server, so some strings may be a bit incorrect)
• Added translation to Relays settings
• Added translation to Filters settings
• Some other small fixes and improvements
* Quoted string for "joined" key to avoid mapping error
* [RU] Changed "повторить" (repeat) to "исправить" (change, fix) for a more correct translation.
* i18n-tasks normalize
|
|
Browser UI too confusing / scares people, protocol URIs not used much
|
|
Accessibility issues largely outweigh the joke and consistency with upstream.
|
|
|
|
|
|
When there is a single detailed status on a public page, scroll to it and
replace the history state to not scroll back on refresh (simulates # anchors).
|
|
|
|
This fixes updating the profile preview when changing display name.
|
|
|
|
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
|
|
|
|
Fixes how “Pinned toot”, “… boosted” etc. are styled on public profiles.
|
|
Merge upstream changes
|
|
Conflicts:
config/settings.yml
|
|
|
|
|
|
Merge upstream changes
|
|
The public pages now use CSS from the WebUI to style toots, but the glitch-soc
UI is widely different. Hack around that for now by hardcoding upstream-like
values.
|
|
|
|
Port 13ac8ca66ab01c92e4ebcc7221efb3d474c9fd0b to glitch-soc
|
|
Port 60df87f6f0fb8afd9a4e750917eff7c425b62891 to glitch-soc
|
|
Port e0b1e17bd04d7f9b533ab462aee4544a5f5fb926 to glitch-soc
|
|
Port 1d773b3a4691b153ff0c658db53007293905d86b to glitch-soc
|
|
Port bb71538bb503159177d46d8956bd466973c0876b to glitch-soc
|
|
Manually-resolved conflicts:
.circleci/config.yml
app/controllers/accounts_controller.rb
app/controllers/auth/passwords_controller.rb
app/controllers/statuses_controller.rb
app/javascript/packs/public.js
app/models/media_attachment.rb
app/views/stream_entries/_content_spoiler.html.haml
app/views/stream_entries/_media.html.haml
config/locales/en.yml
config/locales/ja.yml
config/locales/pl.yml
lib/mastodon/version.rb
Some content from app/javascript/packs/public.js has been split to
app/javascript/core/settings.js.
Translation strings for glitch-soc's keyword mutes were dropped.
Everything else was mostly “take both”.
|
|
* Add separate setting for sidebar text (site_short_description)
* Fix tests
|
|
Upstream's implementation has been merged a while ago and is the preferred
way to set fields, as it is the only one compatible with upstream and is
more user-friendly.
This commit deletes the legacy glitch-soc FrontMatter functionality in order
to clean up the code and make it easier to maintain.
|
|
|
|
|
|
|
|
|
|
* Compensate for scrollbar disappearing when media modal visible
Make auth pages backgrounds lighter
* Fix typo
|
|
Initially I thought there might be valid reasons for remote users to
have a different, unpredicted username format. However, I now realize
such a difference would be unusable and unexpected within Mastodon.
Fix #8058
|
|
Tests cannot run without built assets, and we want
exactly the matching assets. This is not a cache.
|
|
Tests cannot run without built assets, and we want
exactly the matching assets. This is not a cache.
|
|
* Fix incorrect context definition for the "featured" keyword
Fix #8077
* Adjust context definition for movedTo
|
|
Separate size limits for images and video. Images remain at 8MB,
while videos can be up to 40MB.
|
