Age | Commit message (Collapse) | Author |
|
Port SCSS changes from 8b69a66380bbe32127e717ca2d79244392b7d2b6 to glitch-soc
|
|
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
No real conflict, upstream changes too close to glitch-specific
theming system changes.
- config/navigation.rb
Upstream redesigned the settings navigation, took those changes
and re-inserted the flavours menu.
|
|
|
|
* Change the groupings of menu items in settings navigation
Fix #10307
* Remove unused translations
|
|
|
|
Fix sorting of the pending accounts page
|
|
|
|
The translation was written in bad Turkish grammar. I fixed those terrible phrases and translated %93 of Mastodon.
I'll come back and finish the translation.
|
|
* Add spec of PollValidator for #10190
* Raise fraction less than 1 second
* format
* simplify time initialize
|
|
* Add "why do you want to join" field to invite requests
Fix #10512
* Remove unused translations
* Fix broken registrations when no invite request text is submitted
|
|
Bumps [hamlit-rails](https://github.com/mfung/hamlit-rails) from 0.2.2 to 0.2.3.
- [Release notes](https://github.com/mfung/hamlit-rails/releases)
- [Commits](https://github.com/mfung/hamlit-rails/compare/v0.2.2...v0.2.3)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.2...v1.4.3)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
|
|
|
|
(#10517)
|
|
* [i18n] Update and correction
* Update oc.json
* Update oc.json
|
|
|
|
* i18n: Update Corsican translations
* i18n: Update Corsican translations
|
|
|
|
Merge upstream changes
|
|
|
|
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)
|
|
|
|
|
|
|
|
* Add `tootctl accounts reset`
* Rename reset to reset-relationships
* Improve command description
|
|
* Refactor imports
* Export show_reblogs when exporting list of followed users
* Add support for importing show_reblogs with following collection
* Fix tests
|
|
|
|
* updated "Invalid email or password" french translation
* Updated FR translations ("instance" in now "serveur")
|
|
* Update Japanese translations
* Update Japanese translations.
|
|
* Update Corsican translation
* Fix brackets typo
|
|
* 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
|
|
30 per 30 minutes, like media uploads
|
|
|
|
|
|
|
|
* Fix admin validation being too strict about usernames
Fix #10446
* Strip Setting.site_contact_username consistently throughout the codebase
|
|
* Further improving Slovak translation
* Update sk.json
|
|
* unrequired argument
* unrequired argument
|
|
|
|
Fix #10441
|
|
|
|
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.66.0 to 0.67.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.66.0...v0.67.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
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
|
|
* List the actual accounts that would have been culled during a dry run.
Otherwise, the dry run mode is basically useless.
* Prevent unreachable domains from inheriting the previous status code.
* Update CHANGELOG.md for #10460.
|