Commit Graph

15859 Commits (022547fbdf28351a6cf67ef281e372e9eff455b4)

Author SHA1 Message Date
Eugen Rochko 022547fbdf [Glitch] Fix wrong logo on start screen in web UI
Port c8245e64c5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-09 13:23:36 +02:00
Eugen Rochko 52e056cd61 [Glitch] Fix logo on /web/start
Partial port from 43b5d5e38d

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-09 13:12:37 +02:00
Eugen Rochko 9cbb51e897 [Glitch] Add empty message for “Explore” tabs
Port part of 43b5d5e38d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-09 13:11:18 +02:00
Claire 44486db912
Merge pull request #1859 from ClearlyClaire/glitch-soc/features/trends-tab
Port “Explore” tab to glitch-soc
2022-10-09 11:48:06 +02:00
Claire 7ba5905416 Restore ability to discard interactions-based follow suggestions 2022-10-09 11:23:06 +02:00
Claire d4f13b9041 Change “Explore” tab to only provide search when trends are disabled 2022-10-08 20:49:02 +02:00
Eugen Rochko da67e0660a [Glitch] Add pagination for trending statuses in web UI
Port f382192862 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-08 20:49:02 +02:00
Eugen Rochko 9b17b26df4 [Glitch] Fix crash when search fails in web UI
Port 8751c3c495 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-08 20:49:02 +02:00
Eugen Rochko de9700a71a [Glitch] Fix public timelines being inaccessible on one stage of responsive layout in web UI (#17760)
Port fa47c37f13 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-08 20:49:02 +02:00
mayaeh 815bf3753a [Glitch] Change the "Explore" icon from fa-globe to fa-hashtag
Port e38a01c41a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-08 20:49:02 +02:00
mayaeh 2097fd9008 [Glitch] Add menu column of explore to getting-started
Port e52085246f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-08 20:49:02 +02:00
Eugen Rochko 5854540e8c [Glitch, partial] Change appearance of account cards in web UI
Port remaining changes from dba4be1038 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-08 20:49:02 +02:00
Eugen Rochko c1fbef0965 [Glitch] Remove profile directory link from main navigation panel
Port 54d4ece743 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-08 20:49:02 +02:00
Eugen Rochko 6e208a817d [Glitch] Fix not showing loading indicator when searching in web UI
Port cb2e198d89 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-08 20:49:02 +02:00
Eugen Rochko 058b74dc0a [Glitch] Add explore page to web UI
Port d4592bbfcd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-08 20:49:02 +02:00
Eugen Rochko 870f0aae48 [Glitch] Fix pop-out player appearing on mobile screens in web UI
Port 18ca4e0e9a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-08 20:49:02 +02:00
Claire 30f4268f32
[Glitch] Add ability to select all accounts matching search for batch (#1857)
Port SCSS changes from 5b0e8cc92b

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2022-10-08 16:24:35 +02:00
Claire 33b945e373
Merge pull request #1856 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2022-10-08 16:24:18 +02:00
Claire 46224385e2 Merge branch 'main' into glitch-soc/merge-upstream 2022-10-08 15:49:40 +02:00
Claire 2c8d1880cc
Fix /privacy-policy not using the appropriate resource packs (#1853)
Fixes #1852

This was an oversight from last upstream merge, failing to account for
glitch-soc's theming system.
2022-10-07 11:35:31 +02:00
prplecake c19a3517a0
Clarify language RE secondary toot button (#1851) 2022-10-05 14:10:15 +02:00
dependabot[bot] 6580ac7241
Bump stylelint from 14.12.1 to 14.13.0 (#19280)
Bumps [stylelint](https://github.com/stylelint/stylelint) from 14.12.1 to 14.13.0.
- [Release notes](https://github.com/stylelint/stylelint/releases)
- [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/stylelint/stylelint/compare/14.12.1...14.13.0)

---
updated-dependencies:
- dependency-name: stylelint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-04 21:18:59 +09:00
dependabot[bot] 971279efa8
Bump rspec_junit_formatter from 0.5.1 to 0.6.0 (#19286)
Bumps [rspec_junit_formatter](https://github.com/sj26/rspec_junit_formatter) from 0.5.1 to 0.6.0.
- [Release notes](https://github.com/sj26/rspec_junit_formatter/releases)
- [Changelog](https://github.com/sj26/rspec_junit_formatter/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sj26/rspec_junit_formatter/compare/v0.5.1...v0.6.0)

---
updated-dependencies:
- dependency-name: rspec_junit_formatter
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-04 20:57:31 +09:00
dependabot[bot] 33b018648a
Bump postcss from 8.4.16 to 8.4.17 (#19279)
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.16 to 8.4.17.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.16...8.4.17)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-04 20:57:11 +09:00
dependabot[bot] 3093611f09
Bump blurhash from 2.0.0 to 2.0.3 (#19278)
Bumps [blurhash](https://github.com/woltapp/blurhash) from 2.0.0 to 2.0.3.
- [Release notes](https://github.com/woltapp/blurhash/releases)
- [Commits](https://github.com/woltapp/blurhash/commits)

---
updated-dependencies:
- dependency-name: blurhash
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-04 20:56:13 +09:00
dependabot[bot] f0e8e67e47
Bump dotenv from 16.0.2 to 16.0.3 (#19276)
Bumps [dotenv](https://github.com/motdotla/dotenv) from 16.0.2 to 16.0.3.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v16.0.2...v16.0.3)

---
updated-dependencies:
- dependency-name: dotenv
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-04 20:42:26 +09:00
dependabot[bot] deb45b0a44
Bump yargs from 17.5.1 to 17.6.0 (#19284)
Bumps [yargs](https://github.com/yargs/yargs) from 17.5.1 to 17.6.0.
- [Release notes](https://github.com/yargs/yargs/releases)
- [Changelog](https://github.com/yargs/yargs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/yargs/yargs/compare/v17.5.1...v17.6.0)

---
updated-dependencies:
- dependency-name: yargs
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-04 20:35:39 +09:00
dependabot[bot] 988c3a8593
Bump jsdom from 20.0.0 to 20.0.1 (#19277)
Bumps [jsdom](https://github.com/jsdom/jsdom) from 20.0.0 to 20.0.1.
- [Release notes](https://github.com/jsdom/jsdom/releases)
- [Changelog](https://github.com/jsdom/jsdom/blob/master/Changelog.md)
- [Commits](https://github.com/jsdom/jsdom/compare/20.0.0...20.0.1)

---
updated-dependencies:
- dependency-name: jsdom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-04 20:34:21 +09:00
Eugen Rochko 240beed171
New Crowdin updates (#19255)
* New translations en.yml (Thai)

* New translations en.yml (Greek)

* New translations en.yml (Afrikaans)

* New translations en.json (Arabic)

* New translations en.yml (Arabic)

* New translations en.yml (Bulgarian)

* New translations en.json (Catalan)

* New translations en.yml (Catalan)

* New translations en.json (Danish)

* New translations en.yml (Danish)

* New translations en.json (Greek)

* New translations en.json (Frisian)

* New translations en.json (Spanish)

* New translations en.yml (Frisian)

* New translations en.json (Basque)

* New translations en.yml (Basque)

* New translations en.json (Finnish)

* New translations en.yml (Finnish)

* New translations en.json (Irish)

* New translations en.yml (Irish)

* New translations en.yml (Hebrew)

* New translations en.json (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.json (Afrikaans)

* New translations en.yml (French)

* New translations en.json (Hebrew)

* New translations en.json (Czech)

* New translations en.json (Thai)

* New translations en.yml (German)

* New translations en.yml (Czech)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Ido)

* New translations en.json (Bulgarian)

* New translations en.json (Ido)

* New translations en.json (German)

* New translations en.json (Tamil)

* New translations en.json (Esperanto)

* New translations en.yml (Spanish)

* New translations en.json (French)

* New translations en.yml (Turkish)

* New translations en.json (Dutch)

* New translations en.json (Albanian)

* New translations en.yml (Albanian)

* New translations en.yml (Ukrainian)

* New translations en.json (Japanese)

* New translations en.json (Indonesian)

* New translations en.json (Sinhala)

* New translations en.json (Romanian)

* New translations en.yml (Romanian)

* New translations en.json (Armenian)

* New translations en.yml (Armenian)

* New translations en.json (Urdu (Pakistan))

* New translations en.json (Serbian (Cyrillic))

* New translations en.yml (Serbian (Cyrillic))

* New translations en.json (Swedish)

* New translations en.yml (Swedish)

* New translations en.json (Turkish)

* New translations en.json (Ukrainian)

* New translations en.json (Chinese Simplified)

* New translations en.json (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Urdu (Pakistan))

* New translations en.json (Slovenian)

* New translations en.json (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.json (Galician)

* New translations en.yml (Galician)

* New translations en.json (Icelandic)

* New translations en.yml (Icelandic)

* New translations en.json (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Indonesian)

* New translations en.json (Persian)

* New translations en.yml (Slovenian)

* New translations en.yml (Slovak)

* New translations en.json (Italian)

* New translations en.yml (Dutch)

* New translations en.yml (Italian)

* New translations en.yml (Japanese)

* New translations en.json (Georgian)

* New translations en.yml (Georgian)

* New translations en.json (Korean)

* New translations en.yml (Korean)

* New translations en.json (Lithuanian)

* New translations en.yml (Lithuanian)

* New translations en.json (Macedonian)

* New translations en.yml (Macedonian)

* New translations simple_form.en.yml (Dutch)

* New translations en.json (Slovak)

* New translations en.json (Norwegian)

* New translations en.yml (Norwegian)

* New translations en.json (Punjabi)

* New translations en.yml (Punjabi)

* New translations en.json (Polish)

* New translations en.yml (Polish)

* New translations en.json (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.json (Russian)

* New translations en.yml (Russian)

* New translations en.yml (Persian)

* New translations en.yml (Tamil)

* New translations en.yml (Malayalam)

* New translations en.yml (Welsh)

* New translations en.yml (Esperanto)

* New translations en.json (Uyghur)

* New translations en.yml (Uyghur)

* New translations en.json (Chinese Traditional, Hong Kong)

* New translations en.yml (Chinese Traditional, Hong Kong)

* New translations en.json (Tatar)

* New translations en.yml (Tatar)

* New translations en.json (Malayalam)

* New translations en.json (Breton)

* New translations en.yml (English, United Kingdom)

* New translations en.yml (Breton)

* New translations en.yml (Sinhala)

* New translations en.json (Cornish)

* New translations en.yml (Cornish)

* New translations en.json (Kannada)

* New translations en.yml (Kannada)

* New translations en.json (Scottish Gaelic)

* New translations en.yml (Scottish Gaelic)

* New translations en.json (Asturian)

* New translations en.yml (Asturian)

* New translations en.json (Welsh)

* New translations en.json (English, United Kingdom)

* New translations en.json (Spanish, Argentina)

* New translations en.yml (Norwegian Nynorsk)

* New translations en.yml (Spanish, Argentina)

* New translations en.json (Spanish, Mexico)

* New translations en.yml (Spanish, Mexico)

* New translations en.json (Bengali)

* New translations en.yml (Bengali)

* New translations en.json (Marathi)

* New translations en.yml (Marathi)

* New translations en.json (Croatian)

* New translations en.yml (Croatian)

* New translations en.json (Norwegian Nynorsk)

* New translations en.json (Kazakh)

* New translations en.yml (Telugu)

* New translations en.yml (Kazakh)

* New translations en.json (Estonian)

* New translations en.yml (Estonian)

* New translations en.json (Latvian)

* New translations en.yml (Latvian)

* New translations en.json (Hindi)

* New translations en.yml (Hindi)

* New translations en.json (Malay)

* New translations en.yml (Malay)

* New translations en.json (Telugu)

* New translations en.json (Occitan)

* New translations en.yml (Occitan)

* New translations en.json (Sanskrit)

* New translations en.json (Standard Moroccan Tamazight)

* New translations en.yml (Silesian)

* New translations en.json (Silesian)

* New translations en.yml (Taigi)

* New translations en.json (Taigi)

* New translations en.yml (Kabyle)

* New translations en.json (Kabyle)

* New translations en.yml (Sanskrit)

* New translations en.yml (Sardinian)

* New translations en.json (Serbian (Latin))

* New translations en.json (Sardinian)

* New translations en.yml (Corsican)

* New translations en.json (Corsican)

* New translations en.yml (Sorani (Kurdish))

* New translations en.json (Sorani (Kurdish))

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.json (Kurmanji (Kurdish))

* New translations en.yml (Serbian (Latin))

* New translations en.yml (Standard Moroccan Tamazight)

* New translations en.json (Dutch)

* New translations en.json (Japanese)

* New translations en.json (Catalan)

* New translations en.json (Italian)

* New translations en.json (Korean)

* New translations en.yml (Dutch)

* New translations en.json (Slovenian)

* New translations en.json (Ukrainian)

* New translations en.json (Icelandic)

* New translations activerecord.en.yml (Dutch)

* New translations en.json (German)

* New translations en.json (Dutch)

* New translations en.json (Japanese)

* New translations en.yml (Dutch)

* New translations simple_form.en.yml (Dutch)

* New translations en.json (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations activerecord.en.yml (Dutch)

* New translations simple_form.en.yml (Vietnamese)

* New translations en.yml (German)

* New translations en.yml (Vietnamese)

* New translations en.json (Spanish, Argentina)

* New translations en.json (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Vietnamese)

* New translations en.json (Czech)

* New translations simple_form.en.yml (Czech)

* New translations en.json (Latvian)

* New translations en.yml (Asturian)

* New translations en.json (Chinese Simplified)

* New translations en.json (Ido)

* New translations en.json (Chinese Traditional)

* New translations en.json (Danish)

* New translations en.json (Galician)

* New translations en.json (Turkish)

* New translations en.json (Albanian)

* New translations en.json (Italian)

* New translations en.json (Russian)

* New translations en.json (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.json (Spanish)

* New translations en.yml (Thai)

* New translations en.json (Thai)

* New translations en.json (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.json (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.json (Polish)

* New translations en.yml (Polish)

* Run `yarn manage:translations`

* Run `bundle exec i18n-tasks normalize`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-10-04 16:42:40 +09:00
dependabot[bot] 4f129dc763
Bump @babel/plugin-proposal-decorators from 7.19.1 to 7.19.3 (#19283)
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators) from 7.19.1 to 7.19.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.19.3/packages/babel-plugin-proposal-decorators)

---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-04 16:34:01 +09:00
dependabot[bot] 89ca8a2d8a
Bump @babel/preset-env from 7.19.1 to 7.19.3 (#19281)
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.19.1 to 7.19.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.19.3/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-04 16:17:09 +09:00
dependabot[bot] 29cb5577f3
Bump @babel/core from 7.19.1 to 7.19.3 (#19274)
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.19.1 to 7.19.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.19.3/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-04 16:16:11 +09:00
Yamagishi Kazutoshi fc3d248df7
Fix missing await (#19273) 2022-10-03 23:08:38 +02:00
Yamagishi Kazutoshi 216dbaedaf
Disable push notification when not logged in (#19272) 2022-10-03 18:15:47 +02:00
Claire 22af8f7563 Fix clicking bookmark column header not scrolling to top in single-column 2022-10-03 09:54:24 +02:00
Claire b76cef6212 Fix clicking List timeline header not scrolling to top in single-column 2022-10-03 09:54:24 +02:00
Claire 2aafdd0efb
Merge pull request #1848 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2022-10-03 09:03:11 +02:00
Claire 37eaa7fc01
Fix “Change subscribed languages” crashing in some situations (#19268) 2022-10-03 02:56:12 +02:00
Claire 6ee768b7b2 Fix “Change subscribed languages” crashing in some situations 2022-10-02 19:48:24 +02:00
Eugen Rochko f416e36f0f [Glitch] Add ability to filter followed accounts' posts by language
Port 50948b46aa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-02 19:36:29 +02:00
Eugen Rochko d25de7f01e [Glitch] Change path of privacy policy page
Port 36f4c32a38 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-02 19:36:29 +02:00
Claire e18ba67727 [Glitch] Add privacy icons to report modal
Port d2f7e30a28 to glitch-soc
2022-10-02 19:36:29 +02:00
Claire e7ab476db2 Revert server-side part of "Add logged-out access to the web UI" 2022-10-02 19:36:28 +02:00
Claire bfc539cfb4 Revert "Change "Allow trends without prior review" setting to include statuses (#17977)"
This reverts commit 546672e292.
2022-10-02 18:46:28 +02:00
Claire 4500504ec2 Revert "Change search API to be accessible without being logged in (#18963)"
This reverts commit c57907737a.
2022-10-02 18:46:28 +02:00
Claire 221580a3af Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/home_controller.rb`:
  Upstream made it so `/web` is available to non-logged-in users
  and `/` redirects to `/web` instead of `/about`.
  Kept our version since glitch-soc's WebUI doesn't have what's
  needed yet and I think /about is still a much better landing
  page anyway.
- `app/models/form/admin_settings.rb`:
  Upstream added new settings, and glitch-soc had an extra setting.
  Not really a conflict.
  Added upstream's new settings.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a new `server` initial state object.
  Not really a conflict.
  Merged upstream's changes.
- `app/views/admin/settings/edit.html.haml`:
  Upstream added new settings.
  Not really a conflict.
  Merged upstream's changes.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
  Upstream refactored that part and removed the file.
  Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb`
- `config/settings.yml`:
  Upstream added new settings.
  Not a real conflict.
  Added upstream's new settings.
2022-10-02 18:46:22 +02:00
Eugen Rochko c55219efa8
Remove volume number from hashtags in web UI (#19253) 2022-09-30 01:14:37 +02:00
Yamagishi Kazutoshi 5cf056fdb0
Install python3 when building with Docker (#18072) 2022-09-29 16:36:14 +02:00
Eugen Rochko cf5d27c3b7
New Crowdin updates (#19252)
* New translations en.yml (Thai)

* New translations en.yml (Greek)

* New translations en.yml (Afrikaans)

* New translations en.json (Arabic)

* New translations en.yml (Arabic)

* New translations en.yml (Bulgarian)

* New translations en.yml (Catalan)

* New translations en.json (Danish)

* New translations en.yml (Danish)

* New translations en.json (Greek)

* New translations en.json (Frisian)

* New translations en.yml (Frisian)

* New translations en.json (Basque)

* New translations en.yml (Basque)

* New translations en.json (Finnish)

* New translations en.yml (Finnish)

* New translations en.json (Irish)

* New translations en.yml (Irish)

* New translations en.yml (Hebrew)

* New translations en.yml (Hungarian)

* New translations en.json (Afrikaans)

* New translations en.yml (French)

* New translations en.json (Hebrew)

* New translations en.json (Czech)

* New translations en.json (Thai)

* New translations en.yml (German)

* New translations en.yml (Czech)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Ido)

* New translations en.json (Bulgarian)

* New translations en.json (Tamil)

* New translations en.json (Esperanto)

* New translations en.yml (Spanish)

* New translations en.json (French)

* New translations en.yml (Turkish)

* New translations en.json (Dutch)

* New translations en.yml (Albanian)

* New translations en.yml (Ukrainian)

* New translations en.json (Japanese)

* New translations en.json (Indonesian)

* New translations en.json (Sinhala)

* New translations en.json (Romanian)

* New translations en.yml (Romanian)

* New translations en.json (Armenian)

* New translations en.yml (Armenian)

* New translations en.yml (Urdu (Pakistan))

* New translations en.yml (Serbian (Cyrillic))

* New translations en.json (Swedish)

* New translations en.yml (Swedish)

* New translations en.yml (Chinese Traditional)

* New translations en.json (Urdu (Pakistan))

* New translations en.yml (Slovenian)

* New translations en.yml (Vietnamese)

* New translations en.json (Galician)

* New translations en.yml (Galician)

* New translations en.yml (Icelandic)

* New translations en.json (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Indonesian)

* New translations en.json (Persian)

* New translations en.yml (Persian)

* New translations en.json (Serbian (Cyrillic))

* New translations en.yml (Dutch)

* New translations en.yml (Italian)

* New translations en.yml (Japanese)

* New translations en.json (Georgian)

* New translations en.yml (Georgian)

* New translations en.yml (Korean)

* New translations en.json (Lithuanian)

* New translations en.yml (Lithuanian)

* New translations en.json (Macedonian)

* New translations en.yml (Macedonian)

* New translations en.json (Norwegian)

* New translations en.yml (Slovak)

* New translations en.yml (Norwegian)

* New translations en.json (Punjabi)

* New translations en.yml (Punjabi)

* New translations en.yml (Polish)

* New translations en.yml (Portuguese)

* New translations en.yml (Russian)

* New translations en.json (Slovak)

* New translations en.yml (Tamil)

* New translations en.json (Breton)

* New translations en.yml (Esperanto)

* New translations en.json (Uyghur)

* New translations en.yml (Uyghur)

* New translations en.json (Chinese Traditional, Hong Kong)

* New translations en.yml (Chinese Traditional, Hong Kong)

* New translations en.json (Tatar)

* New translations en.yml (Tatar)

* New translations en.json (Malayalam)

* New translations en.yml (Malayalam)

* New translations en.yml (Breton)

* New translations en.json (Welsh)

* New translations en.yml (Sinhala)

* New translations en.json (Cornish)

* New translations en.yml (Cornish)

* New translations en.json (Kannada)

* New translations en.yml (Kannada)

* New translations en.json (Scottish Gaelic)

* New translations en.yml (Scottish Gaelic)

* New translations en.json (Asturian)

* New translations en.yml (Asturian)

* New translations en.json (Occitan)

* New translations en.yml (Welsh)

* New translations en.yml (English, United Kingdom)

* New translations en.yml (Spanish, Argentina)

* New translations en.json (Kazakh)

* New translations en.json (Spanish, Mexico)

* New translations en.yml (Spanish, Mexico)

* New translations en.json (Bengali)

* New translations en.yml (Bengali)

* New translations en.json (Marathi)

* New translations en.yml (Marathi)

* New translations en.json (Croatian)

* New translations en.yml (Croatian)

* New translations en.json (Norwegian Nynorsk)

* New translations en.yml (Norwegian Nynorsk)

* New translations en.yml (Kazakh)

* New translations en.json (English, United Kingdom)

* New translations en.json (Estonian)

* New translations en.yml (Estonian)

* New translations en.yml (Latvian)

* New translations en.json (Hindi)

* New translations en.yml (Hindi)

* New translations en.json (Malay)

* New translations en.yml (Malay)

* New translations en.json (Telugu)

* New translations en.yml (Telugu)

* New translations en.yml (Occitan)

* New translations en.json (Serbian (Latin))

* New translations en.json (Sardinian)

* New translations en.yml (Kabyle)

* New translations en.json (Kabyle)

* New translations en.yml (Sanskrit)

* New translations en.yml (Serbian (Latin))

* New translations en.yml (Sardinian)

* New translations en.json (Sanskrit)

* New translations en.yml (Corsican)

* New translations en.json (Corsican)

* New translations en.yml (Sorani (Kurdish))

* New translations en.json (Sorani (Kurdish))

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.json (Taigi)

* New translations en.yml (Taigi)

* New translations en.json (Silesian)

* New translations en.yml (Silesian)

* New translations en.json (Standard Moroccan Tamazight)

* New translations en.yml (Standard Moroccan Tamazight)

* New translations en.yml (Ido)

* New translations en.yml (Ukrainian)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Catalan)

* New translations en.yml (Greek)

* New translations en.yml (Korean)

* New translations en.json (Galician)

* New translations en.yml (Galician)

* New translations en.yml (Italian)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Albanian)

* New translations en.yml (Russian)

* New translations en.yml (Slovenian)

* New translations en.yml (Polish)

* New translations en.yml (Vietnamese)

* New translations en.yml (Icelandic)

* New translations en.yml (Latvian)

* New translations en.yml (Czech)

* New translations simple_form.en.yml (Czech)

* New translations activerecord.en.yml (Czech)

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.yml (Turkish)

* New translations en.yml (Danish)

* New translations en.yml (Japanese)

* Run `yarn manage:translations`

* Run `bundle exec i18n-tasks normalize`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-09-29 23:27:50 +09:00
Eugen Rochko c8245e64c5
Fix wrong logo on start screen in web UI (#19254) 2022-09-29 08:55:14 +02:00