Commit Graph

9141 Commits

Author SHA1 Message Date
6689e572f3 Add tootctl emoji purge (#10481)
Fix #10441
2019-04-06 04:47:16 +02:00
e007c7a99b Add tootctl accounts approve (#10480) 2019-04-06 04:47:05 +02:00
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
4be7952892 i18n: Update Polish translation (#10479)
Signed-off-by: Marcin Mikołajczak <m4sk1n@m4sk1n.nazwa.pl>
2019-04-06 02:51:13 +09:00
e0137c5884 Updates the Slovak translation (#10477)
* Update sk.json

* Update sk.json

* Update sk.json
2019-04-05 22:16:28 +09:00
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
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
bd365cc38b Duplicate values (#10470) 2019-04-04 23:22:55 +09:00
30500dff7c Merge pull request #981 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-04-04 15:13:18 +02:00
be6885eb93 [Glitch] Update poll remaining time just like with status timestamps
Port daab45d4ae to glitch-soc
2019-04-04 14:58:11 +02:00
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.
2019-04-04 14:53:52 +02:00
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
caa2814d40 Translate Korean (devise) (#10464) 2019-04-04 01:31:08 +02:00
cc6e3c3900 Cache featured collections, as well as outbox, followers and following (#10467) 2019-04-04 01:30:44 +02:00
14bad3f472 Do not handle clicks in detailed status content 2019-04-03 19:58:18 +02:00
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
daab45d4ae Update poll remaining time just like with status timestamps (#10466) 2019-04-03 18:16:55 +02:00
d07b0c038f Hopefully fix input text selection quirks on iOS (#10463)
Fix #10448 (hopefully)
2019-04-03 17:54:54 +02:00
f984f2ea4e Esperanto translations (#10461)
* Esperanto translations

* Translate untranslated Esperanto strings

* Normalize eo translation
2019-04-03 18:19:10 +09:00
83190fffc7 Re-dd PT-br translations (#10459) 2019-04-03 07:24:39 +09:00
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
0705e4b177 I18n: Improve Czech translation (#10454) 2019-04-03 00:10:27 +09:00
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
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
3f5acc1ab3 Merge pull request #978 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-04-01 21:36:36 +02:00
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
120544067f Fix filtering of favourited_by, reblogged_by, followers and following (#10447) 2019-04-01 21:24:28 +02:00
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
67eb47e25f Simplify culling and fix race condition (#10440) 2019-04-01 19:17:21 +02:00
2acd8940de Fix more keybase-related test failures (#10443) 2019-04-01 19:10:44 +02:00
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
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
68c797bece Ensure request.body isn't emptied out before signature verification (#10432)
Fixes #10429
2019-03-31 17:27:24 +02:00
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
925830d11b Merge pull request #976 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-03-31 00:37:16 +01:00
b72950fbd3 Fix failing keybase-related test 2019-03-30 18:19:40 +01:00
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
abecaba317 Fix failing keybase-related test (#10428) 2019-03-30 18:15:23 +01:00
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
4444d8f9b3 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-30 12:36:24 +01:00
51625d3423 Remove unused code (#10426) 2019-03-30 15:47:25 +09:00
b7379da6cc Cache error 410 responses in recommended nginx configuration (#10425) 2019-03-30 03:14:31 +01:00
ac650d7a13 Bump version to 2.8.0rc1 (#10340)
Update AUTHORS.md
Update CHANGELOG.md
2019-03-30 02:13:42 +01:00
1714ea5978 Add ActivityPub representation for identity proofs (#10414)
* Add ActivityPub representation for identity proofs

* Add tests
2019-03-30 02:12:06 +01:00
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
79227d153b Fix transparent avatars showing underlying elements in avatar stack and profile (#10422) 2019-03-30 01:13:19 +01:00
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
bd02ec6daa Add indication that you have been blocked in web UI (#10420) 2019-03-30 00:43:29 +01:00
1d62b88f8d I18n: Update Czech translation (#10419) 2019-03-29 16:59:48 +01:00
e5d79d1635 Add missing Korean translations (#10416)
* Fix Korean translation

* Add missing translation
2019-03-29 22:14:24 +09:00