| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2022-12-15 | Add left and right margin to emojis (#20464) | Douglas Blank | |
| 2022-12-15 | Add follow request banner on account header (#20785) | Claire | |
| * Add requested_by to relationship maps * Display whether an account has requested to follow you on their profile | |||
| 2022-12-15 | Add transparancy to modal background for accessibility (#18081) | Terence Eden | |
| Fixes #18080 This keeps the `ui-base-lighter-color` but adds enough transparency so that text is more easily readable. Tested in Firefox and Chrome. | |||
| 2022-12-15 | Fix margin for search field on medium window size (#21606) | Mina Her | |
| 2022-12-15 | Fix the top action bar appearing in multi-column layout (#20943) | Claire | |
| 2022-12-15 | Increase the width of the unread notification border. (#21692) | Connor Shea | |
| The smaller border is difficult to see for some users, especially when the browser window was thinner, and so the unread border is at the very left edge of the window. | |||
| 2022-12-15 | Fix profile avatar being slightly offset into left border (fixes #20822) ↵ | Riedler | |
| (#20994) * hotfix for #20822 I don't know why it was shifted in the first place or why the width is specified twice, but this fixes the problem, so it looks fine to me. * realigned pfp with content below * fixed formatting my bad * added comment to explain the negative margin before I forget - comments are *important* ! Co-authored-by: Riedler <riedler@gelse.eu> | |||
| 2022-12-15 | Fix invalid CSS for links in warning and strike cards (#22302) | Claire | |
| 2022-12-14 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2022-12-13 | fix missing style in warning and strike cards (#22177) | Rin | |
| 2022-12-13 | Make handle more easily selectable on profile page (#21479) | cadars | |
| * Make handle more easily selectable on profile page * Wrap handle in a span * Add `user-select: all` to span * remove whitespace | |||
| 2022-12-07 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's. | |||
| 2022-12-07 | Fix hidden overflow on interaction modal (#21763) | Juan Xavier Gomez | |
| * Fix hidden overflow on interaction modal * only update overflow y | |||
| 2022-12-07 | Fix UI header overflow on mobile (#21783) | Claire | |
| 2022-12-06 | Fix the top border of verified account fields (#22006) | Jed Fox | |
| 2022-11-28 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. | |||
| 2022-11-27 | Make the 'Trending now' header a link to Explore. (#21759) | Connor Shea | |
| This keeps the same design that exists currently, but makes "Trending now" into a link to the Hashtags section of "Explore". Resolves #21758. | |||
| 2022-11-14 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `app/views/admin/announcements/edit.html.haml`: Upstream change too close to theming-related glitch-soc change. Ported upstream changes. - `app/views/admin/announcements/new.html.haml` Upstream change too close to theming-related glitch-soc change. Ported upstream changes. | |||
| 2022-11-14 | Fix style of username in navigation bar above compose form in web UI (#20628) | Eugen Rochko | |
| Regression from #20540 | |||
| 2022-11-14 | Fix dropdown menu on profiles not being accessible on narrow screens in web ↵ | Eugen Rochko | |
| UI (#20620) | |||
| 2022-11-14 | Fix wrong cut-off point for "Read more" in web UI (#20599) | Eugen Rochko | |
| 2022-11-13 | Stick batch table toolbar to the top (#20442) | Samuel Kaiser | |
| Fixes #20441 | |||
| 2022-11-12 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 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. | |||
| 2022-11-12 | Revert "Revert "Change "Allow trends without prior review" setting to ↵ | Claire | |
| include statuses (#17977)"" This reverts commit bfc539cfb4f040fcffac740b36791c26c2a74119. | |||
| 2022-11-11 | Fix domain blocks on about page not working well on small screens in web UI ↵ | Eugen Rochko | |
| (#20391) | |||
| 2022-11-11 | Only remove padding when listing applications (#20382) | Connor Shea | |
| This prevents styling issues on the Authorization page. | |||
| 2022-11-10 | Fix color of the “No description added“ media upload warning on light ↵ | Claire | |
| theme (#20328) | |||
| 2022-11-10 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 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-10 | Change larger reblogs/favourites numbers to be shortened in web UI (#20303) | Eugen Rochko | |
| 2022-11-10 | Fix profile header being cut off in light theme in web UI (#20298) | Eugen Rochko | |
| 2022-11-08 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2022-11-07 | Fix spoiler buttons css not rendering correct color in light theme (#19960) | Zach Flanders | |
| * Updating status__content__spoiler-link css for mastodon-light theme to ensure correct rendering precedence * Adding focus css selector to status__content__spoiler-link mastodon-light theme * reformatting code to match convention of having css selectors on separate lines * fixing code format for scss linting issue | |||
| 2022-11-07 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2022-11-07 | Fix double button to clear emoji search input (#19888) | Sunny Ripert | |
| 2022-11-06 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 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-05 | Change design of new list form in web UI (#19801) | Eugen Rochko | |
| 2022-11-05 | Change design of moved account banner in web UI (#19790) | Eugen Rochko | |
| 2022-11-05 | Remove word-break:keep-all from Dismissable banner message (#19799) | eai04191 | |
| 2022-11-05 | Change sign-in banner to reflect disabled or moved account status (#19773) | Claire | |
| 2022-11-04 | Make word-break: keep-all for dismissable banner (#19719) | Jeong Arm | |
| 2022-11-04 | Fix colors in light theme (#19714) | Eugen Rochko | |
| 2022-11-04 | Fix wrong colors in the high-contrast theme (#19708) | Eugen Rochko | |
| 2022-11-04 | Fix design of verified links in web UI (#19709) | Eugen Rochko | |
| 2022-10-31 | Change design of link footer (#19562) | Eugen Rochko | |
| 2022-10-30 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 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-30 | Fix sidebar and tabs on settings on small screens in admin UI (#19533) | Eugen Rochko | |
| 2022-10-28 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2022-10-28 | Fix assets compilation | Claire | |
| Not too sure why the loader behaves differently than it previously did, though. | |||
| 2022-10-28 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2022-10-28 | Fix number of uses being shown again on trending hashtags in web UI (#19484) | Eugen Rochko | |
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |