]>
cat aescling's git repositories - mastodon.git/log
Eugen Rochko [Fri, 3 May 2019 02:02:55 +0000 (04:02 +0200)]
[Glitch] Fix alignment of items in the account gallery in web UI and load more per page
Port
967e419f8fa87af74f4bb530d7493c1dde02fca8 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Eugen Rochko [Thu, 2 May 2019 06:34:32 +0000 (08:34 +0200)]
[Glitch] Change account gallery in web UI
Port
3f143606faa6181ff2745b6bd29ac8ea075088bf to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Thibaut Girka [Sat, 4 May 2019 16:18:15 +0000 (18:18 +0200)]
Minor CSS fixes
Eugen Rochko [Sat, 27 Apr 2019 01:24:09 +0000 (03:24 +0200)]
[Glitch] Add blurhash
Port front-end changes from
fba96c808d25d2fc35ec63ee6745a1e55a95d707 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
ThibG [Fri, 3 May 2019 18:36:36 +0000 (20:36 +0200)]
Fix glitch SCSS for links in error messages in admin interface
Port SCSS changes from
011b032300657ccca4a42866749afc6ec2588ecc
Thibaut Girka [Sat, 4 May 2019 14:37:26 +0000 (16:37 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
Alix Rossi [Sat, 4 May 2019 11:09:25 +0000 (13:09 +0200)]
i18n: Update Corsican translation (#10692)
Thibaut Girka [Sat, 4 May 2019 08:40:32 +0000 (10:40 +0200)]
Fix CSP when PAPERCLIP_ROOT_URL is set to a different host
Eugen Rochko [Fri, 3 May 2019 23:02:57 +0000 (01:02 +0200)]
Add `tootctl cache clear` (#10689)
Thibaut Girka [Fri, 3 May 2019 22:14:49 +0000 (00:14 +0200)]
Fix CSP when dealing with S3 hosts
Eugen Rochko [Fri, 3 May 2019 22:31:06 +0000 (00:31 +0200)]
Bump version to 2.8.1 (#10687)
ThibG [Fri, 3 May 2019 21:45:37 +0000 (23:45 +0200)]
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
Eugen Rochko [Fri, 3 May 2019 21:44:44 +0000 (23:44 +0200)]
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
Thibaut Girka [Fri, 3 May 2019 18:25:57 +0000 (20:25 +0200)]
Fix polls icon not showing in CW button in detailed statuses
Eugen Rochko [Fri, 3 May 2019 18:49:27 +0000 (20:49 +0200)]
Fix accounts created through tootctl not being always pre-approved (#10684)
Add `--approve` option to `tootctl accounts modify`
Eugen Rochko [Fri, 3 May 2019 18:44:20 +0000 (20:44 +0200)]
Change font weight of sensitive button to 500 (#10682)
ThibG [Fri, 3 May 2019 18:39:19 +0000 (20:39 +0200)]
Explicitly disable storage of REST API results (#10655)
Fixes #10652
ThibG [Fri, 3 May 2019 18:36:36 +0000 (20:36 +0200)]
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
Thibaut Girka [Fri, 3 May 2019 16:54:06 +0000 (18:54 +0200)]
Fix crash in onboarding modal
Fixes #1027
Eugen Rochko [Fri, 3 May 2019 14:16:30 +0000 (16:16 +0200)]
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
dependabot[bot] [Fri, 3 May 2019 14:16:11 +0000 (16:16 +0200)]
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]
dependabot[bot] [Fri, 3 May 2019 08:29:53 +0000 (17:29 +0900)]
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>
dependabot[bot] [Fri, 3 May 2019 06:01:38 +0000 (15:01 +0900)]
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>
ThibG [Fri, 3 May 2019 04:20:36 +0000 (06:20 +0200)]
When selecting a toot via keyboard, ensure it is scrolled into view (#10593)
Eugen Rochko [Fri, 3 May 2019 02:34:55 +0000 (04:34 +0200)]
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"
Eugen Rochko [Fri, 3 May 2019 02:02:55 +0000 (04:02 +0200)]
Fix alignment of items in the account gallery in web UI and load more per page (#10674)
Eugen Rochko [Thu, 2 May 2019 06:34:32 +0000 (08:34 +0200)]
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
ThibG [Thu, 2 May 2019 02:30:12 +0000 (04:30 +0200)]
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
ThibG [Wed, 1 May 2019 22:10:19 +0000 (00:10 +0200)]
Disallow robots from indexing /interact/ (#10666)
This does not provide any new information and may just triple the number
of crawled pages
Thibaut Girka [Tue, 30 Apr 2019 19:51:24 +0000 (21:51 +0200)]
Add site-wide options to show reblogs and replies in local/public timelines
Fixes #1021
Thibaut Girka [Wed, 1 May 2019 18:22:44 +0000 (20:22 +0200)]
Make hi-color privacy icons opt-in instead of opt-out
Thibaut Girka [Sat, 27 Apr 2019 15:41:49 +0000 (17:41 +0200)]
Add high color privacy icons
Fixes #1015
ThibG [Wed, 1 May 2019 13:19:55 +0000 (15:19 +0200)]
Minor fixes to the French translation (#10662)
dependabot[bot] [Wed, 1 May 2019 06:49:16 +0000 (15:49 +0900)]
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>
dependabot[bot] [Tue, 30 Apr 2019 16:06:09 +0000 (18:06 +0200)]
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>
dependabot[bot] [Tue, 30 Apr 2019 16:05:49 +0000 (18:05 +0200)]
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>
dependabot[bot] [Tue, 30 Apr 2019 16:05:22 +0000 (18:05 +0200)]
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>
Zac [Mon, 29 Apr 2019 18:35:00 +0000 (14:35 -0400)]
changed pinned status count operator
changed default pinned count to 5 to preserve default behavior
Zac [Mon, 29 Apr 2019 00:10:30 +0000 (20:10 -0400)]
added documentation into .env.production.sample
moved max pin count into constant
Zac [Thu, 18 Apr 2019 02:48:20 +0000 (22:48 -0400)]
add env var for max pinned toots
Thibaut Girka [Mon, 29 Apr 2019 18:10:44 +0000 (20:10 +0200)]
When selecting a toot via keyboard, ensure it is scrolled into view
Fixes detailed status column
Thibaut Girka [Mon, 29 Apr 2019 17:00:27 +0000 (19:00 +0200)]
Add support for missing formatting tags
Thibaut Girka [Sat, 27 Apr 2019 17:17:42 +0000 (19:17 +0200)]
Add keyboard shortcut to collapse/uncollapse toots
Thibaut Girka [Sat, 27 Apr 2019 17:08:38 +0000 (19:08 +0200)]
Add hotkey for bookmarking a toot
partev [Sun, 28 Apr 2019 03:51:20 +0000 (23:51 -0400)]
Update hy.json (#10644)
Eugen Rochko [Sat, 27 Apr 2019 21:55:16 +0000 (23:55 +0200)]
Fix approved column being set to nil instead of false (#10642)
Fix https://github.com/tootsuite/mastodon/pull/10621#issuecomment-
487316619
Thibaut Girka [Sat, 27 Apr 2019 19:10:46 +0000 (21:10 +0200)]
Fix regression with textarea's caret position when selecting a suggestion
Eugen Rochko [Sat, 27 Apr 2019 01:24:09 +0000 (03:24 +0200)]
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
Thibaut Girka [Wed, 24 Apr 2019 18:34:33 +0000 (20:34 +0200)]
Hide suggestions by default
They will be enabled if the input has focus
Thibaut Girka [Thu, 11 Apr 2019 16:14:28 +0000 (18:14 +0200)]
Attempt to fix CSS
Thibaut Girka [Thu, 11 Apr 2019 15:59:38 +0000 (17:59 +0200)]
Add emoji suggestion to poll options
Thibaut Girka [Thu, 11 Apr 2019 15:18:55 +0000 (17:18 +0200)]
Add suggestions in CW field
Thibaut Girka [Thu, 11 Apr 2019 15:07:06 +0000 (17:07 +0200)]
Refactor selectComposeSuggestion so that different paths can be updated
Marek Ľach [Fri, 26 Apr 2019 16:07:36 +0000 (18:07 +0200)]
New string added for Slovak translation (#10637)
dependabot[bot] [Thu, 25 Apr 2019 11:36:56 +0000 (13:36 +0200)]
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>
Eugen Rochko [Thu, 25 Apr 2019 00:49:25 +0000 (02:49 +0200)]
Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)
Eugen Rochko [Thu, 25 Apr 2019 00:49:06 +0000 (02:49 +0200)]
Fix not being able to save e-mail preference for new pending accounts (#10622)
ThibG [Thu, 25 Apr 2019 00:48:54 +0000 (02:48 +0200)]
Fix upload progressbar when image resizing is involved (#10632)
ThibG [Thu, 25 Apr 2019 00:47:33 +0000 (02:47 +0200)]
Reject follow requests of blocked users (#10633)
Thibaut Girka [Wed, 24 Apr 2019 15:55:55 +0000 (17:55 +0200)]
Do not ask to register web intent handler
Thibaut Girka [Wed, 24 Apr 2019 18:30:02 +0000 (20:30 +0200)]
Fix color of muted statuses content not wrapped in a p tag
Thibaut Girka [Wed, 24 Apr 2019 16:42:17 +0000 (18:42 +0200)]
Redesign blockquote styling
Thibaut Girka [Wed, 24 Apr 2019 16:31:50 +0000 (18:31 +0200)]
Better distinguish titles from text
Thibaut Girka [Wed, 24 Apr 2019 16:30:55 +0000 (18:30 +0200)]
Remove extra margin in paragraphs inside blockquotes
Thibaut Girka [Wed, 24 Apr 2019 16:29:25 +0000 (18:29 +0200)]
Make bold text bolder
Thibaut Girka [Wed, 24 Apr 2019 16:28:33 +0000 (18:28 +0200)]
Remove margins around `p` tags in lists
Thibaut Girka [Wed, 24 Apr 2019 16:27:44 +0000 (18:27 +0200)]
Rename status__text to status__content__text for consistency with upstream
Thibaut Girka [Wed, 24 Apr 2019 14:39:49 +0000 (16:39 +0200)]
Fix status header display in toot mobile menu
Thibaut Girka [Wed, 24 Apr 2019 15:59:11 +0000 (17:59 +0200)]
Fix upload progressbar when image resizing is involved
Thibaut Girka [Wed, 24 Apr 2019 13:35:27 +0000 (15:35 +0200)]
Hide media upload form if no media are attached
ThibG [Wed, 24 Apr 2019 17:42:33 +0000 (19:42 +0200)]
Merge pull request #1007 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Thibaut Girka [Wed, 24 Apr 2019 13:25:22 +0000 (15:25 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Wed, 24 Apr 2019 05:51:35 +0000 (07:51 +0200)]
Fix file upload
Thibaut Girka [Tue, 23 Apr 2019 16:19:35 +0000 (18:19 +0200)]
Fix settings modal
dependabot[bot] [Tue, 23 Apr 2019 14:39:06 +0000 (16:39 +0200)]
Bump sidekiq from 5.2.6 to 5.2.7 (#10627)
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.6 to 5.2.7.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.6...v5.2.7)
Signed-off-by: dependabot[bot] <support@dependabot.com>
dependabot[bot] [Tue, 23 Apr 2019 09:53:52 +0000 (18:53 +0900)]
Bump capybara from 3.17.0 to 3.18.0 (#10626)
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.17.0 to 3.18.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.17.0...3.18.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
Eugen Rochko [Tue, 23 Apr 2019 02:39:48 +0000 (04:39 +0200)]
Fix stoplight logging to stderr separate from Rails logger (#10624)
Eugen Rochko [Tue, 23 Apr 2019 02:39:21 +0000 (04:39 +0200)]
Fix sign up button not saying sign up when invite is used (#10623)
Fix #10616
dependabot[bot] [Tue, 23 Apr 2019 01:02:58 +0000 (10:02 +0900)]
[Security] Bump nokogiri from 1.10.2 to 1.10.3 (#10620)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.2 to 1.10.3. **This update includes security fixes.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.2...v1.10.3)
Signed-off-by: dependabot[bot] <support@dependabot.com>
dependabot[bot] [Mon, 22 Apr 2019 22:54:51 +0000 (00:54 +0200)]
Bump capybara from 3.16.2 to 3.17.0 (#10602)
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.16.2 to 3.17.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.16.2...3.17.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
Fabian Schlenz [Mon, 22 Apr 2019 22:54:26 +0000 (00:54 +0200)]
Fixed Healthchecks in docker-compose.yml (#10553)
Thibaut Girka [Mon, 22 Apr 2019 17:10:00 +0000 (19:10 +0200)]
Do not leak local-only toots to remote mentioned users
Thibaut Girka [Thu, 4 Apr 2019 17:38:48 +0000 (19:38 +0200)]
Load custom CSS rules after standard ones
Fixes #933
Due to glitch-soc's theming system, JS and CSS files are imported in a slightly
different order, and custom CSS rules were loaded *before* everything else.
They will now be loaded *after* everything else, which is a bit different from
upstream but should work better overall.
Thibaut Girka [Sun, 21 Apr 2019 20:04:19 +0000 (22:04 +0200)]
Add support for lists in statuses
Thibaut Girka [Sun, 21 Apr 2019 19:44:31 +0000 (21:44 +0200)]
Do not switch to italic for status media buttons
Thibaut Girka [Wed, 17 Apr 2019 12:23:36 +0000 (14:23 +0200)]
Accept richer text from remote statuses
Support abbr, del, pre, blockquote, code, strong, b, em, i, and h1…h5
HTML elements in remote statuses, add corresponding CSS.
ThibG [Mon, 22 Apr 2019 21:06:54 +0000 (23:06 +0200)]
Merge pull request #1002 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
kedama [Mon, 22 Apr 2019 12:55:50 +0000 (21:55 +0900)]
[Glitch] Fix modal items cannot scroll on touch devices
Port
d763d39d2628bef123cdc801b2a3a3922b7e37f2 to glitch-soc
Thibaut Girka [Mon, 22 Apr 2019 18:40:04 +0000 (20:40 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
Upstream cleaned up a bit, including on lines in which
we replaced the hardcoded 500 character limit with a maxChar
constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
Moved upstream's new animated avatar hover handling in
app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
Upstream made repo URL configurable, did the same, but
default to glitch-soc
Thibaut Girka [Mon, 22 Apr 2019 13:41:40 +0000 (15:41 +0200)]
Fix ReferenceError in dropdown
Thibaut Girka [Sun, 21 Apr 2019 20:59:58 +0000 (22:59 +0200)]
Fix broken reference to handleSubmit
Thibaut Girka [Sun, 21 Apr 2019 17:07:48 +0000 (19:07 +0200)]
Cleanup
Thibaut Girka [Sun, 21 Apr 2019 16:48:33 +0000 (18:48 +0200)]
Move ComposerPublisher to Compose
Thibaut Girka [Sun, 21 Apr 2019 16:31:26 +0000 (18:31 +0200)]
Add OptionsContainer
Thibaut Girka [Sun, 21 Apr 2019 15:17:10 +0000 (17:17 +0200)]
Move composer Dropdown from features/composer to features/compose
Thibaut Girka [Sun, 21 Apr 2019 13:57:06 +0000 (15:57 +0200)]
Move ComposerTextareaIcons to TextareaIcons
Thibaut Girka [Sun, 21 Apr 2019 10:44:30 +0000 (12:44 +0200)]
ComposerTextarea → AutosuggestTextarea
Thibaut Girka [Sun, 21 Apr 2019 10:09:52 +0000 (12:09 +0200)]
ComposerUploadForm → UploadForm + UploadFormContainer
Thibaut Girka [Sat, 20 Apr 2019 21:27:20 +0000 (23:27 +0200)]
Move PollForm from features/composer to features/compose
Thibaut Girka [Sat, 20 Apr 2019 21:02:09 +0000 (23:02 +0200)]
Inline spoiler input