about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2022-02-09Merge pull request #1681 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2022-02-09Add content_type to status_editsClaire
2022-02-09[Glitch] Add edit history to web UIEugen Rochko
Port fd3a45e3482e86dad3c1dfc069144864c4ff0b0b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-09Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream renamed some helper functions that were used in a part of the settings page which glitch-soc slightly changed the layout of. Ported the change.
2022-02-09Merge pull request #1682 from ClearlyClaire/glitch-soc/fixes/dropdowns-modalsClaire
Refactor and fix dropdown/action dialog
2022-02-09Please CodeclimateClaire
2022-02-09Rework actions modal to bring it closer to upstream and fix modal stacking issueClaire
2022-02-09Remove unused noModal propClaire
2022-02-09Some more refactoringClaire
2022-02-09Refactor dropdown and action modal code slightlyClaire
Simplify it a bit and make it closer to upstream
2022-02-09Change languages to be listed under standard instead of native name in admin ↵Eugen Rochko
UI (#17485)
2022-02-09Add edit history to web UI (#17390)Eugen Rochko
* Add edit history to web UI * Change history reducer to store items per status * Fix missing loading prop
2022-02-08Fix error in suggestions API due to typo (#17486)Eugen Rochko
Regression from #17479
2022-02-08Merge pull request #1680 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2022-02-08Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-02-08Remove language detection through cld3 (#17478)Eugen Rochko
* Remove language detection through cld3 * Update app/helpers/languages_helper.rb Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-02-08Add global `locale` param (#17464)Eugen Rochko
- Remove the session-based locale stickyness
2022-02-08Fix localization of cold-start follow recommendations (#17479)Eugen Rochko
2022-02-07Fix Ruby 2.5 incompatibility (#17465)Claire
2022-02-07Fix structured data parsing from links choking on bad data (#17403)Eugen Rochko
* Fix structured data parsing from links choking on bad data - Fix og:url meta tag being prioritized over canonical link tag - Fix structured data parsing choking on commented-out CDATA declarations - Fix HTML entities in title, description, provider_name, author_name - Change structured data parsing to attempt every JSON-LD script tag * Remove unnecessary slash escapes from CDATA regex pattern
2022-02-07Fix replies collection incorrectly looping (#17462)Claire
* Refactor tests * Add tests * Fix replies collection incorrectly looping
2022-02-07Fix errors when multiple Delete are received for a given actor (#17460)Claire
2022-02-06Merge pull request #1679 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2022-02-06Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `CHANGELOG.md`: Upstream added newlines. Conflicts are because the CHANGELOG was independently merged from 3.4.6 on last security update. Took upstream's version. - `app/helpers/context_helper.rb`: Conflicts because of extra vocabulary in glitch-soc. The conflicts were actually handled in last security merge. Kept our version.
2022-02-06Fix instance actor not being dereferenceable (#17457)Claire
* Add tests * Fix instance actor not being dereferenceable * Fix tests * Fix tests for real
2022-02-05Update build-image.yml (#17454)potpro
2022-02-05Merge pull request #1678 from ↵Claire
ClearlyClaire/glitch-soc/fixes/robust-theme-fallback Make theme-selection fall back to default ones if configured is not found
2022-02-05Move glitch-soc-specific theming methods to ThemingConcernClaire
2022-02-05Make theme-selection fall back to default ones if configured is not foundClaire
2022-02-05Fix error on account relationships page in admin UI (#17444)Eugen Rochko
2022-02-05Bump brakeman from 5.2.0 to 5.2.1 (#17410)dependabot[bot]
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 5.2.0 to 5.2.1. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v5.2.0...v5.2.1) --- updated-dependencies: - dependency-name: brakeman dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-05Bump redis from 4.0.2 to 4.0.3 (#17412)dependabot[bot]
Bumps [redis](https://github.com/redis/node-redis) from 4.0.2 to 4.0.3. - [Release notes](https://github.com/redis/node-redis/releases) - [Changelog](https://github.com/redis/node-redis/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/node-redis/compare/redis@4.0.2...redis@4.0.3) --- updated-dependencies: - dependency-name: redis dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-05Bump sidekiq-scheduler from 3.1.0 to 3.1.1 (#17407)dependabot[bot]
Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases) - [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v3.1.0...v3.1.1) --- updated-dependencies: - dependency-name: sidekiq-scheduler dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-05Bump http-link-header from 1.0.3 to 1.0.4 (#17414)dependabot[bot]
Bumps [http-link-header](https://github.com/jhermsmeier/node-http-link-header) from 1.0.3 to 1.0.4. - [Release notes](https://github.com/jhermsmeier/node-http-link-header/releases) - [Changelog](https://github.com/jhermsmeier/node-http-link-header/blob/master/CHANGELOG.md) - [Commits](https://github.com/jhermsmeier/node-http-link-header/compare/v1.0.3...v1.0.4) --- updated-dependencies: - dependency-name: http-link-header dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-03Update tootsuite/mastodon Docker tag to v3.4.6 (#17436)Alexandra Catalina
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2022-02-03Forward-port version bump to 3.4.6 (#17434)Eugen Rochko
2022-02-03Merge pull request #1676 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2022-02-03Fix compacted JSON-LD possibly causing compatibility issues on forwarding ↵Claire
(#17428)
2022-02-03Fix response_to_recipient? CTE (#17427)Claire
2022-02-03Compact JSON-LD signed incoming activities (#17426)Claire
Co-authored-by: Puck Meerburg <puck@puck.moe>
2022-02-03Bump version to 3.4.6Claire
2022-02-02Fix response_to_recipient? CTEClaire
2022-02-02Fix compacted JSON-LD possibly causing compatibility issues on forwardingClaire
2022-02-02Compact JSON-LD signed incoming activitiesPuck Meerburg
2022-02-01Merge pull request #1675 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2022-02-01Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-02-01Update tootsuite/mastodon Docker tag to v3.4.5 (#17417)Alexandra Catalina
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2022-02-01Fix requiring an extra restart after recent post-deployment migrations (#17422)Claire
Follow-up to #16409
2022-02-01Fixed prototype pollution bug and only allow trusted origin (#17420)Rohan Sharma
2022-01-31Bump version to 3.4.5 (#17402)Claire
generated by cgit-pink (git 2.37.1) at 2024-11-29 17:45:52 +0000