Thibaut Girka
ad30895262
Remove margins around p
tags in lists
2019-04-24 22:40:17 +02:00
Thibaut Girka
ce2da44c2c
Rename status__text to status__content__text for consistency with upstream
2019-04-24 22:40:17 +02:00
Thibaut Girka
facc95f71a
Fix status header display in toot mobile menu
2019-04-24 20:21:19 +02:00
Thibaut Girka
b43cfd3eb3
Fix upload progressbar when image resizing is involved
2019-04-24 20:19:23 +02:00
Thibaut Girka
4a95bfe919
Hide media upload form if no media are attached
2019-04-24 19:47:11 +02:00
ThibG
0ffd5fdd2c
Merge pull request #1007 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-04-24 19:42:33 +02:00
Thibaut Girka
0f97c82eac
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-24 15:25:22 +02:00
Thibaut Girka
07367bc6ec
Fix file upload
2019-04-24 07:57:28 +02:00
Thibaut Girka
86108e7af7
Fix settings modal
2019-04-23 18:31:13 +02:00
dependabot[bot]
d5d779cd34
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>
2019-04-23 16:39:06 +02:00
dependabot[bot]
795f2a7c8f
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>
2019-04-23 18:53:52 +09:00
Eugen Rochko
55449c0b41
Fix stoplight logging to stderr separate from Rails logger ( #10624 )
2019-04-23 04:39:48 +02:00
Eugen Rochko
72f3242a59
Fix sign up button not saying sign up when invite is used ( #10623 )
...
Fix #10616
2019-04-23 04:39:21 +02:00
dependabot[bot]
7ea37bbdc8
[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>
2019-04-23 10:02:58 +09:00
dependabot[bot]
907415ac08
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>
2019-04-23 00:54:51 +02:00
Fabian Schlenz
2d6fd9197b
Fixed Healthchecks in docker-compose.yml ( #10553 )
2019-04-23 00:54:26 +02:00
Thibaut Girka
2d2eca5bda
Do not leak local-only toots to remote mentioned users
2019-04-22 23:37:50 +02:00
Thibaut Girka
2ad61962ae
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.
2019-04-22 23:07:27 +02:00
Thibaut Girka
9aeb714b7a
Add support for lists in statuses
2019-04-22 23:07:14 +02:00
Thibaut Girka
fea727c61a
Do not switch to italic for status media buttons
2019-04-22 23:07:14 +02:00
Thibaut Girka
22ad8c89b2
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.
2019-04-22 23:07:14 +02:00
ThibG
b2f73231a4
Merge pull request #1002 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-04-22 23:06:54 +02:00
kedama
4ce6358787
[Glitch] Fix modal items cannot scroll on touch devices
...
Port 92ced1e94b
to glitch-soc
2019-04-22 22:57:39 +02:00
Thibaut Girka
6f85bb754b
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
2019-04-22 20:40:04 +02:00
Thibaut Girka
1b8d2af1f9
Fix ReferenceError in dropdown
2019-04-22 20:15:47 +02:00
Thibaut Girka
25cfabce26
Fix broken reference to handleSubmit
2019-04-22 20:15:47 +02:00
Thibaut Girka
041e27bd2d
Cleanup
2019-04-22 20:15:47 +02:00
Thibaut Girka
2ee26ba420
Move ComposerPublisher to Compose
2019-04-22 20:15:47 +02:00
Thibaut Girka
bf8b0394b7
Add OptionsContainer
2019-04-22 20:15:47 +02:00
Thibaut Girka
ef17da32f9
Move composer Dropdown from features/composer to features/compose
2019-04-22 20:15:47 +02:00
Thibaut Girka
a6bb49adf1
Move ComposerTextareaIcons to TextareaIcons
2019-04-22 20:15:47 +02:00
Thibaut Girka
08faf16d66
ComposerTextarea → AutosuggestTextarea
2019-04-22 20:15:47 +02:00
Thibaut Girka
513547ba57
ComposerUploadForm → UploadForm + UploadFormContainer
2019-04-22 20:15:47 +02:00
Thibaut Girka
f7d1772fc8
Move PollForm from features/composer to features/compose
2019-04-22 20:15:47 +02:00
Thibaut Girka
2021f14e8f
Inline spoiler input
2019-04-22 20:15:47 +02:00
Thibaut Girka
3529f6f4ae
ComposerReply → ReplyIndicator
2019-04-22 20:15:47 +02:00
Thibaut Girka
ad6166f0ef
Refactor Compose*Warning → ContainerWarning
...
Regression: only one warning at a time
2019-04-22 20:15:47 +02:00
Thibaut Girka
5e4588524b
features/composer/index.js → ComposeForm
2019-04-22 20:15:47 +02:00
Thibaut Girka
8ea0e64864
DrawerHeader → Header + HeaderContainer
2019-04-22 20:15:47 +02:00
Thibaut Girka
2f2381a400
DrawerAccount → NavigationBar + NavigationContainer
2019-04-22 20:15:47 +02:00
Eugen Rochko
7acc035cbe
[Glitch] Show suggested follows on search screen in mobile layout
...
Port 541fda5fc8
to glitch-soc
2019-04-22 20:15:47 +02:00
Thibaut Girka
4aee182cd3
DrawerResults → SearchResults + SearchResultsContainer
2019-04-22 20:15:47 +02:00
Thibaut Girka
7c2cc9d681
Rework DrawerResults to make them closer to upstream
2019-04-22 20:15:47 +02:00
Thibaut Girka
5264424b71
Move DrawerSearch to Search + SearchContainer
2019-04-22 20:15:47 +02:00
Thibaut Girka
7fa3320516
Inline DrawerSearchPopout in DrawerSearch
2019-04-22 20:15:47 +02:00
Thibaut Girka
a55e1c1d49
Refactor a bit DrawerSearch to make it closer to upstream
2019-04-22 20:15:47 +02:00
Thibaut Girka
e41c4ad61b
Rename flavours/glitch/features/drawer to flavours/glitch/features/compose
2019-04-22 20:15:47 +02:00
dependabot[bot]
e9cae29819
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>
2019-04-22 15:03:20 +02:00
dependabot[bot]
824a8598ce
Bump doorkeeper from 5.0.2 to 5.1.0 ( #10598 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.0.2...v5.1.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-22 15:02:59 +02:00
ThibG
eb80c3924f
Allow switching between singe-option and multiple-option polls ( #10603 )
2019-04-22 14:56:14 +02:00