8556ddd063
Merge pull request #1681 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
c3725e1e19
Add content_type to status_edits
3 years ago
4ffee8156d
[Glitch] Add edit history to web UI
...
Port 948da1a958
3 years ago
0845bee8d6
Merge branch 'main' into glitch-soc/merge-upstream
...
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.
3 years ago
77fec39bee
Merge pull request #1682 from ClearlyClaire/glitch-soc/fixes/dropdowns-modals
...
Refactor and fix dropdown/action dialog
3 years ago
e689495a81
Please Codeclimate
3 years ago
1af75ba990
Rework actions modal to bring it closer to upstream and fix modal stacking issue
3 years ago
d92bd7c906
Remove unused noModal prop
3 years ago
952342d251
Some more refactoring
3 years ago
f14193d3f4
Refactor dropdown and action modal code slightly
...
Simplify it a bit and make it closer to upstream
3 years ago
f136ee3f43
Add support >= 1.22 ( #17490 )
3 years ago
6732217dd0
Change languages to be listed under standard instead of native name in admin UI ( #17485 )
3 years ago
948da1a958
Add edit history to web UI ( #17390 )
...
* Add edit history to web UI
* Change history reducer to store items per status
* Fix missing loading prop
3 years ago
b0021ca3d5
Fix error in suggestions API due to typo ( #17486 )
...
Regression from #17479
3 years ago
67b4bcb642
Merge pull request #1680 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
bab90c9e1b
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
a44cc7931a
Remove language detection through cld3 ( #17478 )
...
* 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>
3 years ago
1e5989c612
Add global `locale` param ( #17464 )
...
- Remove the session-based locale stickyness
3 years ago
d979087a98
Fix localization of cold-start follow recommendations ( #17479 )
3 years ago
edd7dad3e2
Fix Ruby 2.5 incompatibility ( #17465 )
3 years ago
73a585dd64
Fix structured data parsing from links choking on bad data ( #17403 )
...
* 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
3 years ago
42fdf52f0c
Fix replies collection incorrectly looping ( #17462 )
...
* Refactor tests
* Add tests
* Fix replies collection incorrectly looping
3 years ago
621d92114d
Fix errors when multiple Delete are received for a given actor ( #17460 )
3 years ago
0f43ff7a95
Merge pull request #1679 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
aaace9f1db
Merge branch 'main' into glitch-soc/merge-upstream
...
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.
3 years ago
5d53b3c8a7
Fix instance actor not being dereferenceable ( #17457 )
...
* Add tests
* Fix instance actor not being dereferenceable
* Fix tests
* Fix tests for real
3 years ago
3050472467
Update build-image.yml ( #17454 )
3 years ago
aa5dd344d1
Merge pull request #1678 from ClearlyClaire/glitch-soc/fixes/robust-theme-fallback
...
Make theme-selection fall back to default ones if configured is not found
3 years ago
c94ff7c869
Move glitch-soc-specific theming methods to ThemingConcern
3 years ago
4944068bd0
Make theme-selection fall back to default ones if configured is not found
3 years ago
25d1195a04
Fix error on account relationships page in admin UI ( #17444 )
3 years ago
6f42c1402f
Bump brakeman from 5.2.0 to 5.2.1 ( #17410 )
...
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>
3 years ago
6c36323b05
Bump redis from 4.0.2 to 4.0.3 ( #17412 )
...
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>
3 years ago
97c400de92
Bump sidekiq-scheduler from 3.1.0 to 3.1.1 ( #17407 )
...
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>
3 years ago
ee72920b41
Bump http-link-header from 1.0.3 to 1.0.4 ( #17414 )
...
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>
3 years ago
58db467b01
Update tootsuite/mastodon Docker tag to v3.4.6 ( #17436 )
...
Co-authored-by: Renovate Bot <bot@renovateapp.com>
3 years ago
d4e8594b82
Forward-port version bump to 3.4.6 ( #17434 )
3 years ago
418d45892d
Merge pull request #1676 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
b3190c2cd6
Fix compacted JSON-LD possibly causing compatibility issues on forwarding ( #17428 )
3 years ago
ec8cf0e39b
Fix response_to_recipient? CTE ( #17427 )
3 years ago
b891d09d2f
Compact JSON-LD signed incoming activities ( #17426 )
...
Co-authored-by: Puck Meerburg <puck@puck.moe>
3 years ago
fdf5030d85
Bump version to 3.4.6
3 years ago
eee2c187ee
Fix response_to_recipient? CTE
3 years ago
77cc434f2b
Fix compacted JSON-LD possibly causing compatibility issues on forwarding
3 years ago
9d92e9204f
Compact JSON-LD signed incoming activities
3 years ago
46b9ab8b81
Merge pull request #1675 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
2341754c70
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
a8aba8a526
Update tootsuite/mastodon Docker tag to v3.4.5 ( #17417 )
...
Co-authored-by: Renovate Bot <bot@renovateapp.com>
3 years ago
2657ca3b5e
Fix requiring an extra restart after recent post-deployment migrations ( #17422 )
...
Follow-up to #16409
3 years ago
e96b704def
Fixed prototype pollution bug and only allow trusted origin ( #17420 )
3 years ago
Claire
Eugen Rochko
Takuya Yoshida
potpro
dependabot[bot]
Alexandra Catalina
Puck Meerburg
Rohan Sharma