mirror/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon synced 2024-12-22 18:48:14 +09:00
Code
8,014 Commits 132 Branches 269 Tags 1.9 GiB
aa509a3d8a
Commit Graph

8014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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>
 2019-04-06 11:41:19 +09:00
marcin mikołajczak
4be7952892 i18n: Update Polish translation (#10479) 
Signed-off-by: Marcin Mikołajczak <m4sk1n@m4sk1n.nazwa.pl>
 2019-04-06 02:51:13 +09:00
Marek Ľach
e0137c5884 Updates the Slovak translation (#10477) 
* Update sk.json

* Update sk.json

* Update sk.json
 2019-04-05 22:16:28 +09:00
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
 2019-04-05 06:12:08 +09:00
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.
 2019-04-04 16:46:27 +02:00
ashleyhull-versent
bd365cc38b Duplicate values (#10470) 2019-04-04 23:22:55 +09:00
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
 2019-04-04 10:25:20 +09:00
Jeong Arm
caa2814d40 Translate Korean (devise) (#10464) 2019-04-04 01:31:08 +02:00
ThibG
cc6e3c3900 Cache featured collections, as well as outbox, followers and following (#10467) 2019-04-04 01:30:44 +02:00
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
 2019-04-03 18:17:43 +02:00
ThibG
daab45d4ae Update poll remaining time just like with status timestamps (#10466) 2019-04-03 18:16:55 +02:00
ThibG
d07b0c038f Hopefully fix input text selection quirks on iOS (#10463) 
Fix #10448 (hopefully)
 2019-04-03 17:54:54 +02:00
Jeong Arm
f984f2ea4e Esperanto translations (#10461) 
* Esperanto translations

* Translate untranslated Esperanto strings

* Normalize eo translation
 2019-04-03 18:19:10 +09:00
Renato "Lond" Cerqueira
83190fffc7 Re-dd PT-br translations (#10459) 2019-04-03 07:24:39 +09:00
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
 2019-04-03 01:31:36 +09:00
Aditoo17
0705e4b177 I18n: Improve Czech translation (#10454) 2019-04-03 00:10:27 +09:00
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>
 2019-04-02 14:38:16 +09:00
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>
 2019-04-02 14:34:37 +09:00
ThibG
120544067f Fix filtering of favourited_by, reblogged_by, followers and following (#10447) 2019-04-01 21:24:28 +02:00
ThibG
62bafa20a1 Hide blocking accounts from blocked users (#10442) 
* Revert "Add indication that you have been blocked in web UI (#10420)"

This reverts commit bd02ec6daa.

* Revert "Add `blocked_by` relationship to the REST API (#10373)"

This reverts commit 9745de883b.

* 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 bd02ec6daa

* Refactor by adding `without_blocking` scope
 2019-04-01 20:06:13 +02:00
Jeong Arm
67eb47e25f Simplify culling and fix race condition (#10440) 2019-04-01 19:17:21 +02:00
ThibG
2acd8940de Fix more keybase-related test failures (#10443) 2019-04-01 19:10:44 +02:00
slice
85973f4f37 Improvements to image upload validation and creation (#10431) 
* 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
 2019-04-01 07:30:46 +02:00
mayaeh
abdf225353 i18n: Update Japanese translations (#10427) 
* Update Japanese translations.

run yarn manage:translations && i18n-tasks add-missing

* Update Japanese translations.

* Fix mistake

* Change to be concise.
 2019-04-01 05:50:05 +02:00
ThibG
68c797bece Ensure request.body isn't emptied out before signature verification (#10432) 
Fixes #10429
 2019-03-31 17:27:24 +02:00
slice
59cce07601 Add thumbnail, hero, and mascot back to Form::AdminSettings::KEYS (#10430) 
These will allow these images to be uploaded again on the admin settings
page.
 2019-03-31 05:03:56 +02:00
ThibG
abecaba317 Fix failing keybase-related test (#10428) 2019-03-30 18:15:23 +01:00
Jeong Arm
51625d3423 Remove unused code (#10426) 2019-03-30 15:47:25 +09:00
Eugen Rochko
b7379da6cc
Cache error 410 responses in recommended nginx configuration (#10425) 2019-03-30 03:14:31 +01:00
Eugen Rochko
ac650d7a13
Bump version to 2.8.0rc1 (#10340) 
Update AUTHORS.md
Update CHANGELOG.md
 2019-03-30 02:13:42 +01:00
Eugen Rochko
1714ea5978
Add ActivityPub representation for identity proofs (#10414) 
* Add ActivityPub representation for identity proofs

* Add tests
 2019-03-30 02:12:06 +01:00
Eugen Rochko
8fb69f1366
Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413) 
Fix #10315

This reverts commit db06b25376.
 2019-03-30 01:41:35 +01:00
Eugen Rochko
79227d153b
Fix transparent avatars showing underlying elements in avatar stack and profile (#10422) 2019-03-30 01:13:19 +01:00
Eugen Rochko
379c3e237f
Fix search in web UI not setting a limit, restore limit of 5 (#10421) 
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
 2019-03-30 00:43:38 +01:00
Eugen Rochko
bd02ec6daa
Add indication that you have been blocked in web UI (#10420) 2019-03-30 00:43:29 +01:00
Aditoo17
1d62b88f8d I18n: Update Czech translation (#10419) 2019-03-29 16:59:48 +01:00
Jeong Arm
e5d79d1635 Add missing Korean translations (#10416) 
* Fix Korean translation

* Add missing translation
 2019-03-29 22:14:24 +09:00
dependabot[bot]
3b1c64cadc Bump capybara from 3.15.0 to 3.16.0 (#10415) 
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>
 2019-03-29 22:06:56 +09:00
Alix Rossi
34090a85e4 Update Corsican translations (#10418) 
* Update Corsican translation

* Update Corsican YML

* Corsican JSON fix

* Update co.yml
 2019-03-29 22:06:16 +09:00
Masoud Abkenar
2a326940e8 l10n update: fa (#10417) 2019-03-29 22:04:55 +09:00
ThibG
58667072d9 Fix opacity of relationship tags (#10411) 2019-03-28 18:33:26 +01:00
Aditoo17
1a7d1f4a42 I18n: Update Czech translation (#10410) 2019-03-28 18:01:28 +01:00
Alex Gessner
69141dca26 squashed identity proof updates (#10375) 2019-03-28 18:01:09 +01:00
Eugen Rochko
026dd75208
Add tootctl self-destruct (#10367) 
Fix #10305
 2019-03-28 17:56:25 +01:00
dependabot[bot]
24d5b6f9e3 Bump aws-sdk-s3 from 1.35.0 to 1.36.0 (#10406) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.35.0 to 1.36.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.35.0...v1.36.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-28 16:25:27 +09:00
dependabot[bot]
85629bf3d3 Bump rails from 5.2.2.1 to 5.2.3 (#10407) 
Bumps [rails](https://github.com/rails/rails) from 5.2.2.1 to 5.2.3.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.2.1...v5.2.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-28 16:25:11 +09:00
Eugen Rochko
f1bc90ab50
Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401) 
Also, fix some n+1 queries

Resolve #10365
 2019-03-28 04:44:59 +01:00
dependabot[bot]
f46f67d984 [Security] Bump devise from 4.5.0 to 4.6.2 (#10394) 
Bumps [devise](https://github.com/plataformatec/devise) from 4.5.0 to 4.6.2. **This update includes security fixes.**
- [Release notes](https://github.com/plataformatec/devise/releases)
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/devise/compare/v4.5.0...v4.6.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-28 02:20:53 +01:00
Eugen Rochko
5d41532d94
Add tootctl search deploy to avoid ugly rake task syntax (#10403) 2019-03-28 02:16:11 +01:00
Eugen Rochko
08ec7435ce
Add order options to relationship manager UI (#10404) 2019-03-28 02:16:01 +01:00