Commit Graph

9253 Commits

Author SHA1 Message Date
Thibaut Girka
33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
Alix Rossi
c88d9e524b i18n: Update Corsican translation (#10692) 2019-05-04 20:09:25 +09:00
Thibaut Girka
2c2f649200 Fix CSP when PAPERCLIP_ROOT_URL is set to a different host 2019-05-04 10:55:56 +02:00
Eugen Rochko
8025a41a1f
Add tootctl cache clear (#10689) 2019-05-04 01:02:57 +02:00
Thibaut Girka
58720aa2bd Fix CSP when dealing with S3 hosts 2019-05-04 00:47:51 +02:00
Eugen Rochko
5f9f610a23
Bump version to 2.8.1 (#10687) 2019-05-04 00:31:06 +02:00
ThibG
b85f216cbc Do not retry processing ActivityPub jobs raising validation errors (#10614)
* Do not retry processing ActivityPub jobs raising validation errors

Jobs yielding validation errors most probably won't ever be accepted,
so it makes sense not to clutter the queues with retries.

* Lower RecordInvalid error reporting to debug log level

* Remove trailing whitespace
2019-05-03 23:45:37 +02:00
Eugen Rochko
7cb369d4c6
Change e-mail whitelist/blacklist to not be checked when invited (#10683)
* Change e-mail whitelist/blacklist to not be checked when invited

And only when creating an account, not when updating it later

Fix #10648

* Fix test
2019-05-03 23:44:44 +02:00
Thibaut Girka
9f25ab9792 Fix polls icon not showing in CW button in detailed statuses 2019-05-03 21:55:50 +02:00
Eugen Rochko
d77ee3f276
Fix accounts created through tootctl not being always pre-approved (#10684)
Add `--approve` option to `tootctl accounts modify`
2019-05-03 20:49:27 +02:00
Eugen Rochko
63b1388fef
Change font weight of sensitive button to 500 (#10682) 2019-05-03 20:44:20 +02:00
ThibG
91634947f8 Explicitly disable storage of REST API results (#10655)
Fixes #10652
2019-05-03 20:39:19 +02:00
ThibG
011b032300 Provide a link to existing domain block when trying to block an already-blocked domain (#10663)
* When trying to block an already-blocked domain, provide a link to the block

* Fix styling for links in flash messages

* Allow blocks to be upgraded but not downgraded
2019-05-03 20:36:36 +02:00
Thibaut Girka
7617f78359 Fix crash in onboarding modal
Fixes #1027
2019-05-03 19:24:54 +02:00
Eugen Rochko
eb63217210
Add button to view context to media modal (#10676)
* Add "view context" button to media modal when opened from gallery

* Add "view context" button to video modal

Allow closing the video modal by navigating back in the browser,
just like the media modal
2019-05-03 16:16:30 +02:00
dependabot[bot]
ecbea2e3c6 Bump rack-attack from 5.4.2 to 6.0.0 (#10599)
* Bump rack-attack from 5.4.2 to 6.0.0

Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 5.4.2 to 6.0.0.
- [Release notes](https://github.com/kickstarter/rack-attack/releases)
- [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kickstarter/rack-attack/compare/v5.4.2...v6.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* fix payload[:request]
2019-05-03 16:16:11 +02:00
dependabot[bot]
61e28b0ccc Bump scss_lint from 0.57.1 to 0.58.0 (#10678)
Bumps [scss_lint](https://github.com/sds/scss-lint) from 0.57.1 to 0.58.0.
- [Release notes](https://github.com/sds/scss-lint/releases)
- [Changelog](https://github.com/sds/scss-lint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sds/scss-lint/compare/v0.57.1...v0.58.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-03 17:29:53 +09:00
dependabot[bot]
153b4ffc78 Bump fabrication from 2.20.1 to 2.20.2 (#10677)
Bumps [fabrication](https://github.com/paulelliott/fabrication) from 2.20.1 to 2.20.2.
- [Release notes](https://github.com/paulelliott/fabrication/releases)
- [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown)
- [Commits](https://github.com/paulelliott/fabrication/compare/2.20.1...2.20.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-03 15:01:38 +09:00
ThibG
5121d9c12f When selecting a toot via keyboard, ensure it is scrolled into view (#10593) 2019-05-03 06:20:35 +02:00
Eugen Rochko
05ef3462ba
Make the "mark media as sensitive" button more obvious in web UI (#10673)
* Make the "mark media as sensitive" button more obvious in web UI

* Use eye-slash icon instead of eye icon to mean "hide"
2019-05-03 04:34:55 +02:00
Eugen Rochko
967e419f8f
Fix alignment of items in the account gallery in web UI and load more per page (#10674) 2019-05-03 04:02:55 +02:00
Eugen Rochko
3f143606fa
Change account gallery in web UI (#10667)
- 3 items per row instead of 2
- Use blurhash for previews
- Animate/hover-to-play GIFs and videos
- Open media modal instead of opening status
- Allow opening status instead with ctrl+click and open in new tab
2019-05-02 08:34:32 +02:00
ThibG
21a73c52a7 Check that an invite link is valid before bypassing approval mode (#10657)
* Check that an invite link is valid before bypassing approval mode

Fixes #10656

* Add tests

* Only consider valid invite links in registration controller

* fixup
2019-05-02 04:30:12 +02:00
ThibG
c4f2433300 Disallow robots from indexing /interact/ (#10666)
This does not provide any new information and may just triple the number
of crawled pages
2019-05-02 00:10:19 +02:00
Thibaut Girka
fcbf557bd2 Add site-wide options to show reblogs and replies in local/public timelines
Fixes #1021
2019-05-01 22:33:09 +02:00
Thibaut Girka
cc5a81b7d8 Make hi-color privacy icons opt-in instead of opt-out 2019-05-01 20:23:25 +02:00
Thibaut Girka
ac54292d69 Add high color privacy icons
Fixes #1015
2019-05-01 16:38:01 +02:00
ThibG
0db269f3dc Minor fixes to the French translation (#10662) 2019-05-01 22:19:55 +09:00
dependabot[bot]
699109b954 Bump rubocop from 0.68.0 to 0.68.1 (#10658)
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.68.0 to 0.68.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.68.0...v0.68.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-01 15:49:16 +09:00
dependabot[bot]
825d5c79b7 Bump annotate from 2.7.4 to 2.7.5 (#10651)
Bumps [annotate](https://github.com/ctran/annotate_models) from 2.7.4 to 2.7.5.
- [Release notes](https://github.com/ctran/annotate_models/releases)
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.rdoc)
- [Commits](https://github.com/ctran/annotate_models/compare/v2.7.4...2.7.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-30 18:06:09 +02:00
dependabot[bot]
7c94b190c8 Bump bullet from 5.9.0 to 6.0.0 (#10635)
Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.9.0 to 6.0.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/5.9.0...6.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-30 18:05:49 +02:00
dependabot[bot]
feff0fc9b2 Bump rubocop from 0.67.2 to 0.68.0 (#10654)
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.67.2 to 0.68.0.
- [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.67.2...v0.68.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-30 18:05:22 +02:00
Zac
be6ef1947e changed pinned status count operator
changed default pinned count to 5 to preserve default behavior
2019-04-29 20:52:53 +02:00
Zac
5616200ed4 added documentation into .env.production.sample
moved max pin count into constant
2019-04-29 20:52:53 +02:00
Zac
a36affb9d6 add env var for max pinned toots 2019-04-29 20:52:53 +02:00
Thibaut Girka
d4c95e6a8a When selecting a toot via keyboard, ensure it is scrolled into view
Fixes detailed status column
2019-04-29 20:28:38 +02:00
Thibaut Girka
3e095cab83 Add support for missing formatting tags 2019-04-29 19:31:09 +02:00
Thibaut Girka
67fb9a8679 Add keyboard shortcut to collapse/uncollapse toots 2019-04-28 20:23:04 +02:00
Thibaut Girka
f3acf8f414 Add hotkey for bookmarking a toot 2019-04-28 20:23:04 +02:00
partev
5e79dd3f17 Update hy.json (#10644) 2019-04-28 12:51:20 +09:00
Eugen Rochko
e18786dec7
Fix approved column being set to nil instead of false (#10642)
Fix https://github.com/tootsuite/mastodon/pull/10621#issuecomment-487316619
2019-04-27 23:55:16 +02:00
Thibaut Girka
cd9a284702 Fix regression with textarea's caret position when selecting a suggestion 2019-04-27 21:40:42 +02:00
Eugen Rochko
fba96c808d
Add blurhash (#10630)
* Add blurhash

* Use fallback color for spoiler when blurhash missing

* Federate the blurhash and accept it as long as it's at most 5x5

* Display unknown media attachments as blurhash placeholders

* Improve style of embed actions and spoiler button

* Change blurhash resolution from 3x3 to 4x4

* Improve dependency definitions

* Fix code style issues
2019-04-27 03:24:09 +02:00
Thibaut Girka
aa1832ac4d Hide suggestions by default
They will be enabled if the input has focus
2019-04-26 22:38:03 +02:00
Thibaut Girka
fddd8251dd Attempt to fix CSS 2019-04-26 22:38:03 +02:00
Thibaut Girka
d7e4be285a Add emoji suggestion to poll options 2019-04-26 22:38:03 +02:00
Thibaut Girka
df52004fe6 Add suggestions in CW field 2019-04-26 22:38:03 +02:00
Thibaut Girka
3a671470ec Refactor selectComposeSuggestion so that different paths can be updated 2019-04-26 22:38:03 +02:00
Marek Ľach
c008911249 New string added for Slovak translation (#10637) 2019-04-26 18:07:36 +02:00
dependabot[bot]
8f4c34669f Bump bootsnap from 1.4.3 to 1.4.4 (#10634)
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.3...v1.4.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-25 13:36:56 +02:00