989 Commits (04204427d0daec65b5b38a7625fa9e7d2a02befd)

Author SHA1 Message Date
Thibaut Girka c39d227996 Fix glitch-style bio fields incorrect HTML escaping in public profiles
7 years ago
ThibG 4072475241 Improvements to toots display in admin view (#7452)
7 years ago
Thibaut Girka d0b753db6b Merge branch 'master' into glitch-soc/merge
7 years ago
Yamagishi Kazutoshi b91c131afa Strip tags from og:description on public tag page (#7437)
7 years ago
Yamagishi Kazutoshi f286c23900 Add alternate for RSS (#7436)
7 years ago
Thibaut Girka af504e62ff Merge branch 'master' into glitch-soc/master
7 years ago
Yamagishi Kazutoshi c1427f90f6 Show media modal on public timeline (#7413)
7 years ago
Eugen Rochko 7ff3c849d1 Bot nameplates (#7391)
7 years ago
beatrix 3f7348c436 Merge pull request #449 from ThibG/glitch-soc/features/upstream-account-items
7 years ago
Eugen Rochko 4055ce490c Enable custom emojis in profiles (notes, field values, display names) (#7374)
7 years ago
Shuhei Kitagawa 8c8a850f8a Add resend confirmation for admin (#7378)
7 years ago
Eugen Rochko a1398887ae Add hint about 7 day cooldown for archive takeout (#7375)
7 years ago
Eugen Rochko 14393f29ef Add contact e-mail hint to 2FA login form (#7376)
7 years ago
Eugen Rochko 0dcca6b6e8 Improve admin UI for accounts (#7360)
7 years ago
Eugen Rochko 9a84024b1e Improve rendering of bio fields (#7353)
7 years ago
David Yip ea46024add Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko d9eda62221 Show remote reports in admin UI as coming from domain rather than user (#7347)
7 years ago
David Yip c87f1d99e4 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 68ba4f23e0 Serialize webfinger XML with Ox instead of Nokogiri (#7319)
7 years ago
Eugen Rochko ba1f40c806 Fix "Show more" URL on paginated threads for remote statuses (#7285)
7 years ago
Thibaut Girka 2df57af401 Implement tootsuite-style account fields
7 years ago
Akihiko Odaki e22f682df0 Paginate descendant statuses in public page (#7148)
7 years ago
Eugen Rochko 354a6e4026 Improve report layout (#7188)
7 years ago
Yamagishi Kazutoshi 7a8c526709 Replace preload link tag to Rails helper (#7192)
7 years ago
Jenkins c9265e97cc Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith 185407d3a2 Reports: Merge contents and comment columns (#7189)
7 years ago
David Yip bae5435010 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Emelia Smith 0f9c6407e9 Feature: add count of account notes to reports (#7130)
7 years ago
Jennifer Kruse 7f6823b149 Able to deactivate invites if they aren't expired (#7163)
7 years ago
Eugen Rochko 0cdf4567c7 Fix missing "Administered by" when timeline preview disabled (#7161)
7 years ago
ThibG 60d86501b5 Remove extra spaces from search API queries and public account headers (fixes #7129) (#7152)
7 years ago
David Yip 9697c6d9f0 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 466442b764 Add bio fields (#6645)
7 years ago
David Yip ac1ac20ee9 Merge remote-tracking branch 'tootsuite/master'
7 years ago
Akihiko Odaki 6c2344d4dd Paginate ancestor statuses in public page (#7102)
7 years ago
Jenkins e4e0aa5d21 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith 5a166a19a7 Feature: Improve reports ui (#7032)
7 years ago
Emelia Smith 765bfd0cf5 Feature: Allow staff to change user emails (#7074)
7 years ago
David Yip 337fc136fd Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ThibG a91acd2010 Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)
7 years ago
David Yip a60a600a10 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 7f1e924fa9 Add contact account to landing page ("Administered by") (#6984)
7 years ago
Jenkins 62ce70f28c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith 5373b138e8 Feature: Report improvements (#6967) (#7000)
7 years ago
Emelia Smith 0408944627 Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)
7 years ago
David Yip 21394c5462 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Underwood 44274257de [WIP] Enable custom emoji on account pages and in the sidebar (#6124)
7 years ago
Jenkins ae55717f50 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 9125608145 Note if the user is already following the target when authorizing follow (#6325)
7 years ago
Jeroen 0bedd0bb45 Invites: Add '1 week' as expire option (#6872)
7 years ago
Jenkins eba1b109db Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG c4c87b8ee8 Display content warning in mail notification emails (#6832)
7 years ago
ThibG 720a45e99f Fix e-mail changed notification (fixes #6778) (#6835)
7 years ago
David Yip b0993a5fdf Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko b95c3ef3ee Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)
7 years ago
Jenkins dd0dafed03 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko aef3f2775e Fix #6757: Adjust RTL styles for landing page (#6768)
7 years ago
Jenkins 828d10c327 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
Jenkins 54608d0486 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 f67fe3ebe8 Improve styling of closed registrations message, rename button (#6695)
7 years ago
Eugen Rochko ecbe445916 In wide layout, columnize Mastodon features on landing page (#6674)
7 years ago
vpzomtrrfrt e6e405e155 Don't escape statuses while truncating (#6671)
7 years ago
Sylvhem 18d4e03e6b Add headings to the security settings page (#6661)
7 years ago
Eugen Rochko 87ac87a73a Fix #6611: Typo in change password template (#6616)
7 years ago
David Yip c08c971dd3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 8c85fd26bb Responsively enforce 16:9 ratio on all media thumbnails in web UI (#6590)
7 years ago
Eugen Rochko d60ae00b8e Fix margin on top action button, fix width of counters on frontpage (#6573)
7 years ago
Eugen Rochko 9721b7746a Fix #942: Seamless LDAP login (#6556)
7 years ago
Lynx Kotoura 527210fd7b Grid layout for tag pages (#6545)
7 years ago
Lynx Kotoura 8050d02e86 Better grid layout for the landing page (#6543)
7 years ago
Eugen Rochko 058b96ddf4 Improve public account cards (#6559)
7 years ago
Ian McCowan 88461c1abe Fix prev/next links on public profile page (#6497)
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko 51e1e65c84 Fix container regression (#6531)
7 years ago
Eugen Rochko ad1f541bd7 Redesign landing page (again) (#6486)
7 years ago
Eugen Rochko f6884555d7 Account archive download (#6460)
7 years ago
David Yip 596deb050b Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 9b7490cede Save video metadata and improve video OpenGraph tags (#6481)
7 years ago
Eugen Rochko 5a5920f1bd Do not hide NSFW media/CW'd text in OpenGraph tags (#6479)
7 years ago
Jenkins 3a1f58e9eb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG d12bff875e Fix password recovery (#6459)
7 years ago
David Yip 799b205766 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 219b28e172 Add preference to always display sensitive media (#6448)
7 years ago
David Yip 4f8122a98c Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Renato "Lond" Cerqueira 6528c0c101 Add option to show only local toots in timeline preview (#6292)
7 years ago
Eugen Rochko 5322013f25 CAS + SAML authentication feature (#6425)
7 years ago
David Yip 6d1023b2e9 Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Charlotte Fields 9c94c1e66f moved save button (#3792)
7 years ago
Akihiko Odaki f35fadcb9a Unify links container implementation in about pages (#6382)
7 years ago
Alexander 23ce0c86da pam authentication (#5303)
7 years ago
David Yip 87517e2dd8 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
Jenkins 3cd4a0804b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 42457924eb Display deleted users' role as “Suspended” (#6339)
7 years ago
Akihiko Odaki a87bb3f4f6 Resolve URL for local account in follow authorization success view (#6324)
7 years ago
David Yip a95ca95b7b Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko d9421e01df Fix invalid value passed to full_asset_url in mailers (#6312)
7 years ago
David Yip d000f5dd80 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Iijima Yasushi c8d971a5c1 Change mailer avatar url (#6309)
7 years ago
David Yip 03f157f6da 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 5f9c017c01 Make text e-mails consistent with HTML ones in UserMailer (#6291)
7 years ago
David Yip d45ebe26dc 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
Jenkins 8c41fb4acc Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
mayaeh ef20e5d3fd Change mailer image url (#6279)
7 years ago
Eugen Rochko 000b0baac2 HTML e-mails for NotificationMailer (#6263)
7 years ago
Yamagishi Kazutoshi d60d5fbd26 Change image URL in mailer to full path (#6264)
7 years ago
kibi! be525dd4db Fix mailer to use webpack core
7 years ago
David Yip de7283a318 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 9613c3238c HTML e-mails for UserMailer (#6256)
7 years ago
Jenkins e6049e6fd0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Jeong Arm 73b6f2ebe9 Handle sessions that can't be translated (#6245)
7 years ago
David Yip 1a7f8eb723 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 6d9f2924ad Fix #6204: Use content warning for page title when present (#6231)
7 years ago
kibigo! 134e6590c6 Don't show skins selector when there's only one (#256)
7 years ago
Jenkins 1f469edac1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko c8f0be1d6d Revert #5772 (#6221)
7 years ago
Jenkins 8704a190c0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC 154bd8db56 Update Simplified Chinese translations (#6215)
7 years ago
Jenkins 86007e913d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quenty31 cf9323449e l10n Occitan language: mailer update (#6193)
7 years ago
Jenkins a7b8cb9493 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 7a0479c830 Allow to dereference Follow object for ActivityPub (#5772)
7 years ago
Marcin Mikołajczak b83fb8b107 i18n: Update Polish translation (#6168)
7 years ago
Yamagishi Kazutoshi d50d61a90c Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167)
7 years ago
Jenkins b42e6973a1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 3c20cfd734 Add confirmation step for email changes (#6071)
7 years ago
Otakan 1cd5812c6b delete X-UA-Compatible (#6068)
7 years ago
Branko Kokanovic 1c4142da5b Adding Serbian latin translations (#6146)
7 years ago
David Yip ed572490c1 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Akihiko Odaki 616b6867a0 Show mastodon on modal (#6129)
7 years ago
Jenkins 5975446002 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Branko Kokanovic 34a90dc266 Adding Serbian translation (#6133)
7 years ago
David Yip 01f91695f5 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
beatrix d9c2806048 keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)
7 years ago
Eugen Rochko 9427823d5c Add more instance stats APIs (#6125)
7 years ago
Jenkins 503e7fb4d8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Nolan Lawson 59a50e6489 Reduce motion for boost animation (#5871)
7 years ago
Jenkins 9ccad78647 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 87ee458079 Display deleted users' role as “Suspended” (#6080)
7 years ago
Jenkins 1366e96a02 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko d6088c5308 Add filters to admin UI for custom emojis (#6003)
7 years ago
Eugen Rochko aea3d0814b Clean up admin UI for accounts (#6004)
7 years ago
David Yip a56c9ac5dc Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko d5f4baf720 Improve public status page title (#5985)
7 years ago
kibigo! d9e1496990 Added styling
7 years ago
kibigo! a1c79ef544 Screenshot support for themes
7 years ago
kibigo! 901c08a999 Moved flavour UI into own prefs tab
7 years ago
cwm 34630e00cb pulled master, moved locale entry to new location
7 years ago
kibigo! 853082e760 Only localize js when there's a theme
7 years ago
kibigo! 99e8710095 Javascript intl8n flavour support
7 years ago
kibigo! f4c233f59f Ruby intl8n for themes
7 years ago
cwm 41bbfeec7c add initial components based off of tootsuite pr #1507
7 years ago
Yamagishi Kazutoshi 03d28b6ec8 Back to Web UI from tag page when signed in (#5943)
7 years ago
Eugen Rochko b95863ec48 Polish video player CSS, add timer on fullscreen/modal/public pages (#5928)
7 years ago
beatrix f0b37f92a9 Merge pull request #229 from glitch-soc/glitch-theme
7 years ago
Jenkins a3a7b6a848 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko b037fbf9f4 Remove rabl dependency (#5894)
7 years ago
kibigo! fd7be49523 Various fixes
7 years ago
David Yip 0002d12c24 current_theme -> current_flavour (#229)
7 years ago
David Yip 1221e3075d Merge branch 'gs-master' into glitch-theme
7 years ago
kibigo! 935946020f Fixed a name + localizations
7 years ago
kibigo! 882055afd0 Rename themes -> flavours ? ?
7 years ago
Jenkins 822dea26c3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 1447ef1d44 Add invite filter (#5862)
7 years ago
Yamagishi Kazutoshi 7f0a01a20c Fix invites form path (#5861)
7 years ago
Yamagishi Kazutoshi 53145abfbf Allow admin to deactivate invite created by users (#5860)
7 years ago
kibigo! 36b9f4df56 Skins support
7 years ago
David Yip a1d9c68198 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi d6846dce20 Show "expired" in invite index (#5838)
7 years ago
David Yip bc10a0dced Merge remote-tracking branch 'tootsuite/master'
7 years ago
Eugen Rochko 55d9abcceb Add UI for setting up account migration (#5832)
7 years ago
David Yip c9dd67a733 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi d5e4cb2ca1 Use account.username when display_name is empty (#5828)
7 years ago
Eugen Rochko bc8c951083 Add consumable invites (#5814)
7 years ago
Jenkins f504ac4ff6 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Alda Marteau-Hardi 191993c811 Use account.display_name for og:title single toot pages (#5821)
7 years ago
Jenkins 359ba16721 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko efc97d404c Add logging of admin actions (#5757)
7 years ago
kibigo! eadf1c38a5 Minor fixes
7 years ago
kibigo! 8aeda4f064 Finalized theme loading and stuff
7 years ago
David Yip 1dc24ece41 Merge remote-tracking branch 'tootsuite/master'
7 years ago
Yamagishi Kazutoshi bffc1b880b Add “staff” badge to admin user pages (#5735)
7 years ago
Eugen Rochko b89f614bd7 Profile redirect notes (#5746)
7 years ago
Jenkins 065e2388ba Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
unarist 5982d570de Move "Permissions" row into main table in /admin/accounts/:id (#5734)
7 years ago
kibigo! 5845057adb Themed prefetching
7 years ago
David Yip 5f689cdf78 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ysksn 08cb63c360 Remove empty strings (#5732)
7 years ago
Eugen Rochko 21d01d5809 Display moderator badge (green), admin badge changed to red (#5728)
7 years ago
Surinna Curtis 02ae609d9a Merge tootsuite/master at ab48f2b239
7 years ago
Eugen Rochko 80873c1134 Add option to block direct messages from people you don't follow (#5669)
7 years ago
Anna e só c4c9003f84 l10n: PT-BR translation updated (#5681)
7 years ago
Eugen Rochko 97178b6d86 Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
Quenty31 a7db7bdd96 i10n OC: Memorial (#5615) + #5467 (#5623)
7 years ago
Eugen Rochko 7f1a0241c1 Add ability to disable login and mark accounts as memorial (#5615)
7 years ago
nullkal 19f82492ab Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467)
7 years ago