Thibaut Girka
2c2f649200
Fix CSP when PAPERCLIP_ROOT_URL is set to a different host
5 years ago
Thibaut Girka
58720aa2bd
Fix CSP when dealing with S3 hosts
5 years ago
Thibaut Girka
9f25ab9792
Fix polls icon not showing in CW button in detailed statuses
5 years ago
Thibaut Girka
7617f78359
Fix crash in onboarding modal
Fixes #1027
5 years ago
Thibaut Girka
fcbf557bd2
Add site-wide options to show reblogs and replies in local/public timelines
Fixes #1021
5 years ago
Thibaut Girka
cc5a81b7d8
Make hi-color privacy icons opt-in instead of opt-out
5 years ago
Thibaut Girka
ac54292d69
Add high color privacy icons
Fixes #1015
5 years ago
Zac
be6ef1947e
changed pinned status count operator
changed default pinned count to 5 to preserve default behavior
5 years ago
Zac
5616200ed4
added documentation into .env.production.sample
moved max pin count into constant
5 years ago
Zac
a36affb9d6
add env var for max pinned toots
5 years ago
Thibaut Girka
d4c95e6a8a
When selecting a toot via keyboard, ensure it is scrolled into view
Fixes detailed status column
5 years ago
Thibaut Girka
3e095cab83
Add support for missing formatting tags
5 years ago
Thibaut Girka
67fb9a8679
Add keyboard shortcut to collapse/uncollapse toots
5 years ago
Thibaut Girka
f3acf8f414
Add hotkey for bookmarking a toot
5 years ago
Thibaut Girka
cd9a284702
Fix regression with textarea's caret position when selecting a suggestion
5 years ago
Thibaut Girka
aa1832ac4d
Hide suggestions by default
They will be enabled if the input has focus
5 years ago
Thibaut Girka
fddd8251dd
Attempt to fix CSS
5 years ago
Thibaut Girka
d7e4be285a
Add emoji suggestion to poll options
5 years ago
Thibaut Girka
df52004fe6
Add suggestions in CW field
5 years ago
Thibaut Girka
3a671470ec
Refactor selectComposeSuggestion so that different paths can be updated
5 years ago
Thibaut Girka
1c0402c103
Do not ask to register web intent handler
5 years ago
Thibaut Girka
b13c90f3e3
Fix color of muted statuses content not wrapped in a p tag
5 years ago
Thibaut Girka
e4b65e6349
Redesign blockquote styling
5 years ago
Thibaut Girka
8753e5317f
Better distinguish titles from text
5 years ago
Thibaut Girka
3631c3314a
Remove extra margin in paragraphs inside blockquotes
5 years ago
Thibaut Girka
9b86707b1e
Make bold text bolder
5 years ago
Thibaut Girka
5a8495dabe
Remove margins around `p` tags in lists
5 years ago
Thibaut Girka
ef249a2718
Rename status__text to status__content__text for consistency with upstream
5 years ago
Thibaut Girka
adbb174c9c
Fix status header display in toot mobile menu
5 years ago
Thibaut Girka
ef1504d625
Fix upload progressbar when image resizing is involved
5 years ago
Thibaut Girka
ffab9d626a
Hide media upload form if no media are attached
5 years ago
ThibG
9add18604c
Merge pull request #1007 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
5 years ago
Thibaut Girka
7783ec921b
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Thibaut Girka
416aa832e5
Fix file upload
5 years ago
Thibaut Girka
3d722b0c4e
Fix settings modal
5 years ago
dependabot[bot]
80bbf40ff1
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>
5 years ago
dependabot[bot]
db61383f82
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>
5 years ago
Eugen Rochko
8a0d677cde
Fix stoplight logging to stderr separate from Rails logger ( #10624 )
5 years ago
Eugen Rochko
041fb0e840
Fix sign up button not saying sign up when invite is used ( #10623 )
Fix #10616
5 years ago
dependabot[bot]
f99bfb9496
[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>
5 years ago
dependabot[bot]
703cdf2a0c
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>
5 years ago
Fabian Schlenz
50b36ef59d
Fixed Healthchecks in docker-compose.yml ( #10553 )
5 years ago
Thibaut Girka
08afd6b69c
Do not leak local-only toots to remote mentioned users
5 years ago
Thibaut Girka
2db0506226
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.
5 years ago
Thibaut Girka
27e8354914
Add support for lists in statuses
5 years ago
Thibaut Girka
659f972bed
Do not switch to italic for status media buttons
5 years ago
Thibaut Girka
2e3640ecbb
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.
5 years ago
ThibG
91a74ea86b
Merge pull request #1002 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
5 years ago
kedama
039e35560c
[Glitch] Fix modal items cannot scroll on touch devices
Port d763d39d26
to glitch-soc
5 years ago
Thibaut Girka
a9eaa780f5
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
5 years ago