3631c3314a
Remove extra margin in paragraphs inside blockquotes
6 years ago
9b86707b1e
Make bold text bolder
6 years ago
5a8495dabe
Remove margins around `p` tags in lists
6 years ago
ef249a2718
Rename status__text to status__content__text for consistency with upstream
6 years ago
adbb174c9c
Fix status header display in toot mobile menu
6 years ago
ef1504d625
Fix upload progressbar when image resizing is involved
6 years ago
ffab9d626a
Hide media upload form if no media are attached
6 years ago
9add18604c
Merge pull request #1007 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
7783ec921b
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
416aa832e5
Fix file upload
6 years ago
3d722b0c4e
Fix settings modal
6 years ago
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>
6 years ago
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>
6 years ago
8a0d677cde
Fix stoplight logging to stderr separate from Rails logger ( #10624 )
6 years ago
041fb0e840
Fix sign up button not saying sign up when invite is used ( #10623 )
...
Fix #10616
6 years ago
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>
6 years ago
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>
6 years ago
50b36ef59d
Fixed Healthchecks in docker-compose.yml ( #10553 )
6 years ago
08afd6b69c
Do not leak local-only toots to remote mentioned users
6 years ago
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.
6 years ago
27e8354914
Add support for lists in statuses
6 years ago
659f972bed
Do not switch to italic for status media buttons
6 years ago
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.
6 years ago
91a74ea86b
Merge pull request #1002 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
039e35560c
[Glitch] Fix modal items cannot scroll on touch devices
...
Port d763d39d26
6 years ago
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
6 years ago
c3fa4e8e07
Fix ReferenceError in dropdown
6 years ago
d779ec1f0e
Fix broken reference to handleSubmit
6 years ago
e949861176
Cleanup
6 years ago
faff152ae5
Move ComposerPublisher to Compose
6 years ago
df951c319c
Add OptionsContainer
6 years ago
14028655df
Move composer Dropdown from features/composer to features/compose
6 years ago
4c6221929f
Move ComposerTextareaIcons to TextareaIcons
6 years ago
47faf47ed5
ComposerTextarea → AutosuggestTextarea
6 years ago
a243567a3e
ComposerUploadForm → UploadForm + UploadFormContainer
6 years ago
c5f49a92dc
Move PollForm from features/composer to features/compose
6 years ago
f1a22e33e2
Inline spoiler input
6 years ago
8fd599fb40
ComposerReply → ReplyIndicator
6 years ago
f72af5794d
Refactor Compose*Warning → ContainerWarning
...
Regression: only one warning at a time
6 years ago
1bc4b8a0a5
features/composer/index.js → ComposeForm
6 years ago
281a82d878
DrawerHeader → Header + HeaderContainer
6 years ago
9a2f10fe8b
DrawerAccount → NavigationBar + NavigationContainer
6 years ago
9b9816aba6
[Glitch] Show suggested follows on search screen in mobile layout
...
Port ad510db3a1
6 years ago
149aa07409
DrawerResults → SearchResults + SearchResultsContainer
6 years ago
67771e6d65
Rework DrawerResults to make them closer to upstream
6 years ago
ab3e8fc542
Move DrawerSearch to Search + SearchContainer
6 years ago
c92ab35b19
Inline DrawerSearchPopout in DrawerSearch
6 years ago
c19b983986
Refactor a bit DrawerSearch to make it closer to upstream
6 years ago
eed2c9dd44
Rename flavours/glitch/features/drawer to flavours/glitch/features/compose
6 years ago
fd9f5a467f
Bump aws-sdk-s3 from 1.36.0 to 1.36.1 ( #10618 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.36.0 to 1.36.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.36.0...v1.36.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
Thibaut Girka
dependabot[bot]
Eugen Rochko
Fabian Schlenz
kedama