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
Marek Ľach
c008911249
New string added for Slovak translation ( #10637 )
5 years ago
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>
5 years ago
Eugen Rochko
e451ba0e83
Fix LDAP/PAM/SAML/CAS users not being approved instantly ( #10621 )
5 years ago
Eugen Rochko
f27d709351
Fix not being able to save e-mail preference for new pending accounts ( #10622 )
5 years ago
ThibG
852ccea676
Fix upload progressbar when image resizing is involved ( #10632 )
5 years ago
ThibG
b1a0322a06
Reject follow requests of blocked users ( #10633 )
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
Thibaut Girka
c3fa4e8e07
Fix ReferenceError in dropdown
5 years ago
Thibaut Girka
d779ec1f0e
Fix broken reference to handleSubmit
5 years ago
Thibaut Girka
e949861176
Cleanup
5 years ago
Thibaut Girka
faff152ae5
Move ComposerPublisher to Compose
5 years ago
Thibaut Girka
df951c319c
Add OptionsContainer
5 years ago
Thibaut Girka
14028655df
Move composer Dropdown from features/composer to features/compose
5 years ago
Thibaut Girka
4c6221929f
Move ComposerTextareaIcons to TextareaIcons
5 years ago
Thibaut Girka
47faf47ed5
ComposerTextarea → AutosuggestTextarea
5 years ago
Thibaut Girka
a243567a3e
ComposerUploadForm → UploadForm + UploadFormContainer
5 years ago
Thibaut Girka
c5f49a92dc
Move PollForm from features/composer to features/compose
5 years ago