1045 Commits (6fe48dd050a84841c09bb1290a3e3cf99a795824)

Author SHA1 Message Date
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)
7 years ago
Eugen Rochko 62ca37884a Fix #2922 - Load stylesheet from "custom.css" entrypoint when present (#3332)
7 years ago
Quent-in 4b0c667c09 i18n update for Occitan language (#3362)
7 years ago
Eugen Rochko 9ea4f37e78 Add "meta" attribute to return of POST /api/v1/media method as well (#3333)
7 years ago
Yamagishi Kazutoshi 531c1bb245 Add localization of datetime in public page (#3296)
7 years ago
Daigo 3 Dango 838f51770b Replace \u2014 with &mdash; (#3301)
7 years ago
alpaca-tc 7ee5fc5d68 Toggle sensitive from admin page (#3261)
7 years ago
Matt Jankowski 4289ed1d13 Refactor of API timeline actions (#3263)
7 years ago
Eugen Rochko 48e7a22e34 Fix locale regression from #3055 (#3231)
7 years ago
Nolan Lawson 9d04de1c8d Only load Intl data for current language (#3130)
7 years ago
Masoud Abkenar b69365e397 Persian translation update (#3206)
7 years ago
Eugen Rochko a478af92c3 Fix forgotten to include language attribute in statuses JSON (#3209)
7 years ago
vidarlee 440441ccb3 Enhance for the Chinese translation (#3198)
7 years ago
Eugen Rochko d78f555254 Improve language filter preferences look (#3184)
7 years ago
Matt Jankowski 8f4b7c1820 Filter languages with opt out (#3175)
7 years ago
ButterflyOfFire 8ed3fa1693 Update reset_password_instructions.ar.html.erb (#3163)
7 years ago
Eugen Rochko f1ab70649b Add buttons to block and unblock domain (#3127)
7 years ago
Matt Jankowski d2542dcec0 Use stylesheet_pack_tag in embedded layout, avoids pipeline deprecation warning (#3123)
7 years ago
Eugen Rochko 76449df903 Fix character counter not updating for bio (#3101)
7 years ago
Eugen Rochko 226c9836e4 Add reset button to admin accounts search, improve looks a little (#3100)
7 years ago
alpaca-tc b397f69633 Render translated view (#3093)
7 years ago
alpaca-tc e89e4355eb Add filter to AccountFilter (#2968)
7 years ago
spla a51c8074df Add catalan language (#3084)
7 years ago
Hiroaki Ninomiya cb50ecdb07 chore(landing_strip): hide signup path unless the instance allows registration. (#3055)
7 years ago
Akihiko Odaki 85c9496340 Introduce common JavaScript file (#2981)
7 years ago
Eugen Rochko d0dd9eb5b5 Feature conversations muting (#3017)
7 years ago
Stephen Burgess 4bd0488a77 feat(count): Just yml count syntax to provide different rule for 1 (#2685)
7 years ago
Shunsuke Michii 89210781cb Fix og:url. (#3031)
7 years ago
beatrix 3dcb5fa28f Revert HTML CW changes (#3020)
7 years ago
Eugen Rochko 72698bc3b4 Fix regressions from #2683 (#2970)
7 years ago
R Tucker e2491680e6 Handle hashtags in spoiler_texts (partial fix for #699) (#2683)
7 years ago
Quent-in fed585e3f4 i18n mailer files for Occitan language (#2924)
7 years ago
jeroenpraat 406229d927 Updating and extending Dutch strings (#2930)
7 years ago
Yamagishi Kazutoshi 459bbfa4b2 Prevent selection of unacceptable Content-Type files (#2910)
7 years ago
ButterflyOfFire 7140def5c9 Update simple_form.ar.yml (#2908)
7 years ago
Koala Yeung cbd673601c Add Thai langauge (#2903)
7 years ago
yhirano 48594b18e6 Added haml-lint and fix warnings (#2773)
7 years ago
Özcan Zafer AYAN 983593ddf4 Add Turkish yml file (#2878)
7 years ago
Yamagishi Kazutoshi f000673599 Remove local_time gem, and add similar (#2875)
7 years ago