treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
9,200 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

9200 Commits (0541e4ad21f46c0af912ac41d166e9572a4e0834)

Author SHA1 Message Date
Eugen Rochko c84c30c542 Improve blocked view of profiles (#10491) 
* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447)"

This reverts commit 0317f37c6f.

* Revert "Hide blocking accounts from blocked users (#10442)"

This reverts commit 4cd944d364.

* 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
 2019-04-07 04:59:13 +02:00
Eugen Rochko 1ed2c9c16e Add rate limit for media proxy requests (#10490) 
30 per 30 minutes, like media uploads
 2019-04-07 04:26:43 +02:00
Aditoo17 12ebe48505 I18n: Update Czech translation (#10489) 2019-04-07 09:34:52 +09:00
koyu 59de320605 Updated German locales (#10488) 2019-04-07 03:13:03 +09:00
Eugen Rochko c34a7f5bd2 Add batch actions for approving and rejecting pending accounts (#10469) 2019-04-06 17:53:45 +02:00
Eugen Rochko d48f53cf1a 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
 2019-04-06 17:53:17 +02:00
Marek Ľach 1409a529dd Improve sk translation further (#10484) 
* Further improving Slovak translation

* Update sk.json
 2019-04-06 23:26:51 +09:00
ashleyhull-versent b0348d0f92 tinyfix 2: unrequired arguments (#10471) 
* unrequired argument

* unrequired argument
 2019-04-06 12:02:03 +09:00
Eugen Rochko 07c6a0edc2 Fix missing long description on `tootctl statuses remove` (#10482) 2019-04-06 04:47:26 +02:00
Eugen Rochko c455cba4d8 Add `tootctl emoji purge` (#10481) 
Fix #10441
 2019-04-06 04:47:16 +02:00
Eugen Rochko a9c29f6e15 Add `tootctl accounts approve` (#10480) 2019-04-06 04:47:05 +02:00
dependabot[bot] 494f2e4729 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 0e7c4d0c69 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 705a2b7615 Updates the Slovak translation (#10477) 
* Update sk.json

* Update sk.json

* Update sk.json
 2019-04-05 22:16:28 +09:00
jeroenpraat 4c20f5376a 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 e9ef322e14 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 8037fa7d2e Duplicate values (#10470) 2019-04-04 23:22:55 +09:00
ThibG 3964cc964d Merge pull request #981 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-04-04 15:13:18 +02:00
ThibG 729b3841c3 [Glitch] Update poll remaining time just like with status timestamps 
Port 6e024f0d7a to glitch-soc
 2019-04-04 14:58:11 +02:00
Thibaut Girka a835ea0e8f 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.
 2019-04-04 14:53:52 +02:00
spla f46cd7f002 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 e09e68b656 Translate Korean (devise) (#10464) 2019-04-04 01:31:08 +02:00
ThibG 4fa0b331ae Cache featured collections, as well as outbox, followers and following (#10467) 2019-04-04 01:30:44 +02:00
Thibaut Girka b83e693c40 Do not handle clicks in detailed status content 2019-04-03 19:58:18 +02:00
ThibG e87214826b 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 6e024f0d7a Update poll remaining time just like with status timestamps (#10466) 2019-04-03 18:16:55 +02:00
ThibG aa7fe3101f Hopefully fix input text selection quirks on iOS (#10463) 
Fix #10448 (hopefully)
 2019-04-03 17:54:54 +02:00
Jeong Arm 7deedcc0cf Esperanto translations (#10461) 
* Esperanto translations

* Translate untranslated Esperanto strings

* Normalize eo translation
 2019-04-03 18:19:10 +09:00
Renato "Lond" Cerqueira a0eaf51ad4 Re-dd PT-br translations (#10459) 2019-04-03 07:24:39 +09:00
spla 8cc94c38cf 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 445568eff3 I18n: Improve Czech translation (#10454) 2019-04-03 00:10:27 +09:00
dependabot[bot] b3726cd06d 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] 1aef2d60d7 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 7da934c1f5 Merge pull request #978 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-04-01 21:36:36 +02:00
Thibaut Girka 5eb2632410 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 0317f37c6f Fix filtering of favourited_by, reblogged_by, followers and following (#10447) 2019-04-01 21:24:28 +02:00
ThibG 4cd944d364 Hide blocking accounts from blocked users (#10442) 
* Revert "Add indication that you have been blocked in web UI (#10420)"

This reverts commit d31affe69b.

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

This reverts commit a8bb10633d.

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

* Refactor by adding `without_blocking` scope
 2019-04-01 20:06:13 +02:00
Jeong Arm dbabfec2ea Simplify culling and fix race condition (#10440) 2019-04-01 19:17:21 +02:00
ThibG ec3dab2b7f Fix more keybase-related test failures (#10443) 2019-04-01 19:10:44 +02:00
slice 67cd7abbb1 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 0615bc56aa 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 65930be714 Ensure request.body isn't emptied out before signature verification (#10432) 
Fixes #10429
 2019-03-31 17:27:24 +02:00
slice 0aea1c0775 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 9498b61ded Merge pull request #976 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-31 00:37:16 +01:00
Thibaut Girka f253b55bd5 Fix failing keybase-related test 2019-03-30 18:19:40 +01:00
Eugen Rochko a547a214fd [Glitch] Fix transparent avatars showing underlying elements in avatar stack and profile 
Port 9a12568a33 to glitch-soc
 2019-03-30 18:19:40 +01:00
ThibG 3ce98a995e Fix failing keybase-related test (#10428) 2019-03-30 18:15:23 +01:00
Eugen Rochko 2393504c23 [Glitch] Fix search in web UI not setting a limit, restore limit of 10 
Port 20769a332a 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 99336afaff Merge branch 'master' into glitch-soc/merge-upstream 2019-03-30 12:36:24 +01:00
Jeong Arm 1289e86116 Remove unused code (#10426) 2019-03-30 15:47:25 +09:00