Age | Commit message (Collapse) | Author |
|
|
|
Merge upstream changes
|
|
Port daab45d4ae000a208f251ce96334df47d894dba3 to glitch-soc
|
|
Conflicts:
- app/controllers/following_accounts_controller.rb
Conflicts were due to glitch-soc's theming system.
- app/javascript/packs/public.js
Some code has been change upstream, but it has been
moved to app/javascript/core/settings.js in glitch-soc.
Applied the changes there.
|
|
* Updated Catalan strings
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* bundle exec i18n-tasks
* Update ca.json
* Update simple_form.ca.yml
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
|
|
|
|
|
|
|
|
* Export hide_notifications along with user mutes
* Import hide_notifications along with muted users list
* Add headers for CSV exports
|
|
|
|
Fix #10448 (hopefully)
|
|
* Esperanto translations
* Translate untranslated Esperanto strings
* Normalize eo translation
|
|
|
|
* Updated Catalan strings
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* bundle exec i18n-tasks
* Update ca.json
* Update simple_form.ca.yml
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
|
|
|
|
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.28 to 0.9.29.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.28...v0.9.29)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.16.0 to 3.16.1.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.16.0...3.16.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Merge upstream changes
|
|
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
|
|
|
|
* Revert "Add indication that you have been blocked in web UI (#10420)"
This reverts commit bd02ec6daa974dcd3231e73826a56e08dbeedadc.
* Revert "Add `blocked_by` relationship to the REST API (#10373)"
This reverts commit 9745de883b198375ba23f7fde879f6d75ce2df0f.
* Hide blocking accounts from search results
* Filter blocking accouts from account followers
* Filter blocking accouts from account's following accounts
* Filter blocking accounts from “reblogged by” and “favourited by” lists
* Remove blocking account from URL search
* Return 410 on trying to fetch user data from a user who blocked us
* Return 410 in /api/v1/account/statuses for suspended or blocking accounts
* Fix status filtering when performing URL search
* Restore some React improvements
Restore some cleanup from bd02ec6daa974dcd3231e73826a56e08dbeedadc
* Refactor by adding `without_blocking` scope
|
|
|
|
|
|
* Check if image value is nil? before creating an image
Check if uploaded images aren't nil before creating SiteUpload models
for them.
* Validate presence of file in SiteUpload
* Fix file presence validation
* Fabricate SiteUpload#file
* Add link to Creative Commons license
|
|
* Update Japanese translations.
run yarn manage:translations && i18n-tasks add-missing
* Update Japanese translations.
* Fix mistake
* Change to be concise.
|
|
Fixes #10429
|
|
These will allow these images to be uploaded again on the admin settings
page.
|
|
Merge upstream changes
|
|
|
|
and profile
Port 79227d153b86144e9a8cc73f1d4045973eabc9ef to glitch-soc
|
|
|
|
Port 379c3e237fd271b91073f4b4a4a1626e84a7250f to glitch-soc, but changing
the 5 limit to 10, since that's what we had previously
|
|
|
|
|
|
|
|
Update AUTHORS.md
Update CHANGELOG.md
|
|
* Add ActivityPub representation for identity proofs
* Add tests
|
|
(#10413)
Fix #10315
This reverts commit db06b25376ac7e844e86fb9890fa9f1c2edd2d60.
|
|
profile (#10422)
|
|
The search API now supports returning more results and pagination,
but until the web UI implements pagination, it makes no sense to
dump so many results at once. This fix restores the behaviour
before the API change
|
|
|
|
|
|
* Fix Korean translation
* Add missing translation
|
|
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.15.0 to 3.16.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.15.0...3.16.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
* Update Corsican translation
* Update Corsican YML
* Corsican JSON fix
* Update co.yml
|
|
|
|
Port JS from 69141dca26f8a28d3aff63387b1c8d2bba7fdfa3 to glitch-soc
|
|
|
|
Port 58667072d9923b17c90543550294aa9f801103d7 to glitch-soc
|
|
|