Age | Commit message (Collapse) | Author |
|
Port bd365cc38bbdcfe69f333525d37f44bbbaf1d62c to glitch-soc
|
|
Port public pages SCSS changes from 67b3b62b98b89f24097a2757e42bc94f1bce123c
|
|
Conflicts:
- config/locales/pl.yml
Conflict caused by new upstream string too close to glitch-specific
“flavour” string. Took both strings.
|
|
* Updated German locales
* Added account approval locales (German)
* Updated JSON locales (German)
|
|
|
|
|
|
|
|
* Update Japanese translations
* Update Japanese translations.
|
|
* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447)"
This reverts commit 120544067fcca4bf6e71ba1ffb276c451c17c656.
* Revert "Hide blocking accounts from blocked users (#10442)"
This reverts commit 62bafa20a112ccdddaedb25723fc819dbbcd8e9a.
* Improve blocked view of profiles
- Change "You are blocked" to "Profile unavailable"
- Hide following/followers in API when blocked
- Disable follow button and show "Profile unavailable" on public profile as well
|
|
* Further improving Slovak translation
* Update sk.json
|
|
* unrequired argument
* unrequired argument
|
|
Signed-off-by: Marcin Mikołajczak <m4sk1n@m4sk1n.nazwa.pl>
|
|
* Update sk.json
* Update sk.json
* Update sk.json
|
|
* Translation Dutch
* Update activerecord.nl.yml
* Update devise.nl.yml
* Update nl.yml
* Update nl.yml
* Update devise.nl.yml
* Update nl.yml
|
|
|
|
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
|
|
|
|
|
|
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
|
|
|
|
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
|
|
* Update Japanese translations.
run yarn manage:translations && i18n-tasks add-missing
* Update Japanese translations.
* Fix mistake
* Change to be concise.
|
|
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
|
|
|
|
|
|
(#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
|
|
* Update Corsican translation
* Update Corsican YML
* Corsican JSON fix
* Update co.yml
|
|
|
|
Port JS from 69141dca26f8a28d3aff63387b1c8d2bba7fdfa3 to glitch-soc
|
|
|
|
Port 58667072d9923b17c90543550294aa9f801103d7 to glitch-soc
|
|
|
|
|
|
|
|
Port 73f5711fb8a6131f5906903dcea40a113a842669 to glitch-soc
|
|
doesn't move
Port a91acf79b53307ada584f449da1369c0216a24d1 to glitch-soc
|
|
Port 6f6abc369f113b174fe191cf562098fe01c2eeec to glitch-soc
|