ThibG
fc2f7ee871
Merge pull request #983 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Thibaut Girka
63837a4b78
Fix pending accounts management
6 years ago
ashleyhull-versent
ac071d65de
[Glitch] Duplicate values
...
Port bd365cc38b
to glitch-soc
6 years ago
Eugen Rochko
df42de68e5
[Glitch] Port SCSS changes from "Improve blocked view of profiles"
...
Port public pages SCSS changes from 67b3b62b98
6 years ago
Thibaut Girka
f5f6d23d55
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/pl.yml
Conflict caused by new upstream string too close to glitch-specific
“flavour” string. Took both strings.
6 years ago
koyu
3f036ac6b8
Updated German locales ( #10505 )
...
* Updated German locales
* Added account approval locales (German)
* Updated JSON locales (German)
6 years ago
Alix Rossi
6e111152e0
i18n: Update Corsican translations ( #10504 )
6 years ago
Aditoo17
ae58bbd705
i18n: Update Czech translation ( #10506 )
6 years ago
Takeshi Umeda
a4d5e15327
Fix config serializer regex ( #10487 )
6 years ago
Takeshi Umeda
08ba69b538
Add `tootctl accounts reset-relationships` ( #10483 )
...
* Add `tootctl accounts reset`
* Rename reset to reset-relationships
* Improve command description
6 years ago
ThibG
cb71c95e22
Export and import show_reblogs together with following list ( #10495 )
...
* Refactor imports
* Export show_reblogs when exporting list of followed users
* Add support for importing show_reblogs with following collection
* Fix tests
6 years ago
Jeong Arm
619bbc23ef
Translate Korean ( #10499 )
6 years ago
Hugo "Slaynash" Flores
38b8a5c5b2
Updated french translations ( #10498 )
...
* updated "Invalid email or password" french translation
* Updated FR translations ("instance" in now "serveur")
6 years ago
mayaeh
a265696991
i18n: Update Japanese translations ( #10494 )
...
* Update Japanese translations
* Update Japanese translations.
6 years ago
Alix Rossi
3563ce34e7
i18n: Update Corsican translations ( #10496 )
...
* Update Corsican translation
* Fix brackets typo
6 years ago
Eugen Rochko
67b3b62b98
Improve blocked view of profiles ( #10491 )
...
* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447 )"
This reverts commit 120544067f
.
* Revert "Hide blocking accounts from blocked users (#10442 )"
This reverts commit 62bafa20a1
.
* 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
6 years ago
Eugen Rochko
0e8819f0e8
Add rate limit for media proxy requests ( #10490 )
...
30 per 30 minutes, like media uploads
6 years ago
Aditoo17
6a0cd366ef
I18n: Update Czech translation ( #10489 )
6 years ago
koyu
b703899773
Updated German locales ( #10488 )
6 years ago
Eugen Rochko
e1d0390e29
Add batch actions for approving and rejecting pending accounts ( #10469 )
6 years ago
Eugen Rochko
2c63e0292a
Fix admin validation being too strict about usernames ( #10449 )
...
* Fix admin validation being too strict about usernames
Fix #10446
* Strip Setting.site_contact_username consistently throughout the codebase
6 years ago
Marek Ľach
78a8a99b0b
Improve sk translation further ( #10484 )
...
* Further improving Slovak translation
* Update sk.json
6 years ago
ashleyhull-versent
2b68fe5442
tinyfix 2: unrequired arguments ( #10471 )
...
* unrequired argument
* unrequired argument
6 years ago
Eugen Rochko
20d301c383
Fix missing long description on `tootctl statuses remove` ( #10482 )
6 years ago
Eugen Rochko
6689e572f3
Add `tootctl emoji purge` ( #10481 )
...
Fix #10441
6 years ago
Eugen Rochko
e007c7a99b
Add `tootctl accounts approve` ( #10480 )
6 years ago
dependabot[bot]
fb8557e652
Bump rubocop from 0.66.0 to 0.67.1 ( #10475 )
...
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>
6 years ago
marcin mikołajczak
4be7952892
i18n: Update Polish translation ( #10479 )
...
Signed-off-by: Marcin Mikołajczak <m4sk1n@m4sk1n.nazwa.pl>
6 years ago
Marek Ľach
e0137c5884
Updates the Slovak translation ( #10477 )
...
* Update sk.json
* Update sk.json
* Update sk.json
6 years ago
jeroenpraat
48a52c9372
Dutch (nl) translation ( #10474 )
...
* Translation Dutch
* Update activerecord.nl.yml
* Update devise.nl.yml
* Update nl.yml
* Update nl.yml
* Update devise.nl.yml
* Update nl.yml
6 years ago
Ben Lubar
e6814a332c
Fix `tootctl accounts cull` ( #10460 )
...
* 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 .
6 years ago
ashleyhull-versent
bd365cc38b
Duplicate values ( #10470 )
6 years ago
ThibG
30500dff7c
Merge pull request #981 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
ThibG
be6885eb93
[Glitch] Update poll remaining time just like with status timestamps
...
Port daab45d4ae
to glitch-soc
6 years ago
Thibaut Girka
1682ac5717
Merge branch 'master' into glitch-soc/merge-upstream
...
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.
6 years ago
spla
26bd9fa508
i18n: update Catalan translation ( #10458 )
...
* 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
6 years ago
Jeong Arm
caa2814d40
Translate Korean (devise) ( #10464 )
6 years ago
ThibG
cc6e3c3900
Cache featured collections, as well as outbox, followers and following ( #10467 )
6 years ago
Thibaut Girka
14bad3f472
Do not handle clicks in detailed status content
6 years ago
ThibG
d4882aa64a
Export and import `hide_notifications` alongside user mutes ( #10335 )
...
* Export hide_notifications along with user mutes
* Import hide_notifications along with muted users list
* Add headers for CSV exports
6 years ago
ThibG
daab45d4ae
Update poll remaining time just like with status timestamps ( #10466 )
6 years ago
ThibG
d07b0c038f
Hopefully fix input text selection quirks on iOS ( #10463 )
...
Fix #10448 (hopefully)
6 years ago
Jeong Arm
f984f2ea4e
Esperanto translations ( #10461 )
...
* Esperanto translations
* Translate untranslated Esperanto strings
* Normalize eo translation
6 years ago
Renato "Lond" Cerqueira
83190fffc7
Re-dd PT-br translations ( #10459 )
6 years ago
spla
3f75b0929e
i18n: update catalan translations ( #10455 )
...
* 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
6 years ago
Aditoo17
0705e4b177
I18n: Improve Czech translation ( #10454 )
6 years ago
dependabot[bot]
f86b2d8edb
Bump i18n-tasks from 0.9.28 to 0.9.29 ( #10451 )
...
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>
6 years ago
dependabot[bot]
6024964b1e
Bump capybara from 3.16.0 to 3.16.1 ( #10450 )
...
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>
6 years ago
ThibG
3f5acc1ab3
Merge pull request #978 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Thibaut Girka
12dae9d583
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
6 years ago