ThibG
140be28787
Reject follow requests of blocked users ( #10633 )
2019-04-25 02:47:33 +02:00
ThibG
b1a0322a06
Reject follow requests of blocked users ( #10633 )
2019-04-25 02:47:33 +02:00
Thibaut Girka
642a298ceb
Do not ask to register web intent handler
2019-04-24 23:05:11 +02:00
Thibaut Girka
1c0402c103
Do not ask to register web intent handler
2019-04-24 23:05:11 +02:00
Thibaut Girka
8942036345
Fix color of muted statuses content not wrapped in a p tag
2019-04-24 22:40:17 +02:00
Thibaut Girka
b13c90f3e3
Fix color of muted statuses content not wrapped in a p tag
2019-04-24 22:40:17 +02:00
Thibaut Girka
73f83ef399
Redesign blockquote styling
2019-04-24 22:40:17 +02:00
Thibaut Girka
e4b65e6349
Redesign blockquote styling
2019-04-24 22:40:17 +02:00
Thibaut Girka
f5ea016889
Better distinguish titles from text
2019-04-24 22:40:17 +02:00
Thibaut Girka
8753e5317f
Better distinguish titles from text
2019-04-24 22:40:17 +02:00
Thibaut Girka
8003dd8849
Remove extra margin in paragraphs inside blockquotes
2019-04-24 22:40:17 +02:00
Thibaut Girka
3631c3314a
Remove extra margin in paragraphs inside blockquotes
2019-04-24 22:40:17 +02:00
Thibaut Girka
a855f38086
Make bold text bolder
2019-04-24 22:40:17 +02:00
Thibaut Girka
9b86707b1e
Make bold text bolder
2019-04-24 22:40:17 +02:00
Thibaut Girka
ad30895262
Remove margins around p
tags in lists
2019-04-24 22:40:17 +02:00
Thibaut Girka
5a8495dabe
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
ef249a2718
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
adbb174c9c
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
ef1504d625
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
Thibaut Girka
ffab9d626a
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
ThibG
9add18604c
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
7783ec921b
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
416aa832e5
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
Thibaut Girka
3d722b0c4e
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]
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>
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
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>
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
8a0d677cde
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
Eugen Rochko
041fb0e840
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]
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>
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
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>
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
Fabian Schlenz
50b36ef59d
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
08afd6b69c
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
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.
2019-04-22 23:07:27 +02:00