948 Commits (bb1103d9742f088252f8156968a474ca8a58b087)

Author SHA1 Message Date
Eugen Rochko 07176fed37
Add contact account to landing page ("Administered by") (#6984)
7 years ago
Jenkins 6611100480 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith e85cffb236 Feature: Report improvements (#6967) (#7000)
7 years ago
Emelia Smith e7a1716701 Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)
7 years ago
David Yip eb39db7f93
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Underwood 123a343d11 [WIP] Enable custom emoji on account pages and in the sidebar (#6124)
7 years ago
Jenkins 837b3804bf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki fa310695fa Note if the user is already following the target when authorizing follow (#6325)
7 years ago
Jeroen 580835ab69 Invites: Add '1 week' as expire option (#6872)
7 years ago
Jenkins df70571bfe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 6b76a6212d Display content warning in mail notification emails (#6832)
7 years ago
ThibG 357f9298bd Fix e-mail changed notification (fixes #6778) (#6835)
7 years ago
David Yip ab04be2f84
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko a568e3ca8e
Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)
7 years ago
Jenkins d75a6054a0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 8bf3e750ab
Fix #6757: Adjust RTL styles for landing page (#6768)
7 years ago
Jenkins a0724cd742 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 4476a45444
Fix #6717: Do not double html-encode page titles (#6720)
7 years ago
Jenkins 447d7e6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko ff44b2e92d
Add missing meta description to profiles, some other SEO stuff (#6706)
7 years ago
Eugen Rochko 5acd5315f2
Improve styling of closed registrations message, rename button (#6695)
7 years ago
Eugen Rochko 8de048fcdb
In wide layout, columnize Mastodon features on landing page (#6674)
7 years ago
vpzomtrrfrt e26d5ca923 Don't escape statuses while truncating (#6671)
7 years ago
Sylvhem cb74c0cfe4 Add headings to the security settings page (#6661)
7 years ago
Eugen Rochko b66ec3bf95
Fix #6611: Typo in change password template (#6616)
7 years ago
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 036dd98abb
Responsively enforce 16:9 ratio on all media thumbnails in web UI (#6590)
7 years ago
Eugen Rochko 473a69ab18
Fix margin on top action button, fix width of counters on frontpage (#6573)
7 years ago
Eugen Rochko 47bdb9b33b
Fix #942: Seamless LDAP login (#6556)
7 years ago
Lynx Kotoura 7150f2e9d3 Grid layout for tag pages (#6545)
7 years ago
Lynx Kotoura a40167cf4d Better grid layout for the landing page (#6543)
7 years ago
Eugen Rochko 18513a978a
Improve public account cards (#6559)
7 years ago
Ian McCowan c33931b613 Fix prev/next links on public profile page (#6497)
7 years ago
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko 5f3bee345d
Fix container regression (#6531)
7 years ago
Eugen Rochko c71aa468b5
Redesign landing page (again) (#6486)
7 years ago
Eugen Rochko 61ed133fea
Account archive download (#6460)
7 years ago
David Yip 3d033a4687
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 9dbae6e8a1
Save video metadata and improve video OpenGraph tags (#6481)
7 years ago
Eugen Rochko 1122579216
Do not hide NSFW media/CW'd text in OpenGraph tags (#6479)
7 years ago
Jenkins efc9ffcb80 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 411c9ecb4b Fix password recovery (#6459)
7 years ago
David Yip 020b40efdb
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 76f3d5d16b
Add preference to always display sensitive media (#6448)
7 years ago
David Yip a6fb1c58ee
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Renato "Lond" Cerqueira 4e4f1b0dcb Add option to show only local toots in timeline preview (#6292)
7 years ago
Eugen Rochko 26f21fd5a0
CAS + SAML authentication feature (#6425)
7 years ago
David Yip 4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Charlotte Fields af40824998 moved save button (#3792)
7 years ago
Akihiko Odaki 5da5c65db8 Unify links container implementation in about pages (#6382)
7 years ago
Alexander 04fef7b888 pam authentication (#5303)
7 years ago
David Yip f4b2478af1
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 79bc3d5845
Add direction tags to HTML e-mails for RTL languages (#6373)
7 years ago
Jenkins 0e10667fbe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 4ec9d8b4d9 Display deleted users' role as “Suspended” (#6339)
7 years ago
Akihiko Odaki 8cc65cde27 Resolve URL for local account in follow authorization success view (#6324)
7 years ago
David Yip 1253279feb
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 1287de1b83
Fix invalid value passed to full_asset_url in mailers (#6312)
7 years ago
David Yip 2c578a01d8
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Iijima Yasushi 72f9eab3d6 Change mailer avatar url (#6309)
7 years ago
David Yip 071c2c9c85
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 872a0d5bd8
Improve HTML e-mails based on Litmus tests (#6301)
7 years ago
Eugen Rochko 01421999ae
Make text e-mails consistent with HTML ones in UserMailer (#6291)
7 years ago
David Yip 2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko d799921c75
Replace tutorial modal with welcome e-mail (#6273)
7 years ago
Jenkins aa2bf07281 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
mayaeh eed7484cd6 Change mailer image url (#6279)
7 years ago
Eugen Rochko 02194838dd
HTML e-mails for NotificationMailer (#6263)
7 years ago
Yamagishi Kazutoshi 9a28052e92 Change image URL in mailer to full path (#6264)
7 years ago
kibi! cda845ae0e Fix mailer to use webpack core
7 years ago
David Yip 89a9d629f7
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 5276c0a090
HTML e-mails for UserMailer (#6256)
7 years ago
Jenkins 9fa79bc317 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Jeong Arm 704053d221 Handle sessions that can't be translated (#6245)
7 years ago
David Yip 991371af5f
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko d41f0b66cc
Fix #6204: Use content warning for page title when present (#6231)
7 years ago
kibigo! 44792de49a Don't show skins selector when there's only one (#256)
7 years ago
Jenkins f839ac694c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko dbda87c31f
Revert #5772 (#6221)
7 years ago
Jenkins c2e1bfd9ae Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC c4d36d024c Update Simplified Chinese translations (#6215)
7 years ago
Jenkins f6adb409fd Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quenty31 06636c6eca l10n Occitan language: mailer update (#6193)
7 years ago
Jenkins fc884d015a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 161c72d66d Allow to dereference Follow object for ActivityPub (#5772)
7 years ago
Marcin Mikołajczak 53d99ebf4f i18n: Update Polish translation (#6168)
7 years ago
Yamagishi Kazutoshi 1001922156
Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167)
7 years ago
Jenkins 933840bebf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 04ecf44c2f Add confirmation step for email changes (#6071)
7 years ago
Otakan ce854ed506 delete X-UA-Compatible (#6068)
7 years ago
Branko Kokanovic 21b9da6418 Adding Serbian latin translations (#6146)
7 years ago
David Yip 54148b9a4a
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Akihiko Odaki 2c1ed5f872 Show mastodon on modal (#6129)
7 years ago
Jenkins fa9b7ece2e Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Branko Kokanovic 7d376e41be Adding Serbian translation (#6133)
7 years ago
David Yip 4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
beatrix a56c4742d3 keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)
7 years ago
Eugen Rochko 38fc1b498d
Add more instance stats APIs (#6125)
7 years ago
Jenkins f77c47d01b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Nolan Lawson a8eb0bf44f Reduce motion for boost animation (#5871)
7 years ago
Jenkins 6d00ca1c71 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 6eb60260b1 Display deleted users' role as “Suspended” (#6080)
7 years ago
Jenkins 82236a3703 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko ad75ec8b5b
Add filters to admin UI for custom emojis (#6003)
7 years ago
Eugen Rochko 20a6584d2d
Clean up admin UI for accounts (#6004)
7 years ago
David Yip a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 30d2ea03b0
Improve public status page title (#5985)
7 years ago
kibigo! ed7231947c Added styling
7 years ago
kibigo! bdca1614d5 Screenshot support for themes
7 years ago
kibigo! dabf66e676 Moved flavour UI into own prefs tab
7 years ago
cwm 072ab191cc pulled master, moved locale entry to new location
7 years ago
kibigo! 1c728df92e Only localize js when there's a theme
7 years ago
kibigo! b28cd6769c Javascript intl8n flavour support
7 years ago
kibigo! d08d0f9f33 Ruby intl8n for themes
7 years ago
cwm abe95b614b add initial components based off of tootsuite pr #1507
7 years ago
Yamagishi Kazutoshi 931e66e572 Back to Web UI from tag page when signed in (#5943)
7 years ago
Eugen Rochko 70ce2a2095
Polish video player CSS, add timer on fullscreen/modal/public pages (#5928)
7 years ago
beatrix 81b0145759
Merge pull request #229 from glitch-soc/glitch-theme
7 years ago
Jenkins 8ca91cef45 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 42bcbd36b7 Remove rabl dependency (#5894)
7 years ago
kibigo! 5bed0f10ed Various fixes
7 years ago
David Yip a807e3b71b
current_theme -> current_flavour (#229)
7 years ago
David Yip d9800a5647
Merge branch 'gs-master' into glitch-theme
7 years ago
kibigo! 1c74ede69e Fixed a name + localizations
7 years ago
kibigo! bc4fa6b198 Rename themes -> flavours ? ?
7 years ago
Jenkins 933eafdcd3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 74320971e2 Add invite filter (#5862)
7 years ago
Yamagishi Kazutoshi eee3b32b77 Fix invites form path (#5861)
7 years ago
Yamagishi Kazutoshi df03042a6e Allow admin to deactivate invite created by users (#5860)
7 years ago
kibigo! 541fe9b110 Skins support
7 years ago
David Yip 95c270f5b1
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi 15fab79cfa Show "expired" in invite index (#5838)
7 years ago
David Yip 7463d80ff4
Merge remote-tracking branch 'tootsuite/master'
7 years ago
Eugen Rochko 706e534455
Add UI for setting up account migration (#5832)
7 years ago
David Yip e77c3996a5
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi 1c5b0e3334 Use account.username when display_name is empty (#5828)
7 years ago
Eugen Rochko 740f8a95a9
Add consumable invites (#5814)
7 years ago
Jenkins 5de42665d7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Alda Marteau-Hardi 0ea4478b68 Use account.display_name for og:title single toot pages (#5821)
7 years ago
Jenkins 167fe2ab08 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko e84fecb7e9
Add logging of admin actions (#5757)
7 years ago
kibigo! 8812bab687 Minor fixes
7 years ago
kibigo! bdbbd06dad Finalized theme loading and stuff
7 years ago
David Yip d083f7741a Merge remote-tracking branch 'tootsuite/master'
7 years ago
Yamagishi Kazutoshi bfdcf76a64 Add “staff” badge to admin user pages (#5735)
7 years ago
Eugen Rochko 58cede4808
Profile redirect notes (#5746)
7 years ago
Jenkins 94c5a11cda Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
unarist e28b33c89c Move "Permissions" row into main table in /admin/accounts/:id (#5734)
7 years ago
kibigo! 585758a373 Themed prefetching
7 years ago
David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ysksn 9dd5e329ab Remove empty strings (#5732)
7 years ago
Eugen Rochko 2151fd3150
Display moderator badge (green), admin badge changed to red (#5728)
7 years ago
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936
7 years ago
Eugen Rochko fbef909c2a
Add option to block direct messages from people you don't follow (#5669)
7 years ago
Anna e só 0e6c4cb796 l10n: PT-BR translation updated (#5681)
7 years ago
Eugen Rochko 7bb8b0b2fc
Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
Quenty31 eb97bd8af6 i10n OC: Memorial (#5615) + #5467 (#5623)
7 years ago
Eugen Rochko 1032f3994f
Add ability to disable login and mark accounts as memorial (#5615)
7 years ago
nullkal b6e2e999bd Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467)
7 years ago
MitarashiDango 38d072446b add account search condition (instance domain) (#5577)
7 years ago
Nolan Lawson 0692991b54 Add ServiceWorker caching for static assets (#5524)
7 years ago
SerCom_KC 29609fbb6a Updating Chinese (Simplified) translations (#5508)
7 years ago
Nolan Lawson 3de22a82bf Refactor initial state: reduce_motion and auto_play_gif (#5501)
7 years ago
David Yip 870d71b78b Merge branch 'master' into gs-master
7 years ago
nullkal 781105293c Feature: Unlisted custom emojis (#5485)
7 years ago
beatrix a2612d0d38 Merge pull request #179 from glitch-soc/keyword-mute
7 years ago
David Yip 42f2045c21 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
David Yip 9226257a1b Override Action View name inference in settings/keyword_mutes.
7 years ago
Matthew Walsh a76b024228 Changes to match other timelines in 2.0
7 years ago
David Yip 1a60445a5f Address unused translation errors.
7 years ago
David Yip cd04e3df58 Fill in create, edit, update, and destroy for keyword mutes interface.
7 years ago
David Yip 2e03a10059 Spike out index and new views for keyword mutes controller.
7 years ago
David Yip 4fa2f7e82d Set up /settings/keyword_mutes. #164.
7 years ago
David Yip 42e8c8eb0e Merge tag 'v2.0.0' into gs-master
7 years ago
Håkan Eriksson a2b600428c Swedish translation (#5406)
7 years ago
beatrix 7364b26e4b Merge pull request #184 from tootsuite/master
7 years ago
Nolan Lawson 8980aa804f Fix reduced motion breaking public galleries (#5423)
7 years ago
David Yip dbb1fce94d Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
KY f72936b4e6 Fix #5082 - disable retweet link for followers only toot (#5397)
7 years ago
Nolan Lawson fa0be3f834 Add option to reduce motion (#5393)
7 years ago
David Yip 6cd5b3bbe5 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Lynx Kotoura b3b4b5a2eb Adjust public hashtag pages (#5357)
7 years ago
KY 1bdd694a0a Fix #5351 - Redirection with page params after copy emoji (#5387)
7 years ago
Ondřej Hruška bd51a16150
add duck beaks in haml
7 years ago
Ondřej Hruška 0bf9261e65
Merge remote-tracking branch 'upstream/master'
7 years ago
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165
7 years ago
takayamaki 27101f1beb fix presented og:url is incorrect (#5320)
7 years ago
Nolan Lawson 6a50329a9c Only preload JS in /web pages (#5325)
7 years ago
takayamaki 552d22bec9 sign_in and sign_up views present og meta infos (#5308)
7 years ago
Eugen Rochko 6e9e0c14e6 Fix dependency of error page generation on database (#5280)
7 years ago
nullkal 633426b261 Add moderation note (#5240)
7 years ago
Eugen Rochko f486ef2666 Redesign public hashtag pages (#5237)
7 years ago
kibigo! 6610d57f91 Basic static metadata styling
7 years ago
Eugen Rochko 49cc0eb3e7 Improve admin UI for custom emojis, add copy/disable/enable (#5231)
7 years ago
Eugen Rochko b406e3cc4c Fix #5050 - Use summary_large_image only with media attachments (#5219)
7 years ago
Lynx Kotoura 43577e9f59 Fix style of email domain block table (#5218)
7 years ago
utam0k b3af3f9f8c Implement EmailBlackList (#5109)
7 years ago
Yamagishi Kazutoshi 178f718a9b Separate notifications preferences from general preferences (#4447)
7 years ago
Jeong Arm 0db47196fb Fix stupid typo (#5184)
7 years ago
Jeong Arm c30e492587 Korean translation (#5185)
7 years ago