Thibaut Girka
73bc58c656
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
Alix Rossi
4bf9e83f85
i18n: Update Corsican translation ( #10692 )
2019-05-04 20:09:25 +09:00
Thibaut Girka
06bcab6e99
Fix CSP when PAPERCLIP_ROOT_URL is set to a different host
2019-05-04 10:55:56 +02:00
Eugen Rochko
a33bd6ad98
Add tootctl cache clear
( #10689 )
2019-05-04 01:02:57 +02:00
Thibaut Girka
5d24d50987
Fix CSP when dealing with S3 hosts
2019-05-04 00:47:51 +02:00
Eugen Rochko
52eca0c4b5
Bump version to 2.8.1 ( #10687 )
2019-05-04 00:31:06 +02:00
ThibG
09ce4ea53c
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
c3b1f6963b
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
d20647fd94
Fix polls icon not showing in CW button in detailed statuses
2019-05-03 21:55:50 +02:00
Eugen Rochko
cc9851a479
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
f7879bbe08
Change font weight of sensitive button to 500 ( #10682 )
2019-05-03 20:44:20 +02:00
ThibG
4c4f9d78fd
Explicitly disable storage of REST API results ( #10655 )
...
Fixes #10652
2019-05-03 20:39:19 +02:00
ThibG
8c716f917f
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
c15b1aa00c
Fix crash in onboarding modal
...
Fixes #1027
2019-05-03 19:24:54 +02:00
Eugen Rochko
4aabc452d0
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]
592ab699fe
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]
6b59bd7b99
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]
7082beda2a
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
d8418c07c9
When selecting a toot via keyboard, ensure it is scrolled into view ( #10593 )
2019-05-03 06:20:35 +02:00
Eugen Rochko
cc39785d45
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
78f5b96bf6
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
db73f8e585
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
af3971a0e6
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
11ca5888f0
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
c4865cbd25
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
e53b2a9c37
Make hi-color privacy icons opt-in instead of opt-out
2019-05-01 20:23:25 +02:00
Thibaut Girka
f5f0bd6c0a
Add high color privacy icons
...
Fixes #1015
2019-05-01 16:38:01 +02:00
ThibG
05bf900109
Minor fixes to the French translation ( #10662 )
2019-05-01 22:19:55 +09:00
dependabot[bot]
91f1b59c5e
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]
121d9220e6
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]
60812a2790
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]
91f2acf428
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
826d926bb9
changed pinned status count operator
...
changed default pinned count to 5 to preserve default behavior
2019-04-29 20:52:53 +02:00
Zac
5a3d18a660
added documentation into .env.production.sample
...
moved max pin count into constant
2019-04-29 20:52:53 +02:00
Zac
41d3d17fe7
add env var for max pinned toots
2019-04-29 20:52:53 +02:00
Thibaut Girka
98732502f5
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
81c9377c7d
Add support for missing formatting tags
2019-04-29 19:31:09 +02:00
Thibaut Girka
02bd678944
Add keyboard shortcut to collapse/uncollapse toots
2019-04-28 20:23:04 +02:00
Thibaut Girka
7ed89e9178
Add hotkey for bookmarking a toot
2019-04-28 20:23:04 +02:00
partev
f843bdbd73
Update hy.json ( #10644 )
2019-04-28 12:51:20 +09:00
Eugen Rochko
b1e10ed1b3
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
5a8b820767
Fix regression with textarea's caret position when selecting a suggestion
2019-04-27 21:40:42 +02:00
Eugen Rochko
a6d2fe7165
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
b40841b488
Hide suggestions by default
...
They will be enabled if the input has focus
2019-04-26 22:38:03 +02:00
Thibaut Girka
e720f1eac2
Attempt to fix CSS
2019-04-26 22:38:03 +02:00
Thibaut Girka
4155a1556a
Add emoji suggestion to poll options
2019-04-26 22:38:03 +02:00
Thibaut Girka
b35b38f4ea
Add suggestions in CW field
2019-04-26 22:38:03 +02:00
Thibaut Girka
0541e4ad21
Refactor selectComposeSuggestion so that different paths can be updated
2019-04-26 22:38:03 +02:00
Marek Ľach
63e9783e7d
New string added for Slovak translation ( #10637 )
2019-04-26 18:07:36 +02:00
dependabot[bot]
b3d218e5a1
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