1356 Commits (437d71bddf967573df3912ee5976f7c5a5a7b4c7)

Author SHA1 Message Date
Yamagishi Kazutoshi 8347479f5d Bump webpacker from 3.5.5 to 4.0.2 (#10277)
6 years ago
Eugen Rochko ff565524aa
Fix maxed-out invites not showing up as expired in UI (#10274)
6 years ago
Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 51e154f5e8
Admission-based registrations mode (#10250)
6 years ago
Eugen Rochko 6e3936aa6f
Improve invites list with click-to-copy inputs (#10259)
6 years ago
Eugen Rochko bbb9ff0e84 [Glitch] Redesign landing page
6 years ago
Thibaut Girka 02062aab55 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 65fffeac3f
Redesign landing page (#10232)
6 years ago
Eugen Rochko f5eeac0104
Fix remote interaction dialogs being indexed by search engines (#10240)
6 years ago
Thibaut Girka dfe7322922 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Aditoo17 6c0a96912a Change joinmastodon.org to joinmastodon.org/#getting-started for sign up on another server (#10224)
6 years ago
Thibaut Girka 5528719bc9 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 054bbb3da2
Immediately display poll results to poll author (#10187)
6 years ago
Thibaut Girka 9c5e7805cc Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
rinsuki f44091d653 Fix #10202 (#10203)
6 years ago
Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko a198add83b
Fix various issues in polls (#10165)
6 years ago
ThibG 3de71887d8 Add non-JS fallback for polls on public pages (#10155)
6 years ago
Eugen Rochko 230a012f00
Add polls (#10111)
6 years ago
Thibaut Girka ff0576cc2b Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 359d26a053 Fix “reset” button of instance filter switching to custom emoji admin panel (#10076)
6 years ago
ThibG 3a8cb6c737 Add quick link from admin account view to block/unblock instance (#10073)
6 years ago
ThibG 6840a77711 Add domain search/filter to the "Federation" (/admin/instances) page (#10071)
6 years ago
ThibG 2f7f6af26a Hide domain filter in admin page when “local” filter is active (#10074)
6 years ago
Thibaut Girka cac75e01b8 Fix static error page to use the correct pack
6 years ago
Thibaut Girka 369a475a70 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 80388a3ffe
Change error graphic to hover-to-play (#10055)
6 years ago
Thibaut Girka bf94a43496 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 1ac9a3f4bb Hide misleading “You will be sent a confirmation e-mail” hint from admin view (#9973)
6 years ago
Eugen Rochko 2557cb2f95
Fix pinned statuses being shown in a featured hashtag (#9971)
6 years ago
Eugen Rochko 364f2ff9aa
Add featured hashtags to profiles (#9755)
6 years ago
Eugen Rochko d14c276e58
Add option to overwrite imported data (#9962)
6 years ago
ThibG ed30110618 Make displaying application used to toot opt-in (#9897)
6 years ago
Thibaut Girka 05415fa5d3 Make storing and displaying application used to toot opt-in
6 years ago
Thibaut Girka 5e0cf92fd1 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko a492a9bcd3
Add information about how to opt-in to the directory on the directory (#9834)
6 years ago
Eugen Rochko 8b19903559
Improve the public hashtag page (#9831)
6 years ago
Eugen Rochko bc642ac24b
Redesign public hashtag page to use a masonry layout (#9822)
6 years ago
ThibG 2648645d05 Display a double reply arrow on public pages for toots that are replies (#9808)
6 years ago
Thibaut Girka eff1c94744 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 4fb94c758e Add attachment list fallback to public pages (#9780)
6 years ago
Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko a269ffdfa5
Change "federation" admin UI link to point to "limited" domains (#9762)
6 years ago
Eugen Rochko 1c6588accc
Redesign admin instances area (#9645)
6 years ago
Eugen Rochko 5654535728
Change remote interaction dialog to use specific actions (#9743)
6 years ago
ThibG 6f9a7bd02c Add quick links to the admin interface in the WebUI (#8545)
6 years ago
Eugen Rochko 664bb7bb72
Add preview cards to non-detailed statuses on public pages (#9714)
6 years ago
Eugen Rochko c39c112ced
Fix admin UI view of local followers (#9712)
6 years ago
Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 66436d0895
Improve e-mail digest (#9689)
6 years ago
Eugen Rochko 7fc7437d05
Add CSV export for lists and domain blocks (#9677)
6 years ago
Thibaut Girka 115b1abb6e Rename hide_followers_count helper to hide_followers_count?
6 years ago
Thibaut Girka 374bae0abe Do not leak followers count on public pages
6 years ago
Eugen Rochko 6e49907ecf
Improve admin UI for account view (#9643)
6 years ago
chr v1.x c3465f699e Add local followers page to admin account UI (#9610)
6 years ago
Eugen Rochko 5d2fc6de32
Add REST API for creating an account (#9572)
6 years ago
Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko bb62827c16
Remove links to bridge.joinmastodon.org (non-functional) (#9608)
6 years ago
Eugen Rochko 3c033c4352
Add moderation warnings (#9519)
6 years ago
Thibaut Girka bc113927d6 Move hide_followers_count logic to an helper
6 years ago
Thibaut Girka bd23288a52 Add a per-user setting to hide followers count
6 years ago
Thibaut Girka 9e04b2e8a4 Per-user followers count display in profile directory
6 years ago
Thibaut Girka a1c56fcef1 Add admin setting to disable followers count
6 years ago
Thibaut Girka e8d5affe06 Restore oops.gif animation for user who have auto_play_gif set
6 years ago
Thibaut Girka 0c2d48b60a Replace animated oops.gif by a non-animated image
6 years ago
Thibaut Girka 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 087e118971
Remove "most popular" tab from profile directory, add responsive design (#9539)
6 years ago
Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 7c48688d85 Make avatar and headers respect `auto_play_gif` (#9515)
6 years ago
ThibG 11a91592aa Restore profile links in /admin/accounts (#9494)
6 years ago
ThibG cf6ee4ff24 Add admin ability to remove an user's header image (#9495)
6 years ago
ThibG 720daa8143 Add instance-wide setting to disable profile directory (#9497)
6 years ago
Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 81bda7d67c Add setting to not aggregate reblogs (#9248)
6 years ago
Eugen Rochko 6b78e5b5ab
Cache hashtag sample accounts, and exclude ineligible ones (#9465)
6 years ago
Paweł Ngei 5c7f641565 Escape HTML in profile name preview in profile settings (#9446)
6 years ago
Eugen Rochko ecd303c097
Fix various things in the directory (#9449)
6 years ago
Eugen Rochko 73be8f38c1
Add profile directory (#9427)
6 years ago
Thibaut Girka 1a5de04789 Display a double reply arrow on public pages for toots that are replies
6 years ago
Thibaut Girka ad7a3974cc Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG fa9f28f52d Swap avatar and header input fields in profile page (#9271)
6 years ago
Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 73faadad28
Redesign admin accounts index (#9340)
6 years ago
Alexandre Alapetite d1d2377870 WebSub: ATOM before RSS (#9302)
6 years ago
mayaeh bdd3c8c255 Change the password form order (#9267)
6 years ago
Thibaut Girka 9201398507 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko ccbdf689e8
Fix form validation flash message color and input borders (#9235)
6 years ago
Thibaut Girka 1c448d6474 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko cc45a8f9f7
Fix td instead of th in sessions table header (#9162)
6 years ago
ash lea 7ec3f6022d move some constants to rails environment
6 years ago
Thibaut Girka 5bb8563f6c Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 161aeadbb4
Remove character counter from edit profile (#9100)
6 years ago
Yamagishi Kazutoshi e8ffecbd36 Set @body_classes to admin layout (#9081)
6 years ago
Eugen Rochko d723f2a0a8
Fix RTL layout of status display names (#9075)
6 years ago
Thibaut Girka dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 84cf78da8a Fix og:url on toots' public view (#9047)
6 years ago
Eugen Rochko fd5285658f
Add option to block reports from domain (#8830)
6 years ago
Eugen Rochko 9486f0ca77
Add "disable" button to report screen (#9024)
6 years ago
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)
7 years ago
Eugen Rochko 7eec279c7f
Change language opt-out to language opt-in (#7823)
7 years ago
Thibaut Girka db200226b8 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko ca85658975
Add autofollow option to invites (#7805)
7 years ago
David Yip 5cff053944
Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
7 years ago
David Yip e931cf656d
Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions
7 years ago
Jenkins 4d8d1fa129 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip f9eb4ea80a
Merge pull request #506 from ThibG/glitch-soc/fixes/static-500
7 years ago
Eugen Rochko 9b9e96eae5
Add "Edit profile" link to public profile page, increase bottom padding (#7754)
7 years ago
David Yip 8142bd2553
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi c0fc4e9935 Remove unnecessary underline on accounts table (#7728)
7 years ago
David Yip 97d2df77aa
Add apply-to-mentions option to keyword mute UI. #454.
7 years ago
Thibaut Girka e8a9627f66 Hardcode default skin/theme in error layout (fixes #373)
7 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