Age | Commit message (Collapse) | Author | |
---|---|---|---|
2022-11-14 | Merge remote-tracking branch 'glitch/main' | Starfall | |
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 error when invalid domain name is submitted (#19474) | Eugen Rochko | |
Fix #19175 | |||
2022-11-14 | Fix error when passing unknown filter param in REST API (#20626) | Eugen Rochko | |
Fix #19156 | |||
2022-11-14 | Fix image type not being set after conversion for convertible image types ↵ | Eugen Rochko | |
(#20624) | |||
2022-11-14 | Fix rules with same priority being sorted non-deterministically (#20623) | Eugen Rochko | |
2022-11-12 | Merge remote-tracking branch 'glitch/main' | Starfall | |
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-11 | Fix trendable status without review (#20214) | Jeong Arm | |
2022-11-11 | Guard against error extracting `body` from URL (#20428) | Emily Strickland | |
If `Nokogiri::HTML(value).at_xpath('//body')` fails to find the `body` element, it will return `nil`. We can guard against that with an early return. Avoids calling `children` on `Nilclass` in those cases. | |||
2022-11-11 | Fix metadata scrubbing removing color profile from images (#20389) | Eugen Rochko | |
2022-11-10 | Remove dead code and refactor status threading code (#20357) | Claire | |
* Remove dead code * Remove unneeded/broken parameters and refactor descendant computation | |||
2022-11-10 | Change verification to only work for https links (#20304) | Eugen Rochko | |
Fix #20242 | |||
2022-11-10 | Remove boost parameters from SQL-only account search | Starfall | |
2022-11-10 | Merge remote-tracking branch 'glitch/main' | Starfall | |
- Remove Helm charts - Lots of conflicts with our removal of recommended settings and custom icons | |||
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 link verification to ignore IDN domains (#20295) | Eugen Rochko | |
Fix #3833 | |||
2022-11-10 | Improve performance by avoiding regex construction (#20215) | James Tucker | |
```ruby 10.times { p /#{FOO}/.object_id } 10.times { p FOO_RE.object_id } ``` | |||
2022-11-10 | Revert filtering public timelines by locale by default (#20294) | Eugen Rochko | |
2022-11-09 | Fix 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-08 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
2022-11-08 | Micro-optimization: use `if`/`else` instead of `Array#compact` and ↵ | Postmodern | |
`Array#min` (#19906) * Technically `if`/`else` is faster than using `[value1, value2].compact.min` to find the lesser of two values, one of which may be `nil`. | |||
2022-11-07 | Fix validation error in SynchronizeFeaturedTagsCollectionWorker (#20018) | Claire | |
* Fix followers count not being updated when migrating follows Fixes #19900 * Fix validation error in SynchronizeFeaturedTagsCollectionWorker Also saves remote user's chosen case for hashtags * Limit remote featured tags before validation | |||
2022-11-07 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
2022-11-07 | Micro-optimization: only split `acct` into two Strings (#19901) | Postmodern | |
* Since `acct` is split by `@` and assigned to `username` and `domain`, we only need to split `acct` into two Strings. | |||
2022-11-07 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
2022-11-07 | Skip Webfinger cache during migrations as well (#19883) | nightpool | |
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-06 | Fix not using GIN index for account search queries (#19830) | Eugen Rochko | |
2022-11-04 | Fix reblogs being discarded after the reblogged status (#19731) | Claire | |
2022-11-04 | Fix featured tags not saving preferred casing (#19732) | Eugen Rochko | |
2022-11-02 | Fix inaccurate admin log entry for re-sending confirmation e-mails (#19674) | Claire | |
Fixes #19593 | |||
2022-11-01 | Add support for AVIF uploads (#19647) | txt-file | |
2022-11-01 | Add support for HEIC uploads (#19618) | Eugen Rochko | |
2022-11-01 | Change post-processing to be deferred only for large media types (#19617) | Eugen Rochko | |
2022-11-01 | Change max. thumbnail dimensions to 640x360px (360p) (#19619) | Eugen Rochko | |
2022-10-31 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
2022-10-30 | Remove language filtering from hashtag timelines (#19563) | 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 | Add reputation and followers score boost to SQL-only account search (#19251) | Eugen Rochko | |
2022-10-30 | Fix account action type validation (#19476) | Eugen Rochko | |
* Fix account action type validation Fix #19143 * Fix #19145 * Fix code style issues | |||
2022-10-30 | Fix not being able to input featured tag with `#` (#19535) | Eugen Rochko | |
2022-10-29 | Fix account migration form ever using outdated account data (#18429) | Eugen Rochko | |
2022-10-28 | Fix domain block export not exporting blocks with only media rejection | Claire | |
2022-10-28 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
2022-10-28 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
2022-10-28 | Change 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-28 | Fix using wrong policy on status-related actions in admin UI (#19490) | Eugen Rochko | |
2022-10-27 | Remove unused method `searchable?` on accounts (#19489) | Eugen Rochko | |
It called the wrong methods, but nothing uses it | |||
2022-10-27 | Fix notifications about deleted reports not being also deleted (#19475) | Eugen Rochko | |
* Fix notifications about deleted reports not being also deleted * Fix notification with empty report crashing web UI Fix #18909 |