545 Commits (th-downstream)

Author SHA1 Message Date
Thibaut Girka 412218af2e Merge branch 'master' into glitch-soc/merge-upstream
4 years ago
Eugen Rochko 79f71206de Add subresource integrity for JS and CSS assets (#15096)
4 years ago
Eugen Rochko 9b1f2a4b61
Add subresource integrity for JS and CSS assets (#15096)
4 years ago
Thibaut Girka 6fdc4e8d47 Merge branch 'master' into glitch-soc/merge-upstream
4 years ago
Thibaut Girka ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream
4 years ago
ThibG ce87767572 Change how CDN_HOST is passed down to make assets build reproducible (#14381)
4 years ago
ThibG 4c45b43cb8
Change how CDN_HOST is passed down to make assets build reproducible (#14381)
4 years ago
Thibaut Girka c2347f6cf6 Merge branch 'master' into glitch-soc/merge-upstream
4 years ago
Thibaut Girka e9ad99bc93 Merge branch 'master' into glitch-soc/merge-upstream
4 years ago
ThibG aa7142b9e2 Fix hashtag column options styling (#14247)
4 years ago
ThibG a783bdf4ad
Fix hashtag column options styling (#14247)
4 years ago
Thibaut Girka 4e4e5316c1 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Thibaut Girka 4a70792b4a Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ThibG b20d0db1eb Remove 'unsafe-inline' from Content-Security-Policy style-src (#13679)
5 years ago
ThibG e1629a7758
Remove 'unsafe-inline' from Content-Security-Policy style-src (#13679)
5 years ago
Thibaut Girka dfa13deaa1 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Thibaut Girka a22e6a3683 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ThibG 3b7373ed4c Fix end-user-facing uses of inline CSS (#13438)
5 years ago
ThibG 0e362b7678
Fix end-user-facing uses of inline CSS (#13438)
5 years ago
Thibaut Girka 2f49575839 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Thibaut Girka fdd0beefa7 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Leonie a1cc7b361c Fix API footer link in Web UI (#13441)
5 years ago
Leonie f6c18e8829
Fix API footer link in Web UI (#13441)
5 years ago
Thibaut Girka 1f7e7594db Merge branch 'master' into glitch-soc/master
5 years ago
Thibaut Girka 45709d6987 Merge branch 'master' into glitch-soc/master
5 years ago
Eugen Rochko e499b6ad7e Change reported media attachments to always be hidden in admin UI (#12879)
5 years ago
Eugen Rochko 1ded3bb752
Change reported media attachments to always be hidden in admin UI (#12879)
5 years ago
Thibaut Girka 82e197787f Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Thibaut Girka 980c004f06 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Sasha Sorokin fc0a089800 Rename page_heading_actions variable (#12799)
5 years ago
Sasha Sorokin 139f7646a7 Rename page_heading_actions variable (#12799)
5 years ago
Thibaut Girka fa4a92e340 Merge branch 'master' into glitch-soc/master
5 years ago
Thibaut Girka ab5ff638f2 Merge branch 'master' into glitch-soc/master
5 years ago
Sasha Sorokin 65b17826c9 Improve report page structure (#12615)
5 years ago
Sasha Sorokin 34aa5c7cb2 Improve report page structure (#12615)
5 years ago
Thibaut Girka cc94c90bf1 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 53ceb703b3 Fix page body not being scrollable in admin layout (#11893)
5 years ago
Eugen Rochko b9a8b38844
Fix page body not being scrollable in admin layout (#11893)
5 years ago
Thibaut Girka c060523dc2 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko a8d983934e Fix blurhash and autoplay not working on public pages (#11585)
5 years ago
Eugen Rochko e5cee8062f
Fix blurhash and autoplay not working on public pages (#11585)
5 years ago
Thibaut Girka 4973ba2d1f Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Thibaut Girka 24968d20a0 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 825dc3ca22 Add whitelist mode (#11291)
5 years ago
Eugen Rochko 24552b5160
Add whitelist mode (#11291)
5 years ago
Thibaut Girka 5a158899bc Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 73e610790e Change full logo to use primary text color of the given theme (#10994)
6 years ago
Eugen Rochko 20dda5cca0
Change full logo to use primary text color of the given theme (#10994)
6 years ago
Eugen Rochko 8bf8d6d9d9 Change preferences page into appearance, notifications, and other (#10977)
6 years ago
Eugen Rochko 1db4117030
Change preferences page into appearance, notifications, and other (#10977)
6 years ago
Thibaut Girka b9c5aed987 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 3d73d76e55 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko c5234ac2aa Use `<use />` to render transparent SVG logo instead of inserting it (#10845)
6 years ago
Eugen Rochko 8d5dcc9301
Use `<use />` to render transparent SVG logo instead of inserting it (#10845)
6 years ago
Thibaut Girka 2ad61962ae Load custom CSS rules after standard ones
6 years ago
Thibaut Girka 2db0506226 Load custom CSS rules after standard ones
6 years ago
Thibaut Girka eed61a37ec Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 4df3b7cb06 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi e0e72c90b6 Bump webpacker from 3.5.5 to 4.0.2 (#10277)
6 years ago
Yamagishi Kazutoshi 8347479f5d Bump webpacker from 3.5.5 to 4.0.2 (#10277)
6 years ago
Thibaut Girka 741766a01d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 73fb7bfa0f Admission-based registrations mode (#10250)
6 years ago
Eugen Rochko 51e154f5e8
Admission-based registrations mode (#10250)
6 years ago
Thibaut Girka d86033c352 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 02062aab55 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 56822606f4 Redesign landing page (#10232)
6 years ago
Eugen Rochko 65fffeac3f
Redesign landing page (#10232)
6 years ago
Thibaut Girka bb6edcfd1d Fix static error page to use the correct pack
6 years ago
Thibaut Girka cac75e01b8 Fix static error page to use the correct pack
6 years ago
Thibaut Girka da24c6aced Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 369a475a70 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 66758328ba Change error graphic to hover-to-play (#10055)
6 years ago
Eugen Rochko 80388a3ffe
Change error graphic to hover-to-play (#10055)
6 years ago
Thibaut Girka 2e964346ce Restore oops.gif animation for user who have auto_play_gif set
6 years ago
Thibaut Girka e8d5affe06 Restore oops.gif animation for user who have auto_play_gif set
6 years ago
Thibaut Girka 2059bbd0ed Replace animated oops.gif by a non-animated image
6 years ago
Thibaut Girka 0c2d48b60a Replace animated oops.gif by a non-animated image
6 years ago
Thibaut Girka 720cb01715 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 32bd452b56 Remove "most popular" tab from profile directory, add responsive design (#9539)
6 years ago
Eugen Rochko 087e118971
Remove "most popular" tab from profile directory, add responsive design (#9539)
6 years ago
Thibaut Girka 04204427d0 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 0686523e18 Add instance-wide setting to disable profile directory (#9497)
6 years ago
ThibG 720daa8143 Add instance-wide setting to disable profile directory (#9497)
6 years ago
Thibaut Girka b62953b3d2 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko fd8ca11f19 Add profile directory (#9427)
6 years ago
Eugen Rochko 73be8f38c1
Add profile directory (#9427)
6 years ago
Thibaut Girka c32a5f86b6 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 5bb8563f6c Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi cad03e69b3 Set @body_classes to admin layout (#9081)
6 years ago
Yamagishi Kazutoshi e8ffecbd36 Set @body_classes to admin layout (#9081)
6 years ago
Thibaut Girka 46259a36d0 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 3ede0e8b95 Fix missing protocol in dns-prefetch, improve code style (#8963)
6 years ago
Eugen Rochko 22de24b8ca
Fix missing protocol in dns-prefetch, improve code style (#8963)
6 years ago
Thibaut Girka 70a7f72fda Merge commit '0167397218110e26300bbc6891bc4b1849add083' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 8f720be9f3 Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko c227151023 Add dns-prefetch if using different host for assets or uploads (#8942)
6 years ago
Eugen Rochko da7705b274
Add dns-prefetch if using different host for assets or uploads (#8942)
6 years ago
Thibaut Girka bdbbbb1bdb Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 611740ce81 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 7635a136c9 Change documentation URL (#8898)
6 years ago
Eugen Rochko 28401962ca Change documentation URL (#8898)
6 years ago
Eugen Rochko ad0670fe87 Revert Font Awesome 5 upgrade (#8810)
6 years ago
Eugen Rochko 3d7f68c273
Revert Font Awesome 5 upgrade (#8810)
6 years ago
mayaeh 84bcf89764 Update the icon name changed by the Font Awesome 5. (#8776)
6 years ago
mayaeh 17af4d27da Update the icon name changed by the Font Awesome 5. (#8776)
6 years ago
Thibaut Girka 4dd208f482 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka cd99255698 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 72a8ca84e0 Add force_login option to OAuth authorize page (#8655)
6 years ago
Eugen Rochko 2288d50a7b
Add force_login option to OAuth authorize page (#8655)
6 years ago
Thibaut Girka ae4240d236 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 36393e1d2b Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 660475198b Add theme identifier to body classes for easier custom CSS styling (#8439)
6 years ago
Eugen Rochko 22e46ebad8
Add theme identifier to body classes for easier custom CSS styling (#8439)
6 years ago
Thibaut Girka 69212ed0ad Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 94b7dddeac Add admin custom CSS setting (#8399)
6 years ago
Eugen Rochko a2cabf3f4a
Add admin custom CSS setting (#8399)
6 years ago
Eugen Rochko 0c6c9b733a When registrations closed, link "Sign up" to joinmastodon.org (#8395)
6 years ago
Eugen Rochko 69ba8f063c
When registrations closed, link "Sign up" to joinmastodon.org (#8395)
6 years ago
Thibaut Girka 3209b431f2 Fix locale packs loading in embed layout
6 years ago
Thibaut Girka f34616eec1 Fix locale packs loading in embed layout
6 years ago
Thibaut Girka c043697caa Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 88a0395a58 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 85990d2886 Link to mobile apps page (#8278)
6 years ago
Eugen Rochko 0fc0980de1
Link to mobile apps page (#8278)
6 years ago
Thibaut Girka 767cc06fe2 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka bfeac6747a Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 273e8f0474 Add remote interaction dialog for toots (#8202)
6 years ago
Eugen Rochko 78fa926ed5
Add remote interaction dialog for toots (#8202)
6 years ago
Thibaut Girka 1159490f00 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 13df3889f0 Redesign public profiles and toots (#8068)
6 years ago
Eugen Rochko bb71538bb5
Redesign public profiles and toots (#8068)
6 years ago
Thibaut Girka 574e74bbdd Hardcode default skin/theme in error layout (fixes #373)
7 years ago
Thibaut Girka e8a9627f66 Hardcode default skin/theme in error layout (fixes #373)
7 years ago
Thibaut Girka c384e0f3de Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Thibaut Girka b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 95385ebe3e In footer, replace text "Mastodon" with logo (#7545)
7 years ago
Eugen Rochko 93c66f0c03
In footer, replace text "Mastodon" with logo (#7545)
7 years ago
David Yip 3c3e6d0e9b Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
David Yip e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko aeceb63275 Add preference to hide following/followers lists (#7532)
7 years ago
Eugen Rochko 1e02dc8715
Add preference to hide following/followers lists (#7532)
7 years ago
Jenkins 828d10c327 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Jenkins a0724cd742 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko a9d7b3f7a3 Fix #6717: Do not double html-encode page titles (#6720)
7 years ago
Eugen Rochko 4476a45444
Fix #6717: Do not double html-encode page titles (#6720)
7 years ago
Jenkins 54608d0486 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Jenkins 447d7e6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 83384e5390 Add missing meta description to profiles, some other SEO stuff (#6706)
7 years ago
Eugen Rochko ff44b2e92d
Add missing meta description to profiles, some other SEO stuff (#6706)
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko 51e1e65c84 Fix container regression (#6531)
7 years ago
Eugen Rochko 5f3bee345d
Fix container regression (#6531)
7 years ago
David Yip 87517e2dd8 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
David Yip f4b2478af1
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 6278ffdba3 Add direction tags to HTML e-mails for RTL languages (#6373)
7 years ago
Eugen Rochko 79bc3d5845
Add direction tags to HTML e-mails for RTL languages (#6373)
7 years ago
David Yip 03f157f6da Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
David Yip 071c2c9c85
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 896cadceed Improve HTML e-mails based on Litmus tests (#6301)
7 years ago
Eugen Rochko 872a0d5bd8
Improve HTML e-mails based on Litmus tests (#6301)
7 years ago
David Yip d45ebe26dc Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
David Yip 2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko b0f2bff481 Replace tutorial modal with welcome e-mail (#6273)
7 years ago
Eugen Rochko d799921c75
Replace tutorial modal with welcome e-mail (#6273)
7 years ago
Jenkins 8c41fb4acc Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Jenkins aa2bf07281 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi d60d5fbd26 Change image URL in mailer to full path (#6264)
7 years ago
Yamagishi Kazutoshi 9a28052e92 Change image URL in mailer to full path (#6264)
7 years ago
kibi! be525dd4db Fix mailer to use webpack core
7 years ago
kibi! cda845ae0e Fix mailer to use webpack core
7 years ago
David Yip de7283a318 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Yip 89a9d629f7
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 9613c3238c HTML e-mails for UserMailer (#6256)
7 years ago
Eugen Rochko 5276c0a090
HTML e-mails for UserMailer (#6256)
7 years ago
Jenkins b42e6973a1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Jenkins 933840bebf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Otakan 1cd5812c6b delete X-UA-Compatible (#6068)
7 years ago
Otakan ce854ed506 delete X-UA-Compatible (#6068)
7 years ago
David Yip ed572490c1 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
David Yip 54148b9a4a
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Akihiko Odaki 616b6867a0 Show mastodon on modal (#6129)
7 years ago
Akihiko Odaki 2c1ed5f872 Show mastodon on modal (#6129)
7 years ago
Jenkins 503e7fb4d8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Jenkins f77c47d01b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Nolan Lawson 59a50e6489 Reduce motion for boost animation (#5871)
7 years ago
Nolan Lawson a8eb0bf44f Reduce motion for boost animation (#5871)
7 years ago
kibigo! 853082e760 Only localize js when there's a theme
7 years ago
kibigo! 1c728df92e Only localize js when there's a theme
7 years ago
kibigo! 99e8710095 Javascript intl8n flavour support
7 years ago