Commit Graph

9209 Commits

Author SHA1 Message Date
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
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
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
2a326940e8 l10n update: fa (#10417) 2019-03-29 22:04:55 +09:00
b6fa500806 [Glitch] squashed identity proof updates
Port JS from 69141dca26 to glitch-soc
2019-03-29 10:13:44 +01:00
a74d300b68 Fix background color transition in destructive buttons 2019-03-28 20:45:10 +01:00
f4b038f779 [Glitch] Fix opacity of relationship tags
Port 58667072d9 to glitch-soc
2019-03-28 19:56:40 +01:00
0318b23395 Fix left border of profile navigation tab 2019-03-28 19:56:40 +01:00
ab39ffb175 Add fa-info-circle to disclaimer 2019-03-28 19:56:40 +01:00
6c58367f36 Fix double border for account disclaimer 2019-03-28 19:56:40 +01:00
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
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
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
cf3f063e10 [Glitch] Fix menu items that don't action
Port 186f7bcbb6 to glitch-soc
2019-03-28 19:56:40 +01:00
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
abb53fa338 Fix centering on public pages 2019-03-28 19:56:03 +01:00
60fc04756a Fix padding and centering of display names 2019-03-28 19:56:03 +01:00
58da5e93c0 Port search results styling to glitch-soc 2019-03-28 19:56:03 +01:00
fad29fd230 Merge pull request #973 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-03-28 18:45:28 +01:00
ce7d055d3c Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 18:35:25 +01:00
58667072d9 Fix opacity of relationship tags (#10411) 2019-03-28 18:33:26 +01:00
1a7d1f4a42 I18n: Update Czech translation (#10410) 2019-03-28 18:01:28 +01:00
69141dca26 squashed identity proof updates (#10375) 2019-03-28 18:01:09 +01:00
026dd75208 Add tootctl self-destruct (#10367)
Fix #10305
2019-03-28 17:56:25 +01:00
bb316fafff Merge pull request #970 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-03-28 15:12:33 +01:00
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
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
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
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
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
5d41532d94 Add tootctl search deploy to avoid ugly rake task syntax (#10403) 2019-03-28 02:16:11 +01:00
08ec7435ce Add order options to relationship manager UI (#10404) 2019-03-28 02:16:01 +01:00
683013756e Revert locales touched by automated translations (#10399)
* Revert ruined translations

Regression from #10362

* yarn manage:translations
2019-03-28 00:30:47 +01:00