1608 Commits (cc93cd5d6cf302140d9df56e64dc6e902ce56708)

Author SHA1 Message Date
Eugen Rochko 72d7d3003b
Do not show "limited" visibility in default visibility preference (#8999)
6 years ago
Eugen Rochko ddd30f331c
Improve support for aspects/circles (#8950)
6 years ago
Eugen Rochko 35b576dbec
Improve form for selecting media display preference (#8965)
6 years ago
Thibaut Girka 3d5d899094 Allow selecting both default flavour and theme
6 years ago
Eugen Rochko 9d4541c612
Display customized mascot in web UI and fix admin form for it (#8964)
6 years ago
Eugen Rochko 22de24b8ca
Fix missing protocol in dns-prefetch, improve code style (#8963)
6 years ago
Eugen Rochko 5cbbd2c3b5
Fix microformats on statuses according to updated spec (#8958)
6 years ago
Thibaut Girka 8f720be9f3 Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 2459da29c2
Add description meta tag additionally to og:description (#8941)
6 years ago
Eugen Rochko da7705b274
Add dns-prefetch if using different host for assets or uploads (#8942)
6 years ago
Thibaut Girka d17844e6d1 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ashleyhull-versent 2dba313100 Replace SVG asset with Custom mascot (#8766)
6 years ago
Thibaut Girka 611740ce81 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 28401962ca Change documentation URL (#8898)
6 years ago
Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko e645ae9561
Change admin accounts default sort to most recent (#8813)
6 years ago
Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 3d7f68c273
Revert Font Awesome 5 upgrade (#8810)
6 years ago
Naoki Kosaka 8bae14591b Migrate to font-awesome 5.0. (#8799)
6 years ago
Yamagishi Kazutoshi c6d43115c2 Fix broken report detail (regression from #8569) (#8795)
6 years ago
mayaeh 17af4d27da Update the icon name changed by the Font Awesome 5. (#8776)
6 years ago
ふぁぼ原 f7a6f9489d Add a new preference to always hide all media (#8569)
6 years ago
Matt Sweetman 1889526e23 Add user preference to always expand toots marked with content warnings (#8762)
6 years ago
ThibG c39183cc62 Refactor active_nav_class for use with multiple paths (#8757)
6 years ago
ThibG c946ba3fae Add rel=me to moved accounts' link (#8742)
6 years ago
Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko f4d549d300
Redesign forms, verify link ownership with rel="me" (#8703)
6 years ago
ThibG f8b54d229f Fix “Toots” tab highlighting for replies and media timelines (#8715)
6 years ago
jacob d16c3342ce add several missing alt tags (#8708)
6 years ago
Eugen Rochko 011437dcb5
Group reports by target account (#8674)
6 years ago
Thibaut Girka cd99255698 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 2288d50a7b
Add force_login option to OAuth authorize page (#8655)
6 years ago
Renato "Lond" Cerqueira 7607f4778b Use animation config for avatar in profile pages (#8614)
6 years ago
Thibaut Girka 7ea4c793d6 Allow to show a specific status in the admin interface
6 years ago
Thibaut Girka 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko c593d6df9c
Add preference for report notification e-mails, skip for duplicates (#8559)
6 years ago
Thibaut Girka a74a7d5fe3 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi 0e661dd2e9 Fix static URL when disable autoplay (#8548)
6 years ago
Thibaut Girka 6f75a9001f Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Renato "Lond" Cerqueira fe56d26f7b Fix autoplay issue with spoiler tag (#8540)
6 years ago
M Somerville 1bfe735d57 Inactive header in main profile to match column. (#8520)
6 years ago
Renato "Lond" Cerqueira 11658d8653 Add animate custom emoji param to embed pages (#8507)
6 years ago
Thibaut Girka 43d132039b Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 5e1767173f
Display pending message on admin relays UI (#8494)
6 years ago
Thibaut Girka 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
M Somerville b31449cd77 Better singulars of account followers/toots. (#8471)
6 years ago
Thibaut Girka 5eb3b8522e Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Tad Thorley 104d089df1 Update _bio.html.haml (#8449)
6 years ago
Thibaut Girka 36393e1d2b Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 22e46ebad8
Add theme identifier to body classes for easier custom CSS styling (#8439)
6 years ago
M Somerville 29da56cf75 Hide reject media checkbox when not relevant. (#8426)
6 years ago
M Somerville ac092d03e7 Add missing video descriptions (#8416)
6 years ago
Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko a2cabf3f4a
Add admin custom CSS setting (#8399)
6 years ago
Eugen Rochko 69ba8f063c
When registrations closed, link "Sign up" to joinmastodon.org (#8395)
6 years ago
Jakub Mendyk 6cb3514d64 Add ability to change an instance default theme from the administration panel (#7092) (#8381)
6 years ago
Thibaut Girka e70fc059a9 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka f34616eec1 Fix locale packs loading in embed layout
6 years ago
M Somerville ad41806e53 Allow use of plurals on about page stats. (#8363)
6 years ago
Eugen Rochko 2374a00c10
Add confirmation step to account suspensions (#8353)
6 years ago
Thibaut Girka 88a0395a58 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 0fc0980de1
Link to mobile apps page (#8278)
6 years ago
Eugen Rochko 9dd5639f90
Add admin function to deactivate all invites (#8279)
6 years ago
Thibaut Girka bfeac6747a Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 85bb32c410
Add "sign in to participate" message to public toot page (#8200)
6 years ago
Eugen Rochko 78fa926ed5
Add remote interaction dialog for toots (#8202)
6 years ago
Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 625b5a567b Get rid of the Content Warning rainbows (#8129)
6 years ago
Eugen Rochko aaac14b8ad
Show exact number of followers/statuses on export page/in tooltip (#8199)
6 years ago
Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 5b8603879f
Adjust responsive design for /about/more and /terms (#8158)
6 years ago
Eugen Rochko 0dcc1950d1
Update /terms and /about/more to use public layout (#8142)
6 years ago
Eugen Rochko f2404de871
Public profile endorsements (accounts picked by profile owner) (#8146)
6 years ago
ThibG dad8a1baf2 Render custom emoji in display name on public profile (#8115)
6 years ago
Thibaut Girka bf1d3ae3b8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 71b318dedc Delete leftovers from keyword_mutes
6 years ago
Thibaut Girka c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko cc56f2230a
Add separate setting for sidebar text (site_short_description) (#8107)
6 years ago
Thibaut Girka 88b593a63f Drop glitch-style account bio fields
6 years ago
Eugen Rochko 0a3cc246ac Fix size/dimension values in avatar/header hint localizations (#8088)
6 years ago
Eugen Rochko bb71538bb5
Redesign public profiles and toots (#8068)
6 years ago
Thibaut Girka 7dbed4dab9 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 8241f162df
Fix tag usage display on admin dashboard
6 years ago
Eugen Rochko 0d13e30ad2
Display trending hashtags on admin dashboard (#8038)
6 years ago
Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 2354b10eb5
Add admin dashboard (#8029)
6 years ago
Eugen Rochko e55dce3176
Add federation relay support (#7998)
6 years ago
Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge
6 years ago
ThibG 1ca4e51eb3 Add option to not consider word boundaries when processing keyword filtering (#7975)
6 years ago
Eugen Rochko 30e1da7668
Add follow button to detailed status, add gradient to mask bio cut-off (#7979)
6 years ago
Eugen Rochko cd509d2146
Remove .p-name microformat class (#7961)
6 years ago
Eugen Rochko f89c595ea0
Add admin setting to enable OG previews for sensitive media (#7962)
6 years ago
Eugen Rochko 1f6ed4f86a
Add more granular OAuth scopes (#7929)
6 years ago
Maciek Baron 9dc413b025 Respect noindex rule in remote follow view (fix #7869) (#7939)
6 years ago
Eugen Rochko 2092d5c0ad
Improve embeds (#7919)
6 years ago
Eugen Rochko cdb101340a
Keyword/phrase filtering (#7905)
6 years ago
Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko a58ec29631
Allow selecting default posting language instead of auto-detect (#7828)
6 years ago
Eugen Rochko 7eec279c7f
Change language opt-out to language opt-in (#7823)
6 years ago
Thibaut Girka db200226b8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko ca85658975
Add autofollow option to invites (#7805)
6 years ago
David Yip 5cff053944
Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
6 years ago
David Yip e931cf656d
Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions
6 years ago
Jenkins 4d8d1fa129 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
David Yip f9eb4ea80a
Merge pull request #506 from ThibG/glitch-soc/fixes/static-500
6 years ago
Eugen Rochko 9b9e96eae5
Add "Edit profile" link to public profile page, increase bottom padding (#7754)
6 years ago
David Yip 8142bd2553
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
6 years ago
Yamagishi Kazutoshi c0fc4e9935 Remove unnecessary underline on accounts table (#7728)
6 years ago
David Yip 97d2df77aa
Add apply-to-mentions option to keyword mute UI. #454.
6 years ago
Thibaut Girka e8a9627f66 Hardcode default skin/theme in error layout (fixes #373)
6 years ago
Jenkins f93806ea55 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 40ef46dbef
Display only domain of report account if remote under comment (#7574)
7 years ago
Thibaut Girka b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Ash Furrow 50db106252 Disables autocorrect/autocapitalize on remote username field. (#7549)
7 years ago
Eugen Rochko 93c66f0c03
In footer, replace text "Mastodon" with logo (#7545)
7 years ago
David Yip e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 1e02dc8715
Add preference to hide following/followers lists (#7532)
7 years ago
Thibaut Girka ba7ee67498 Merge branch 'master' into glitch-soc/merge
7 years ago
ThibG 685cf5599f
Merge pull request #480 from ThibG/glitch-soc/fixes/glitch-soc-bio-escape
7 years ago
Thibaut Girka cc8d81519e Fix glitch-style bio fields incorrect HTML escaping in public profiles
7 years ago
ThibG 0f2fbf7d05 Improvements to toots display in admin view (#7452)
7 years ago
Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge
7 years ago
Yamagishi Kazutoshi bd5f57cbc3 Strip tags from og:description on public tag page (#7437)
7 years ago
Yamagishi Kazutoshi 0a7e8320b2 Add alternate for RSS (#7436)
7 years ago
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master
7 years ago
Yamagishi Kazutoshi e0b1e17bd0 Show media modal on public timeline (#7413)
7 years ago
Eugen Rochko 42cd363542
Bot nameplates (#7391)
7 years ago
beatrix 35a1a3171f
Merge pull request #449 from ThibG/glitch-soc/features/upstream-account-items
7 years ago
Eugen Rochko 61a9018607
Enable custom emojis in profiles (notes, field values, display names) (#7374)
7 years ago
Shuhei Kitagawa bd10a7e480 Add resend confirmation for admin (#7378)
7 years ago
Eugen Rochko 39efc6d533
Add hint about 7 day cooldown for archive takeout (#7375)
7 years ago
Eugen Rochko b611dbac79
Add contact e-mail hint to 2FA login form (#7376)
7 years ago
Eugen Rochko c7d1a2e400
Improve admin UI for accounts (#7360)
7 years ago
Eugen Rochko 2ef9d65052
Improve rendering of bio fields (#7353)
7 years ago
David Yip 77a92d3260
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 251bbf9728
Show remote reports in admin UI as coming from domain rather than user (#7347)
7 years ago
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 28bd4b9800
Serialize webfinger XML with Ox instead of Nokogiri (#7319)
7 years ago
Eugen Rochko da61352fab
Fix "Show more" URL on paginated threads for remote statuses (#7285)
7 years ago
Thibaut Girka 356d0214c9 Implement tootsuite-style account fields
7 years ago
Akihiko Odaki 1258efa882 Paginate descendant statuses in public page (#7148)
7 years ago
Eugen Rochko a9c440637c
Improve report layout (#7188)
7 years ago
Yamagishi Kazutoshi 1663368724 Replace preload link tag to Rails helper (#7192)
7 years ago
Jenkins ed17e173d6 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith b9c35785e2 Reports: Merge contents and comment columns (#7189)
7 years ago
David Yip 16d5217502
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Emelia Smith 204d72fbe4 Feature: add count of account notes to reports (#7130)
7 years ago
Jennifer Kruse ef12a2b74c Able to deactivate invites if they aren't expired (#7163)
7 years ago
Eugen Rochko 07a7d5959c
Fix missing "Administered by" when timeline preview disabled (#7161)
7 years ago
ThibG 1c379b7ef4 Remove extra spaces from search API queries and public account headers (fixes #7129) (#7152)
7 years ago
David Yip 813da6788e
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 78ed4ab75f
Add bio fields (#6645)
7 years ago
David Yip a817f084ea
Merge remote-tracking branch 'tootsuite/master'
7 years ago
Akihiko Odaki 519119f657 Paginate ancestor statuses in public page (#7102)
7 years ago
Jenkins 33c2bbdda7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith d9b62e34da Feature: Improve reports ui (#7032)
7 years ago
Emelia Smith 219a4423d8 Feature: Allow staff to change user emails (#7074)
7 years ago
David Yip 67e77f230e
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ThibG 1364e9e4ae Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)
7 years ago
David Yip 3ab6a8b8be
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
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
Jeong Arm d841af4e80 Append confirmation link as plain text (#5146)
7 years ago
Eugen Rochko 47ecd652d3 Make Chrome splash screen same color as web UI's background color (#5169)
7 years ago
Eugen Rochko 0b3f1ec62a Reorganize preferences page (#5161)
7 years ago
Ondřej Hruška ce3e0faf4d
add login form to landing page if regs are closed
7 years ago
kibigo! 53f829dfa8 HAML fix
7 years ago
Eugen Rochko 5b45c1646a Remove dependency on db during assets:precompile (#5138)
7 years ago
kibigo! cf1f83ca2a Fixed lingering upstream Theme code
7 years ago
kibigo! 1522795853 new HAML for statuses
7 years ago
Ondřej Hruška daad07b1d5
Merge remote-tracking branch 'origin/better-themeing' into merging-upstream
7 years ago
Ondřej Hruška 83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
7 years ago
Ondřej Hruška 9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
7 years ago
kibigo! 86e617a839 Better themeing support!!
7 years ago
Eugen Rochko 3b60832214 New error page graphic. Other error page improvements (#5099)
7 years ago
Eugen Rochko 2c8e3fbbfb Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067)
7 years ago
Eugen Rochko 2f079573ed In detail status view, display attachment uncropped if there's only one (#5054)
7 years ago
Eugen Rochko 1e02ba111a Add emoji autosuggest (#5053)
7 years ago
Eugen Rochko 9c8e602163 Fix custom emojis not detected when used in content warning (#5049)
7 years ago
Eugen Rochko 846cd4e838 Switch from EmojiOne to Twemoji, different emoji picker (#5046)
7 years ago
kibigo! 15c9c2fd7e Pinned toots; embeds
7 years ago
Andrew 0401a24558 Add support for multiple themes (#4959)
7 years ago
unarist 4aea3f88a6 Hide sensitive image in default on the public pages (#5009)
7 years ago
Eugen Rochko 09a94b575e Admin interface for listing, adding and removing custom emojis (#5002)
7 years ago
Eugen Rochko 81cec35dbf Custom emoji (#4988)
7 years ago
BruWalfas c155d843f4 A few updates to the Spanish translation and some typos fixing (#4997)
7 years ago
Yamagishi Kazutoshi dcf1139ebd Do not add image size without meta to OGP (regression from #4901) (#4995)
7 years ago
Yamagishi Kazutoshi 9e0985d9e4 Add `strip_insignificant_zeros: true` option to `number_to_human` (#4993)
7 years ago
Lynx Kotoura 4c14ff659b Oauth code in input form and add description message (#4986)
7 years ago
Mingye Wang c8969dca35 Minor Chinese check & jsx addition (#4973)
7 years ago
Lynx Kotoura 1e3b1d7211 Adjust landing pages 2 (#4967)
7 years ago
Eugen Rochko 2bbf987a0a Redesign video player (#4911)
7 years ago
Eugen Rochko 9239e4ce4d Uploads for admin site settings (#4913)
7 years ago
nullkal da77f65c46 Add instance search feature (#4925)
7 years ago
nullkal 9e2ff3ef71 Make instance names in into links to user list in the instance (#4924)
7 years ago
unarist af10c9fbff Add section for protocol specific information on the admin page (#4910)
7 years ago
Eugen Rochko 8f8e677630 Clean up and improve generated OpenGraph tags (#4901)
7 years ago
unarist 47d48fed8d Reset preview image if avatar/header image selection was cancelled (#4893)
7 years ago
Anna e só c2bee07dbc l10n: Full PT-BR translation (#4882)
7 years ago
David Yip 932571fa22 Merge tag 'v1.6.0' into sync/upstream
7 years ago
Eugen Rochko 7d7844a47f Default follows for new users (#4871)
7 years ago
David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
7 years ago
David Yip 514fc908a3 Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream
7 years ago
Quent-in bc077018b8 i10n minors changes for 1.6 (#4867)
7 years ago
Lynx Kotoura 3c45d3963a Scrollable tables in settings pages (#4857)
7 years ago
Eugen Rochko 1caf11ddcc Fix language filter codes (#4841)
7 years ago
Quent-in b00cc4b9bd i10n OC / FR update Pinned toots (#4842)
7 years ago
Lynx Kotoura 4c3dd0b254 Adjust status embeds (#4808)
7 years ago
Eugen Rochko 09cffaaf04 Fix #4551 - Use correct syntax for content preloading (#4798)
7 years ago
Lynx Kotoura cfe39fb58d Adjust settings pages (#4765)
7 years ago
Yamagishi Kazutoshi 6fd2e8c3c5 Fix profile page when use system's font (#4774)
7 years ago
m4sk1n 0b32338e3f Add link to 'noscript' message (#4561)
7 years ago
Yamagishi Kazutoshi 2305f7c391 Use system's default font on non web UI pages (#4553)
7 years ago
Eugen Rochko e95bdec7c5 Update status embeds (#4742)
7 years ago
Eugen Rochko 15093f9113 Shorten display of large numbers on public profiles (#4711)
7 years ago
Yamagishi Kazutoshi 3ac7b353f8 Fix missing at-sign (regression from #4688) (#4705)
7 years ago
Yamagishi Kazutoshi 00f9f16f94 Change timezone of the datetime to what browser specifies (#4688)
7 years ago
Yamagishi Kazutoshi b88635202f Add label for application scopes (#4691)
7 years ago
Eugen Rochko 9caa90025f Pinned statuses (#4675)
7 years ago
nullkal 80393a23d0 Use checkboxes for application scope setting (#4671)
7 years ago
Eugen Rochko c1b086a538 Fix up the applications area (#4664)
7 years ago
Daigo 3 Dango 696c2c6f2f Add Mastodon::Source.url (#4643)
7 years ago
Colin Mitchell 871c0d251a Application prefs section (#2758)
7 years ago
nightpool efec02f153 use existing inflections instead of custom helper (#4624)
7 years ago
nullkal 075d6a1e13 Show what protocol is used for accounts in admin/accounts#index (#4622)
7 years ago
Eugen Rochko ca7ea1aba9 Redesign public profiles (#4608)
7 years ago
unarist 5b9ae7981e Update /admin/accounts/:id view for ActivityPub (#4600)
7 years ago
Eugen Rochko 3c6503038e Add protocol handler. Handle follow intents (#4511)
7 years ago
Eugen Rochko a2aeacbfee Add alternate links to ActivityPub resources from HTML/HEAD variants (#4586)
7 years ago
Lynx Kotoura dcbc1af38a Fix short description in about/more page (#4554)
7 years ago
TheInventrix c9fd6f386c unify short description styling (#4548)
7 years ago
Ondřej Hruška 7a1ca8b0df Merge remote-tracking branch 'upstream/master'
7 years ago
Lynx Kotoura a3e53bd442 Adjust tags and accounts page (#4534)
7 years ago
Eugen Rochko df605f0f8b Add "signed in as" header to some pages (#4523)
7 years ago
kibigo! 8150689b48 Merge upstream (#111)
7 years ago
Masoud Abkenar 4b6cd1dfdb i18n: update Persian translation (#4470)
7 years ago
unarist 155ba8fd3a Make salutation of email localizable (#4454)
7 years ago
Gô Shoemake b61e3daf98 Multiple frontend support (#110)
7 years ago
Yamagishi Kazutoshi f91284d230 Do not create empty a element when there is no e-mail (#4455)
7 years ago
Lynx Kotoura ea33cdc30b Set contact address in about/more as mailto link (#4450)
7 years ago
Lynx Kotoura 57a794d8eb Fix autocomplete option in haml files (#4438)
7 years ago
Eugen Rochko 8c0dd33ce4 Fix current session not being displayed in sessions list (#4424)
7 years ago
Ondřej Hruška 4115043dc7 Added external link icons to joinmastodon navbar buttons (#4368)
7 years ago
Ondřej Hruška 4c233b4f3a Add .fa-external-link to instance list link
7 years ago
Ondřej Hruška b7cf758fbe Fix JS errors and add back commit hash
7 years ago
Ondřej Hruška 7e5691804d Merge git://github.com/tootsuite/mastodon into tootsuite-master
7 years ago
Yamagishi Kazutoshi e5c0aa6493 Send short account URL to remote instance (regression from #3844) (#4355)
7 years ago
Eugen Rochko 1306d637a2 Fix oddities with public profile CSS (#4341)
7 years ago
Eugen Rochko 029f2c4545 Redesign /terms page (#4338)
7 years ago
Eugen Rochko 2374d63536 Redesign extended information page (#4322)
7 years ago
sdukhovni 06d905f415 Allow domain blocks that only reject media without silencing or suspending (#4325)
7 years ago
Yamagishi Kazutoshi 63a2566007 Fix manifest description (regression from #4122) (#4324)
7 years ago
Eugen Rochko 3a3b556065 Improve noscript message and style (#4315)
7 years ago
Yamagishi Kazutoshi 4d661e1183 Change logo.png to logo.svg for web UI (#4307)
7 years ago
Eugen Rochko 0e0f18ce7c New logo (#4306)
7 years ago
Ondřej Hruška 6913426e48 Merge pull request #92 from tootsuite/master
7 years ago
Eugen Rochko 311871eefc Turn clouds on landing page into SVGs, use SCSS variables to color them (#4299)
7 years ago
beatrix-bitrot 984d2d4cb6 Merge that good fresh upstream shit
7 years ago
Eugen Rochko 7bf7ed6123 Fix #3220 - Show avatar/header on edit profile page (#4288)
7 years ago
Eugen Rochko 4b911fea03 Add button to re-subscribe to all accounts from a domain (#4285)
7 years ago
beatrix e7edb4d1ee Merge pull request #87 from tootsuite/master
7 years ago
Yamagishi Kazutoshi 716f4cb11c Add feature to revoke sessions (#4259)
7 years ago
kibigo! 0a678cf377 Fix for stylesheet split
7 years ago
Ondřej Hruška d69fa9e1f4 Merge changes from upstream with the CSS reload fix
7 years ago
Yamagishi Kazutoshi 3267e4a785 Add unfollow modal (optional) (#4246)
7 years ago
abcang 4d42a38954 Improve admin page (#4121)
7 years ago
Yamagishi Kazutoshi 8949aad030 Add empty alt attribute to img elements in landing page (#4243)
7 years ago
kibigo! 09cfc079b0 Merge upstream (#81)
7 years ago
Eugen Rochko 8c45cd0e36 Improve ActivityPub representations (#3844)
7 years ago
Sorin Davidoi c1f201c49a 🎄🔨 Force tree shake emojione (#4202)
7 years ago
Eugen Rochko c42092ba7a Add option to opt out of search engines on public profile/status pages (#4199)
7 years ago
Yamagishi Kazutoshi 9008ab3407 Do not load unnecessary script files (#4193)
7 years ago
Sorin Davidoi 0c7c188c45 Web Push Notifications (#3243)
7 years ago
kibigo! 79d898ae0a Merge upstream!! #64 <3 <3
7 years ago
Eugen Rochko 056b5ed72f Improve UI of admin site settings (#4163)
7 years ago
DJ Sundog 74eff5456c First lame pass at adding optional git commit hash display on /about/… (#67)
7 years ago
Eugen Rochko e19eefe219 Redesign the landing page, mount public timeline on it (#4122)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 8784bd79d0 Require stylesheets in common.js (#4152)
7 years ago
STJrInuyasha 7a889a8e12 Remote following success page (#4129)
7 years ago
Yamagishi Kazutoshi 2b9721d1b3 Add setting a always mark media as sensitive (#4136)
7 years ago
Sorin Davidoi 37c832cdf7 refactor: Make all reducers sync (#4125)
7 years ago
abcang 794781d121 Change account link to admin account link on report page (#4119)
7 years ago
Eugen Rochko 864e3f8d9c Replace OEmbed and initial state Rabl templates with serializers (#4110)
7 years ago
Sylvhem 8fecd80108 Various fixes in the French translation (#4107)
7 years ago
Sorin Davidoi 348d6f5e75 Lazy load components (#3879)
7 years ago
Eugen Rochko 8b2cad5637 Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)
7 years ago
のら 2d6128672f Togglable filter links (#4021)
7 years ago
Damien Erambert 18d3fa953b Add a setting allowing the use of system's default font in Web UI (#4033)
7 years ago
abcang f76e71825d Improve Activity stream spoiler (#4088)
7 years ago
Yamagishi Kazutoshi bb194ddb3c Format datetime of subscriptions on admin UI (#4078)
7 years ago
Yamagishi Kazutoshi 275c5b51ed Customizable privacy policy from admin interface (#4062)
7 years ago
Yamagishi Kazutoshi 92f1c474f3 Add fa-fw class to user agent icon (#4047)
7 years ago
kibigo! fc65b691df Images now behind CWs on static pages
7 years ago
kibigo! 03f9648377 Improvements to static metadata styling, especially for mobile
7 years ago
kibigo! 6107e95404 Backend YAML Processing + Profile Metadata on Static Pages
7 years ago
m4sk1n 126f929c39 i18n: Use instance name in email notifications instead of Mastodon (pl) (#3976)
7 years ago
beatrix-bitrot ddafde942c Merge remote-tracking branch 'upstream/master'
7 years ago
Midgard 16d0aed403 Use instance name in email notifications instead of "Mastodon" (#3763)
7 years ago
Eugen Rochko 42b8220632 Fix #1624 - Send e-mail notifications to admins about new reports (#3949)
7 years ago
beatrix-bitrot c0a665865e update bio length to 500
7 years ago
Eugen Rochko 5e8d037e27 Fix #3910 - Require OTP authentication to disable 2FA (#3935)
7 years ago
Eugen Rochko f7301bd5b9 Add overview of active sessions (#3929)
7 years ago
Charlotte Fields b27842dc70 cybre cleanup
7 years ago
Chronister 65528fc54e All cybrespace changes through 5/28
7 years ago
masarakki ff142eb64d setting-for-account-deletable (#3852)
7 years ago
Daigo 3 Dango 5bd3715a4c Link to /about from public page on a single user instance (#3814)
7 years ago
Eugen Rochko f3be605286 Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847)
7 years ago
abcang 1840a352f5 Fix ogp url (#3802)
7 years ago
Eugen Rochko 4a618908e8 Account deletion (#3728)
7 years ago
Eugen Rochko 47ace633dc Simplify getting started links localization. Link "powered by Mastodon" to joinmastodon.org (#3725)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) f596a413ef Localize date in digest and cover NotificationMailer more (#3694)
7 years ago
Eugen Rochko 8015fd7600 Improve RTL detection (#3682)
7 years ago
Yamagishi Kazutoshi 1be48dd805 Refactor views/admin/reports/show.html.haml (#3656)
7 years ago
Eugen Rochko 8902e265b4 Add explit admin actions to (re)subscribe/unsubscribe remote accounts (#3640)
7 years ago
Sorin Davidoi 8acadeea76 fix: Warn if JavaScript is disabled (#3634)
7 years ago
STJrInuyasha 2d91944285 Don't show business e-mail if it's blank (#3619)
7 years ago
Eugen Rochko 722d152082 Fix #3063 - Add dynamic app manifest (#3563)
7 years ago
IkUrA facd90e7a6 Add streaming_api_base_url to /api/v1/instance (#3556)
7 years ago
Yamagishi Kazutoshi 4addf051d4 Fix broken embed page (#3577)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) e98559c3ff Resolve custom application stylesheet with Webpack (#3373)
7 years ago
Matt Jankowski 5c63523972 Spec coverage and refactor for the api/v1/accounts controllers (#3451)
7 years ago
Matt Jankowski de4681b2be Move admin/pubsubhubbub controller to admin/subscriptions (#3442)
7 years ago
Matt Jankowski a132332b86 Add Instance class to list admin records (#3443)
7 years ago
Matt Jankowski b25e42a77f Misc tidying and clean ups (#3445)
7 years ago
Matt Jankowski d6774d2ca3 Refactor and spec coverage for api/v1/timelines actions (#3482)
7 years ago
Atsushi Yamamoto 402c19a924 Add preference setting for delete toot modal (#3368)
8 years ago
Eugen Rochko 62ca37884a Fix #2922 - Load stylesheet from "custom.css" entrypoint when present (#3332)
8 years ago
Quent-in 4b0c667c09 i18n update for Occitan language (#3362)
8 years ago
Eugen Rochko 9ea4f37e78 Add "meta" attribute to return of POST /api/v1/media method as well (#3333)
8 years ago
Yamagishi Kazutoshi 531c1bb245 Add localization of datetime in public page (#3296)
8 years ago
Daigo 3 Dango 838f51770b Replace \u2014 with &mdash; (#3301)
8 years ago
alpaca-tc 7ee5fc5d68 Toggle sensitive from admin page (#3261)
8 years ago
Matt Jankowski 4289ed1d13 Refactor of API timeline actions (#3263)
8 years ago
Eugen Rochko 48e7a22e34 Fix locale regression from #3055 (#3231)
8 years ago
Nolan Lawson 9d04de1c8d Only load Intl data for current language (#3130)
8 years ago
Masoud Abkenar b69365e397 Persian translation update (#3206)
8 years ago
Eugen Rochko a478af92c3 Fix forgotten to include language attribute in statuses JSON (#3209)
8 years ago
vidarlee 440441ccb3 Enhance for the Chinese translation (#3198)
8 years ago
Eugen Rochko d78f555254 Improve language filter preferences look (#3184)
8 years ago
Matt Jankowski 8f4b7c1820 Filter languages with opt out (#3175)
8 years ago
ButterflyOfFire 8ed3fa1693 Update reset_password_instructions.ar.html.erb (#3163)
8 years ago
Eugen Rochko f1ab70649b Add buttons to block and unblock domain (#3127)
8 years ago
Matt Jankowski d2542dcec0 Use stylesheet_pack_tag in embedded layout, avoids pipeline deprecation warning (#3123)
8 years ago
Eugen Rochko 76449df903 Fix character counter not updating for bio (#3101)
8 years ago
Eugen Rochko 226c9836e4 Add reset button to admin accounts search, improve looks a little (#3100)
8 years ago
alpaca-tc b397f69633 Render translated view (#3093)
8 years ago
alpaca-tc e89e4355eb Add filter to AccountFilter (#2968)
8 years ago
spla a51c8074df Add catalan language (#3084)
8 years ago
Hiroaki Ninomiya cb50ecdb07 chore(landing_strip): hide signup path unless the instance allows registration. (#3055)
8 years ago
Akihiko Odaki 85c9496340 Introduce common JavaScript file (#2981)
8 years ago
Eugen Rochko d0dd9eb5b5 Feature conversations muting (#3017)
8 years ago
Stephen Burgess 4bd0488a77 feat(count): Just yml count syntax to provide different rule for 1 (#2685)
8 years ago
Shunsuke Michii 89210781cb Fix og:url. (#3031)
8 years ago
beatrix 3dcb5fa28f Revert HTML CW changes (#3020)
8 years ago
Eugen Rochko 72698bc3b4 Fix regressions from #2683 (#2970)
8 years ago
R Tucker e2491680e6 Handle hashtags in spoiler_texts (partial fix for #699) (#2683)
8 years ago
Quent-in fed585e3f4 i18n mailer files for Occitan language (#2924)
8 years ago
jeroenpraat 406229d927 Updating and extending Dutch strings (#2930)
8 years ago
Yamagishi Kazutoshi 459bbfa4b2 Prevent selection of unacceptable Content-Type files (#2910)
8 years ago
ButterflyOfFire 7140def5c9 Update simple_form.ar.yml (#2908)
8 years ago
Koala Yeung cbd673601c Add Thai langauge (#2903)
8 years ago
yhirano 48594b18e6 Added haml-lint and fix warnings (#2773)
8 years ago
Özcan Zafer AYAN 983593ddf4 Add Turkish yml file (#2878)
8 years ago
Yamagishi Kazutoshi f000673599 Remove local_time gem, and add similar (#2875)
8 years ago
Ira ee1486a7de i18n: Update Hebrew interface translation. (#2880)
8 years ago
Yamagishi Kazutoshi 6c678b7472 Fix locale key for account card (#2866)
8 years ago
m4sk1n fd1e29c3f8 i18n: Updated Polish translation (#2832)
8 years ago
alpaca-tc ddc34feb58 Optimize follower_accounts and following_accounts (#2820)
8 years ago
gentaro dacdfec973 Added japanese version of terms of service and privacy policy (#2703)
8 years ago
AA4ch1 a50a87457e Fix language selector on preferences page (#2794)
8 years ago
Yamagishi Kazutoshi 566e0a772d Improve style for form in site settings (#2796)
8 years ago
Matt Jankowski 2bd132d458 Replace best_in_place editor on admin settings page (#2789)
8 years ago
ヨイツの賢狼ホロ | 3rd style 1c469ca98b i18n: Update zh-CN [ Chinese (China) ] translations. (#2699)
8 years ago
Eugen Rochko f5bf5ebb82 Replace sprockets/browserify with Webpack (#2617)
8 years ago
Kaylee 7880671f35 Add option to disable two factor auth in admin accounts panel. (#2584)
8 years ago
Matt Jankowski b5eec34230 Add admin area view partials for each record type (#2700)
8 years ago
Audun Larsen e68c0ce5f6 Norwegian translation for email notifications (#2673)
8 years ago
Yamagishi Kazutoshi 6f75c8451d Fix subscription expiration condition (#2715)
8 years ago
Yamagishi Kazutoshi b9b78549f3 Make it possible to check Subscription that has expired (#2712)
8 years ago
Ira 438ce5809f Add Hebrew interface translation. (#2573)
8 years ago
Giuseppe Pignataro 2bd46f442d Italian translation (#2654)
8 years ago
Matt Jankowski f025cc6782 Filter on allowed user language preferences (#2361)
8 years ago
Yamagishi Kazutoshi 298d28af51 Fix API for Mastodon version (#2590)
8 years ago
Matt Jankowski 9262f6968b Fix broken spec for about/links view partial (#2586)
8 years ago
Yamagishi Kazutoshi 01c206326f Hide get started link when register closed (#2583)
8 years ago
Matt Jankowski 9566893cc9 More controller specs (#2561)
8 years ago
Matt Jankowski 9736753985 Fix remote follow (#2547)
8 years ago
Patrick Figel 074e9612a2 fix partial path in admin/reports (#2546)
8 years ago
Eugen Rochko b48c9013aa Bump version, improve how version is stored for better commit history (#2526)
8 years ago
Ashley 1736badf28 Added '(dev)' to the title in development mode (#2524)
8 years ago
Eugen Rochko 88725d6ce8 OEmbed support for PreviewCard (#2337)
8 years ago
Evan Minto e595ccb294 Add ActivityPub Actor id to WebFinger JSON. (#2522)
8 years ago
Matt Jankowski 0618f09939 Add spec coverage and refactor authorize_follows controller (#2505)
8 years ago
Koala Yeung a23eaf720e Update Russian translation (rebased) (#2503)
8 years ago
Lindsey Bieda 25cbb8454c Red favicon for dev (#2470)
8 years ago
Francis Chong 193dddb433 Add media dimensions (#2448)
8 years ago
STJrInuyasha 1b9447853b Login link for single user instances (#2393)
8 years ago
Evan Minto 122d59ac41 Change ActivityPub paging to match spec. Clean up ActivityPub outbox changes. (#2410)
8 years ago
Eugen e59f5c8e13 Add an RTL stylesheet for Arabic i18n (#2378)
8 years ago
Matt Jankowski 092fdc89fa Fix flashes partial render error for controllers which don't inherit from application controller (#2400)
8 years ago
Effy Elden 1801a36414 Report processing improvements (#2349)
8 years ago
Eugen 501514960a Followers-only post federation (#2111)
8 years ago
Ash Furrow ef5937da1f Fixes problem with showing non-local accounts. (#2371)
8 years ago
ymmtmdk 072c6f1527 Add link for domain in land strip (#2306)
8 years ago
Evan Minto 66fd8e7821 ActivityPub: Add basic, read-only support for Outboxes, Notes, and Create/Announce Activities (#2197)
8 years ago
Ash Furrow 723f25a999 Admin UI for confirming users (#2245)
8 years ago
Matt Jankowski 532bec6e56 Clean up flash display in views (#2336)
8 years ago
Wesley Ellis a1174a6d7e Add og:url tags (#2298)
8 years ago
ThibG fe43991d02 Add author/actor URI to the list of webfinger aliases (#2319)
8 years ago
Matt Jankowski 629d35e6f5 [WIP] Html lang on statuses (#2297)
8 years ago
Matt Jankowski 67dea31b0f 2FA controller cleanup (#2296)
8 years ago
Koala Yeung 935aecdc32 Add Indonesian (Bahasa Indonesia / id) translation (#2200)
8 years ago
Matt Jankowski 452dc6b5fe Use local_time gem for timezone replacement (#2174)
8 years ago
Sebastian Morr 74c474a652 Display remaining characters when editing display name and bio (#2219)
8 years ago
Yamagishi Kazutoshi ceecf96208 Add crossorigin="anonymous" to about (#2272)
8 years ago
Jérémy Benoist b3329c362e Open authorized application in a new window (#2250)
8 years ago
Ash Furrow a0ed88a99b Adds version to about/more and API (#2181)
8 years ago
Matt Jankowski 2dda356e3f Clean up settings/preferences controller (#2237)
8 years ago
Matt Jankowski 598d3defd5 Use default locale for html lang in layouts (#2212)
8 years ago
Matt Jankowski 7f8044d913 Link to profile/feed/salmon from admin/accounts show page (#2186)
8 years ago
Eugen baabbce672 Fix double-escaping of display names in <title> (#2155)
8 years ago
Matt Jankowski 708bdd53f1 Remove unused view files in accounts/ (#2153)
8 years ago
Yamagishi Kazutoshi 2510119f19 Add meta tags for OGP to following & follow page (#2052)
8 years ago
Matt Jankowski 8bac0350d1 Restful refactor of accounts/ routes (#2133)
8 years ago
Matt Jankowski 55e1503522 Instances list in admin (#2095)
8 years ago
Matt Jankowski 66d8f99a30 Admin reports with accounts (#2092)
8 years ago
Matt Jankowski 84b5fae8e3 Simplify renders in views (#2084)
8 years ago
Eugen Rochko 57d784f1e4 Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif
8 years ago
Matt Jankowski 389f8f8249 Instance helper to replace site title helper (#2038)
8 years ago
Matt Jankowski f96f8d0176 Use .presence instead of ternary on site description for og: content (#2033)
8 years ago
Eugen 15ec4ae07b Fix #1972, fix #1870 - Fix special characters in XML, add tests (#1988)
8 years ago
Patrick Figel ffb99325ca Add gif auto-play/pause preference
8 years ago
Dale Price f3b86c1bda Add mask-icon.svg (#1572) (#1585)
8 years ago
Yuki Nakagawa 548ff54714 Optimize user setting page for mobile browser (#1924)
8 years ago
anon f8ae12909c Fix tiny typo, and added link to terms and conditions in confirmation email for Japanese. (#1975) (#1975)
8 years ago
Eugen 1955a3f444 Do not display "reset password" in admin UI for remote accounts (#1960)
8 years ago
Eugen 6d70a80263 Onboarding modal (#1883)
8 years ago
Matt Jankowski f87b51fda8 I18n health warnings (#1949)
8 years ago
Matt Jankowski 26ec042f38 Remove trailing whitespace in terms.no.html (#1933)
8 years ago
Matt Jankowski 73b0af5c93 Simplify the og:image and og:description code in stream_entries/show (#1934)
8 years ago
Matt Jankowski 7efde22c3a Use local vars in partials (#1935)
8 years ago
Eugen 5d710b1139 Make file attachment on MediaAttachment optional (#1865)
8 years ago
Eugen 8a58942c80 Fix up recovery codes design a little (#1866)
8 years ago
Matt Jankowski 3834e1e69b View spec fix (#1888)
8 years ago
Eugen 0d83569899 Fix cross-origin integrity (#1871)
8 years ago
Naouak 3d3e32befb Check for a custom css file to help customization of instances (#1368)
8 years ago
Marcin Cieślak 1c8477eab2 Give SINGLE_USER a chance to register (#1820)
8 years ago
Matt Jankowski 6670e6d33f Add password reset for users from admin accounts area (#1841)
8 years ago
Matt Jankowski 3b8908c114 About page contact email (#1839)
8 years ago
Alex Dunn 0f889523e4 views/about: use Setting.site_title instead of hardcoding (#1508)
8 years ago
Patrick Figel df4ff9a8e1 Add recovery code support for two-factor auth (#1773)
8 years ago
Matt Jankowski cde1f37d93 Use site title on tags#show page (#1802)
8 years ago
Joachim Viide ef879a8839 Send initial state in a <script type="application/json"> tag (#1806)
8 years ago
Matt Jankowski 8b74aa4217 Admin reports controller improvements (#1714)
8 years ago
maxypy a6807201d2 Implementing Subresource Integrity (#1729)
8 years ago
Thomas Citharel c0c56db0fa Translate admin (#1702)
8 years ago
Alyssa Ross 55b56e3f95 terms: remove redundant words (#1578)
8 years ago
Isabelle Knott 447b8bc44e Do not show media attachment as og:image if it was marked as NSFW (#1693)
8 years ago
Daijiro Wachi 4f781b17cc Use input type `number` for Two-factor code (#1683)
8 years ago
Matt Jankowski 137100dcf3 Clean up well-known routes/controllers (#1649)
8 years ago
Matt Jankowski 3a9eb81a80 Admin accounts controller cleanup (#1664)
8 years ago
Matt Jankowski 0e39cc6a35 Settings export refactor (#1646)
8 years ago
Knut Erik e1264bbd92 Added norwegian version of terms of service and privacy policy (#1625)
8 years ago
Ben Roberts 0254ee9795 significant improvement in microformats markup (#1063)
8 years ago
David Libeau c2a31b8032 Fix target blank on "open_in_web" link (#1612)
8 years ago
Matt Jankowski c44a700252 Quick best practice cleanup of views/helpers (#1546)
8 years ago
Matt Jankowski 7f0a865b05 Allow import/export of mutes list (#1541)
8 years ago
Thomas Citharel d90d23699c Make Reporting admin section translatable (#1549)
8 years ago
Matt Jankowski dd1ae3b109 Simplify the way the embed view is created (#1590)
8 years ago
Matt Jankowski 3ddd936b03 Refactor exports controller (#1567)
8 years ago
lindwurm fc47c1d00e [about] Moving docs link to tootsuite/documentation (#1573)
8 years ago
pinfort 6f5268b02d Add Japanese translation (#1552)
8 years ago
Eugen Rochko 2a7602cad4 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
8 years ago
blackle 06444bf050 Allow user to disable the boost confirm dialog in preferences
8 years ago
Matt Jankowski 4ada50985a Pagination improvements (#1445)
8 years ago
Eugen 12f72e1740 When avatar/header are GIF, generate static versions (#1428)
8 years ago
Matt Jankowski d2f6d9b9fb Fix issue with missing emojify class in views (#1455)
8 years ago
Olivier Humbert 082bef3027 French translation update (#1271)
8 years ago
Matt Jankowski e5282e4ec0 Clean up about page (#1282)
8 years ago
Eugen 9acdb166e8 Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278)
8 years ago
Thomas Citharel 41f8fde83e Update french translation (#1148)
8 years ago
Matt Jankowski ca44c13455 Use Setting.site_title value for `og:site_name` occurrences (#1194)
8 years ago
Joël Quenneville d4c94fa004 DRY up reblog vs original status check
8 years ago
Eugen 0adee18d73 Merge branch 'master' into feature-customized-default-locale
8 years ago
Jantso Porali 786e6f94b9 Update Finnish translations, add sample Minio config (#954)
8 years ago
Eugen Rochko e3a3422a65 Allow setting of default language through config
8 years ago
Eugen 1c351709bc Force UTF8 encoding on generated XML (#1140)
8 years ago
Eugen 6d6a429af8 Rewrite Atom generation from stream entries to use Ox instead of Nokogiri (#1124)
8 years ago
Eugen Rochko 5f54981846 New admin setting: open/close registrations, with custom message, from the admin UI
8 years ago
Eugen Rochko 68f829e11c Add basic logging of who resolved report
8 years ago
Eugen Rochko 71458dc6df When taking action on a report (silence/suspend), it dismisses all other
8 years ago
Eugen Rochko b7c1b12367 Make default admin UI page reports. Add admin UI for creating a domain block
8 years ago
Eugen Rochko 2d07cb5771 Catching rack timeout from rails doesn't work
8 years ago
Eugen Rochko 5b12624847 Add proper error page for request timeouts
8 years ago
Eugen Rochko 433cb198fa Fix landing page sign up form ignoring username field
8 years ago
Eugen Rochko bde5c0eaf9 Fix some views still not using counter caches
8 years ago
Eugen Rochko 5e26295e06 Fix #700 - hide spoilers on static pages
8 years ago
Eugen Rochko e8875c6046 Import feature for following/blocking lists (addresses #62, #177, #201, #454)
8 years ago
Eugen Rochko de22c202f5 Add counter caches for a large performance increase on API requests
8 years ago
Eugen Rochko 1c6b02f936 Fix #690 - Webfinger should handle new shortform profile URLs now (nice)
8 years ago
Eugen Rochko f864fee116 Fix up some localizations
8 years ago