tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
9,066 Commits 20 Branches 113 Tags 222 MiB
Commit Graph

9066 Commits

Author SHA1 Message Date
Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
 2019-04-01 21:28:31 +02: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 925830d11b
Merge pull request #976 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-31 00:37:16 +01:00
Thibaut Girka b72950fbd3 Fix failing keybase-related test 2019-03-30 18:19:40 +01:00
Eugen Rochko b9b472d519 [Glitch] Fix transparent avatars showing underlying elements in avatar stack and profile 
Port 79227d153b to glitch-soc
 2019-03-30 18:19:40 +01:00
ThibG abecaba317 Fix failing keybase-related test (#10428) 2019-03-30 18:15:23 +01:00
Eugen Rochko 59551ece31 [Glitch] Fix search in web UI not setting a limit, restore limit of 10 
Port 379c3e237f to glitch-soc, but changing
the 5 limit to 10, since that's what we had previously
 2019-03-30 12:56:34 +01:00
Thibaut Girka 4444d8f9b3 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-30 12:36:24 +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
Alex Gessner b6fa500806 [Glitch] squashed identity proof updates 
Port JS from 69141dca26 to glitch-soc
 2019-03-29 10:13:44 +01:00
Thibaut Girka a74d300b68 Fix background color transition in destructive buttons 2019-03-28 20:45:10 +01:00
ThibG f4b038f779 [Glitch] Fix opacity of relationship tags 
Port 58667072d9 to glitch-soc
 2019-03-28 19:56:40 +01:00
Thibaut Girka 0318b23395 Fix left border of profile navigation tab 2019-03-28 19:56:40 +01:00
Thibaut Girka ab39ffb175 Add fa-info-circle to disclaimer 2019-03-28 19:56:40 +01:00
Thibaut Girka 6c58367f36 Fix double border for account disclaimer 2019-03-28 19:56:40 +01:00
slice 6fdd829d8c [Glitch] Add rel='noopener' to redesigned profile column header avatar link 
Port 73f5711fb8 to glitch-soc
 2019-03-28 19:56:40 +01:00
ThibG 841d2c9f23 [Glitch] Move the account dropdown menubar to the right, make sure it doesn't move 
Port a91acf79b5 to glitch-soc
 2019-03-28 19:56:40 +01:00
Aditoo17 37ad0478ef [Glitch] Make clicking on avatar open public profile in new tab 
Port 6f6abc369f to glitch-soc
 2019-03-28 19:56:40 +01:00
mayaeh cf3f063e10 [Glitch] Fix menu items that don't action 
Port 186f7bcbb6 to glitch-soc
 2019-03-28 19:56:40 +01:00
Eugen Rochko 00f251b8fe [Glitch] Redesign profile column in web UI to match design on public pages 
Port a96181f16f to glitch-soc
 2019-03-28 19:56:40 +01:00
Thibaut Girka abb53fa338 Fix centering on public pages 2019-03-28 19:56:03 +01:00
Thibaut Girka 60fc04756a Fix padding and centering of display names 2019-03-28 19:56:03 +01:00
Thibaut Girka 58da5e93c0 Port search results styling to glitch-soc 2019-03-28 19:56:03 +01:00
ThibG fad29fd230
Merge pull request #973 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-28 18:45:28 +01:00
Thibaut Girka ce7d055d3c Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 18:35:25 +01: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
ThibG bb316fafff
Merge pull request #970 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-28 15:12:33 +01:00
Thibaut Girka 050efbc126 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
 2019-03-28 13:01:33 +01:00