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
ThibG
120544067f
Fix filtering of favourited_by, reblogged_by, followers and following ( #10447 )
6 years ago
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
6 years ago
Jeong Arm
67eb47e25f
Simplify culling and fix race condition ( #10440 )
6 years ago
ThibG
2acd8940de
Fix more keybase-related test failures ( #10443 )
6 years ago
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
6 years ago
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.
6 years ago
ThibG
68c797bece
Ensure request.body isn't emptied out before signature verification ( #10432 )
...
Fixes #10429
6 years ago
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.
6 years ago
ThibG
925830d11b
Merge pull request #976 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Thibaut Girka
b72950fbd3
Fix failing keybase-related test
6 years ago
Eugen Rochko
b9b472d519
[Glitch] Fix transparent avatars showing underlying elements in avatar stack and profile
...
Port 79227d153b
to glitch-soc
6 years ago
ThibG
abecaba317
Fix failing keybase-related test ( #10428 )
6 years ago
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
6 years ago
Thibaut Girka
4444d8f9b3
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Jeong Arm
51625d3423
Remove unused code ( #10426 )
6 years ago
Eugen Rochko
b7379da6cc
Cache error 410 responses in recommended nginx configuration ( #10425 )
6 years ago
Eugen Rochko
ac650d7a13
Bump version to 2.8.0rc1 ( #10340 )
...
Update AUTHORS.md
Update CHANGELOG.md
6 years ago
Eugen Rochko
1714ea5978
Add ActivityPub representation for identity proofs ( #10414 )
...
* Add ActivityPub representation for identity proofs
* Add tests
6 years ago
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
.
6 years ago
Eugen Rochko
79227d153b
Fix transparent avatars showing underlying elements in avatar stack and profile ( #10422 )
6 years ago
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
6 years ago
Eugen Rochko
bd02ec6daa
Add indication that you have been blocked in web UI ( #10420 )
6 years ago
Aditoo17
1d62b88f8d
I18n: Update Czech translation ( #10419 )
6 years ago
Jeong Arm
e5d79d1635
Add missing Korean translations ( #10416 )
...
* Fix Korean translation
* Add missing translation
6 years ago
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>
6 years ago
Alix Rossi
34090a85e4
Update Corsican translations ( #10418 )
...
* Update Corsican translation
* Update Corsican YML
* Corsican JSON fix
* Update co.yml
6 years ago
Masoud Abkenar
2a326940e8
l10n update: fa ( #10417 )
6 years ago
Alex Gessner
b6fa500806
[Glitch] squashed identity proof updates
...
Port JS from 69141dca26
to glitch-soc
6 years ago
Thibaut Girka
a74d300b68
Fix background color transition in destructive buttons
6 years ago
ThibG
f4b038f779
[Glitch] Fix opacity of relationship tags
...
Port 58667072d9
to glitch-soc
6 years ago
Thibaut Girka
0318b23395
Fix left border of profile navigation tab
6 years ago
Thibaut Girka
ab39ffb175
Add fa-info-circle to disclaimer
6 years ago