962 Commits (69d348ed98f946da84afd94f2641ccc22e234580)

Author SHA1 Message Date
Yamagishi Kazutoshi d50d61a90c Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167)
7 years ago
Jenkins b42e6973a1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 3c20cfd734 Add confirmation step for email changes (#6071)
7 years ago
Otakan 1cd5812c6b delete X-UA-Compatible (#6068)
7 years ago
Branko Kokanovic 1c4142da5b Adding Serbian latin translations (#6146)
7 years ago
David Yip ed572490c1 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Akihiko Odaki 616b6867a0 Show mastodon on modal (#6129)
7 years ago
Jenkins 5975446002 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Branko Kokanovic 34a90dc266 Adding Serbian translation (#6133)
7 years ago
David Yip 01f91695f5 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
beatrix d9c2806048 keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)
7 years ago
Eugen Rochko 9427823d5c Add more instance stats APIs (#6125)
7 years ago
Jenkins 503e7fb4d8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Nolan Lawson 59a50e6489 Reduce motion for boost animation (#5871)
7 years ago
Jenkins 9ccad78647 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 87ee458079 Display deleted users' role as “Suspended” (#6080)
7 years ago
Jenkins 1366e96a02 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko d6088c5308 Add filters to admin UI for custom emojis (#6003)
7 years ago
Eugen Rochko aea3d0814b Clean up admin UI for accounts (#6004)
7 years ago
David Yip a56c9ac5dc Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko d5f4baf720 Improve public status page title (#5985)
7 years ago
kibigo! d9e1496990 Added styling
7 years ago
kibigo! a1c79ef544 Screenshot support for themes
7 years ago
kibigo! 901c08a999 Moved flavour UI into own prefs tab
7 years ago
cwm 34630e00cb pulled master, moved locale entry to new location
7 years ago
kibigo! 853082e760 Only localize js when there's a theme
7 years ago
kibigo! 99e8710095 Javascript intl8n flavour support
7 years ago
kibigo! f4c233f59f Ruby intl8n for themes
7 years ago
cwm 41bbfeec7c add initial components based off of tootsuite pr #1507
7 years ago
Yamagishi Kazutoshi 03d28b6ec8 Back to Web UI from tag page when signed in (#5943)
7 years ago
Eugen Rochko b95863ec48 Polish video player CSS, add timer on fullscreen/modal/public pages (#5928)
7 years ago
beatrix f0b37f92a9 Merge pull request #229 from glitch-soc/glitch-theme
7 years ago
Jenkins a3a7b6a848 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko b037fbf9f4 Remove rabl dependency (#5894)
7 years ago
kibigo! fd7be49523 Various fixes
7 years ago
David Yip 0002d12c24 current_theme -> current_flavour (#229)
7 years ago
David Yip 1221e3075d Merge branch 'gs-master' into glitch-theme
7 years ago
kibigo! 935946020f Fixed a name + localizations
7 years ago
kibigo! 882055afd0 Rename themes -> flavours ? ?
7 years ago
Jenkins 822dea26c3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 1447ef1d44 Add invite filter (#5862)
7 years ago
Yamagishi Kazutoshi 7f0a01a20c Fix invites form path (#5861)
7 years ago
Yamagishi Kazutoshi 53145abfbf Allow admin to deactivate invite created by users (#5860)
7 years ago
kibigo! 36b9f4df56 Skins support
7 years ago
David Yip a1d9c68198 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi d6846dce20 Show "expired" in invite index (#5838)
7 years ago
David Yip bc10a0dced Merge remote-tracking branch 'tootsuite/master'
7 years ago
Eugen Rochko 55d9abcceb Add UI for setting up account migration (#5832)
7 years ago
David Yip c9dd67a733 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi d5e4cb2ca1 Use account.username when display_name is empty (#5828)
7 years ago
Eugen Rochko bc8c951083 Add consumable invites (#5814)
7 years ago
Jenkins f504ac4ff6 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Alda Marteau-Hardi 191993c811 Use account.display_name for og:title single toot pages (#5821)
7 years ago
Jenkins 359ba16721 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko efc97d404c Add logging of admin actions (#5757)
7 years ago
kibigo! eadf1c38a5 Minor fixes
7 years ago
kibigo! 8aeda4f064 Finalized theme loading and stuff
7 years ago
David Yip 1dc24ece41 Merge remote-tracking branch 'tootsuite/master'
7 years ago
Yamagishi Kazutoshi bffc1b880b Add “staff” badge to admin user pages (#5735)
7 years ago
Eugen Rochko b89f614bd7 Profile redirect notes (#5746)
7 years ago
Jenkins 065e2388ba Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
unarist 5982d570de Move "Permissions" row into main table in /admin/accounts/:id (#5734)
7 years ago
kibigo! 5845057adb Themed prefetching
7 years ago
David Yip 5f689cdf78 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ysksn 08cb63c360 Remove empty strings (#5732)
7 years ago
Eugen Rochko 21d01d5809 Display moderator badge (green), admin badge changed to red (#5728)
7 years ago
Surinna Curtis 02ae609d9a Merge tootsuite/master at ab48f2b239
7 years ago
Eugen Rochko 80873c1134 Add option to block direct messages from people you don't follow (#5669)
7 years ago
Anna e só c4c9003f84 l10n: PT-BR translation updated (#5681)
7 years ago
Eugen Rochko 97178b6d86 Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
Quenty31 a7db7bdd96 i10n OC: Memorial (#5615) + #5467 (#5623)
7 years ago
Eugen Rochko 7f1a0241c1 Add ability to disable login and mark accounts as memorial (#5615)
7 years ago
nullkal 19f82492ab Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467)
7 years ago
MitarashiDango 3068add21d add account search condition (instance domain) (#5577)
7 years ago
Nolan Lawson ba22580c06 Add ServiceWorker caching for static assets (#5524)
7 years ago
SerCom_KC 282f0d7479 Updating Chinese (Simplified) translations (#5508)
7 years ago
Nolan Lawson 2085c1fa33 Refactor initial state: reduce_motion and auto_play_gif (#5501)
7 years ago
David Yip 2aec3c073b Merge branch 'master' into gs-master
7 years ago
nullkal 0a9cc96cdc Feature: Unlisted custom emojis (#5485)
7 years ago
beatrix ce738197b9 Merge pull request #179 from glitch-soc/keyword-mute
7 years ago
David Yip eef50289c6 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
David Yip 7caca589c1 Override Action View name inference in settings/keyword_mutes.
7 years ago
Matthew Walsh 897931099c Changes to match other timelines in 2.0
7 years ago
David Yip 4ab1534f6c Address unused translation errors.
7 years ago
David Yip e3f5ec2652 Fill in create, edit, update, and destroy for keyword mutes interface.
7 years ago
David Yip 018657a0e0 Spike out index and new views for keyword mutes controller.
7 years ago
David Yip ebfec40698 Set up /settings/keyword_mutes. #164.
7 years ago
David Yip dd4f9f18cb Merge tag 'v2.0.0' into gs-master
7 years ago
Håkan Eriksson c06052b7cf Swedish translation (#5406)
7 years ago
beatrix cda8575ae3 Merge pull request #184 from tootsuite/master
7 years ago
Nolan Lawson d7b8208a37 Fix reduced motion breaking public galleries (#5423)
7 years ago
David Yip e19bc7835a Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
KY e1357265ed Fix #5082 - disable retweet link for followers only toot (#5397)
7 years ago
Nolan Lawson a54c272a1f Add option to reduce motion (#5393)
7 years ago
David Yip ec18363c3b Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Lynx Kotoura 9aacf21af7 Adjust public hashtag pages (#5357)
7 years ago
KY d4b9f821ca Fix #5351 - Redirection with page params after copy emoji (#5387)
7 years ago
Ondřej Hruška 0f542d56b8 add duck beaks in haml
7 years ago
Ondřej Hruška 132a22ace5 Merge remote-tracking branch 'upstream/master'
7 years ago
kibigo! 02827345ae Merge upstream 2.0ish #165
7 years ago
takayamaki 4ee024e296 fix presented og:url is incorrect (#5320)
7 years ago
Nolan Lawson 3b6e5360c3 Only preload JS in /web pages (#5325)
7 years ago
takayamaki cfab4a7ce4 sign_in and sign_up views present og meta infos (#5308)
7 years ago
Eugen Rochko 5a0e862664 Fix dependency of error page generation on database (#5280)
7 years ago
nullkal 81489970fb Add moderation note (#5240)
7 years ago
Eugen Rochko b98cd0041b Redesign public hashtag pages (#5237)
7 years ago
kibigo! fb05013855 Basic static metadata styling
7 years ago
Eugen Rochko b4af50c521 Improve admin UI for custom emojis, add copy/disable/enable (#5231)
7 years ago
Eugen Rochko 06aff382bc Fix #5050 - Use summary_large_image only with media attachments (#5219)
7 years ago
Lynx Kotoura f0aa03095d Fix style of email domain block table (#5218)
7 years ago
utam0k 51f8cbfbeb Implement EmailBlackList (#5109)
7 years ago
Yamagishi Kazutoshi 6bd4e3bf97 Separate notifications preferences from general preferences (#4447)
7 years ago
Jeong Arm 985832e241 Fix stupid typo (#5184)
7 years ago
Jeong Arm ee21576c19 Korean translation (#5185)
7 years ago
Jeong Arm 0ddea5765c Append confirmation link as plain text (#5146)
7 years ago
Eugen Rochko 0783f18274 Make Chrome splash screen same color as web UI's background color (#5169)
7 years ago
Eugen Rochko 06ef1b0ac4 Reorganize preferences page (#5161)
7 years ago
Ondřej Hruška 18988b89cf add login form to landing page if regs are closed
7 years ago
kibigo! 9bee4d313a HAML fix
7 years ago
Eugen Rochko 20ff1c629d Remove dependency on db during assets:precompile (#5138)
7 years ago
kibigo! 62fbd4d247 Fixed lingering upstream Theme code
7 years ago
kibigo! 9feca5cabf new HAML for statuses
7 years ago
Ondřej Hruška 282a126b3f Merge remote-tracking branch 'origin/better-themeing' into merging-upstream
7 years ago
Ondřej Hruška 0cc795db6b Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream
7 years ago
Ondřej Hruška 914c0465b1 Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
7 years ago
kibigo! aac16a82d6 Better themeing support!!
7 years ago
Eugen Rochko 1767f9817c New error page graphic. Other error page improvements (#5099)
7 years ago
Eugen Rochko 6b0ea1e79c Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067)
7 years ago
Eugen Rochko 9ad1bfbc18 In detail status view, display attachment uncropped if there's only one (#5054)
7 years ago
Eugen Rochko da257754b5 Add emoji autosuggest (#5053)
7 years ago
Eugen Rochko d2aeb45461 Fix custom emojis not detected when used in content warning (#5049)
7 years ago
Eugen Rochko 16a5d1450c Switch from EmojiOne to Twemoji, different emoji picker (#5046)
7 years ago
kibigo! 41832d083e Pinned toots; embeds
7 years ago
Andrew b4842ef0b9 Add support for multiple themes (#4959)
7 years ago
unarist 57c5493d4e Hide sensitive image in default on the public pages (#5009)
7 years ago
Eugen Rochko e9bb7e62b1 Admin interface for listing, adding and removing custom emojis (#5002)
7 years ago
Eugen Rochko eb345f8e8b Custom emoji (#4988)
7 years ago
BruWalfas f4d0774877 A few updates to the Spanish translation and some typos fixing (#4997)
7 years ago
Yamagishi Kazutoshi a3d75ce672 Do not add image size without meta to OGP (regression from #4901) (#4995)
7 years ago
Yamagishi Kazutoshi 313d90b8f4 Add `strip_insignificant_zeros: true` option to `number_to_human` (#4993)
7 years ago
Lynx Kotoura 8585421eb1 Oauth code in input form and add description message (#4986)
7 years ago
Mingye Wang 9b85c3a13f Minor Chinese check & jsx addition (#4973)
7 years ago
Lynx Kotoura b5ec3346fa Adjust landing pages 2 (#4967)
7 years ago
Eugen Rochko fbec33df62 Redesign video player (#4911)
7 years ago
Eugen Rochko 9ff429aa6d Uploads for admin site settings (#4913)
7 years ago
nullkal 7f432a97a0 Add instance search feature (#4925)
7 years ago
nullkal 405b24ca30 Make instance names in into links to user list in the instance (#4924)
7 years ago
unarist 94fdf7da70 Add section for protocol specific information on the admin page (#4910)
7 years ago
Eugen Rochko d4fd2a39e6 Clean up and improve generated OpenGraph tags (#4901)
7 years ago
unarist b25c112d31 Reset preview image if avatar/header image selection was cancelled (#4893)
7 years ago
Anna e só d639474d8c l10n: Full PT-BR translation (#4882)
7 years ago
David Yip f90abccf33 Merge tag 'v1.6.0' into sync/upstream
7 years ago
Eugen Rochko 6628ea4a82 Default follows for new users (#4871)
7 years ago
David Yip 017738c604 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
7 years ago
David Yip 67d9178007 Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
David Yip da3f22ee7d Merge branch 'origin/master' into sync/upstream
7 years ago
Quent-in 899e7ad811 i10n minors changes for 1.6 (#4867)
7 years ago
Lynx Kotoura c268118e5b Scrollable tables in settings pages (#4857)
7 years ago
Eugen Rochko a27821f725 Fix language filter codes (#4841)
7 years ago
Quent-in cbe9eb3f2e i10n OC / FR update Pinned toots (#4842)
7 years ago
Lynx Kotoura 5a27eaae7c Adjust status embeds (#4808)
7 years ago
Eugen Rochko ce3a71690b Fix #4551 - Use correct syntax for content preloading (#4798)
7 years ago
Lynx Kotoura f13b1b67f5 Adjust settings pages (#4765)
7 years ago
Yamagishi Kazutoshi 690e59b1f0 Fix profile page when use system's font (#4774)
7 years ago
m4sk1n 186416830e Add link to 'noscript' message (#4561)
7 years ago
Yamagishi Kazutoshi 8d4e705cb0 Use system's default font on non web UI pages (#4553)
7 years ago
Eugen Rochko 651c659fd6 Update status embeds (#4742)
7 years ago
Eugen Rochko 007d26852d Shorten display of large numbers on public profiles (#4711)
7 years ago
Yamagishi Kazutoshi dc19078b59 Fix missing at-sign (regression from #4688) (#4705)
7 years ago
Yamagishi Kazutoshi 5e3c6f63be Change timezone of the datetime to what browser specifies (#4688)
7 years ago
Yamagishi Kazutoshi 5482e0d10e Add label for application scopes (#4691)
7 years ago
Eugen Rochko 3e20cb7025 Pinned statuses (#4675)
7 years ago
nullkal da85aff49c Use checkboxes for application scope setting (#4671)
7 years ago
Eugen Rochko b13501268f Fix up the applications area (#4664)
7 years ago
Daigo 3 Dango fd9d66dfd4 Add Mastodon::Source.url (#4643)
7 years ago
Colin Mitchell 63b98318c5 Application prefs section (#2758)
7 years ago
nightpool 6cce0bb080 use existing inflections instead of custom helper (#4624)
7 years ago
nullkal a90b5796a1 Show what protocol is used for accounts in admin/accounts#index (#4622)
7 years ago
Eugen Rochko 2dba0368f8 Redesign public profiles (#4608)
7 years ago
unarist 40ec0f45fb Update /admin/accounts/:id view for ActivityPub (#4600)
7 years ago
Eugen Rochko 0e5c8372e7 Add protocol handler. Handle follow intents (#4511)
7 years ago
Eugen Rochko 34962d9f9d Add alternate links to ActivityPub resources from HTML/HEAD variants (#4586)
7 years ago
Lynx Kotoura cbcac23679 Fix short description in about/more page (#4554)
7 years ago
TheInventrix f4017cce3f unify short description styling (#4548)
7 years ago
Ondřej Hruška 913dd13575 Merge remote-tracking branch 'upstream/master'
7 years ago
Lynx Kotoura bac2a77deb Adjust tags and accounts page (#4534)
7 years ago
Eugen Rochko fd69694749 Add "signed in as" header to some pages (#4523)
7 years ago
kibigo! 2cdee6ae8a Merge upstream (#111)
7 years ago
Masoud Abkenar 755a7f2646 i18n: update Persian translation (#4470)
7 years ago
unarist 15a8d9b0ca Make salutation of email localizable (#4454)
7 years ago
Gô Shoemake 58446d39d8 Multiple frontend support (#110)
7 years ago
Yamagishi Kazutoshi 5d364da590 Do not create empty a element when there is no e-mail (#4455)
7 years ago
Lynx Kotoura 71bea1cd76 Set contact address in about/more as mailto link (#4450)
7 years ago
Lynx Kotoura b7482e4a9f Fix autocomplete option in haml files (#4438)
7 years ago
Eugen Rochko 043dfdb474 Fix current session not being displayed in sessions list (#4424)
7 years ago
Ondřej Hruška 74e54cd45b Added external link icons to joinmastodon navbar buttons (#4368)
7 years ago
Ondřej Hruška affd86c1dc Add .fa-external-link to instance list link
7 years ago
Ondřej Hruška 2129485669 Fix JS errors and add back commit hash
7 years ago
Ondřej Hruška 7072288bcf Merge git://github.com/tootsuite/mastodon into tootsuite-master
7 years ago
Yamagishi Kazutoshi 9510179cc1 Send short account URL to remote instance (regression from #3844) (#4355)
7 years ago
Eugen Rochko 0d0b225136 Fix oddities with public profile CSS (#4341)
7 years ago
Eugen Rochko fae1d9052b Redesign /terms page (#4338)
7 years ago
Eugen Rochko e43e0e959c Redesign extended information page (#4322)
7 years ago
sdukhovni 961f103c35 Allow domain blocks that only reject media without silencing or suspending (#4325)
7 years ago
Yamagishi Kazutoshi 99dfbbf623 Fix manifest description (regression from #4122) (#4324)
7 years ago
Eugen Rochko cdaf19daeb Improve noscript message and style (#4315)
7 years ago
Yamagishi Kazutoshi 2e766841f3 Change logo.png to logo.svg for web UI (#4307)
7 years ago
Eugen Rochko 78c7c9fb0f New logo (#4306)
7 years ago
Ondřej Hruška 1dda0acdcb Merge pull request #92 from tootsuite/master
7 years ago
Eugen Rochko 6ab3893157 Turn clouds on landing page into SVGs, use SCSS variables to color them (#4299)
7 years ago
beatrix-bitrot 8deb2072ef Merge that good fresh upstream shit
7 years ago
Eugen Rochko c35ea3636c Fix #3220 - Show avatar/header on edit profile page (#4288)
7 years ago
Eugen Rochko 9d8d1d90e0 Add button to re-subscribe to all accounts from a domain (#4285)
7 years ago
beatrix 64a107bc64 Merge pull request #87 from tootsuite/master
7 years ago
Yamagishi Kazutoshi 9392d10250 Add feature to revoke sessions (#4259)
7 years ago
kibigo! 0b64d60988 Fix for stylesheet split
7 years ago
Ondřej Hruška ed6c60a0c2 Merge changes from upstream with the CSS reload fix
7 years ago
Yamagishi Kazutoshi 87bb16a236 Add unfollow modal (optional) (#4246)
7 years ago
abcang e3251e74c1 Improve admin page (#4121)
7 years ago
Yamagishi Kazutoshi fe4429446f Add empty alt attribute to img elements in landing page (#4243)
7 years ago
kibigo! f48f42598f Merge upstream (#81)
7 years ago
Eugen Rochko c99f41dc3c Improve ActivityPub representations (#3844)
7 years ago
Sorin Davidoi 8207918890 🎄🔨 Force tree shake emojione (#4202)
7 years ago
Eugen Rochko 7d8fd050eb Add option to opt out of search engines on public profile/status pages (#4199)
7 years ago
Yamagishi Kazutoshi 5b2a54e305 Do not load unnecessary script files (#4193)
7 years ago
Sorin Davidoi ecab38fd66 Web Push Notifications (#3243)
7 years ago
kibigo! bcc30c8697 Merge upstream!! #64 <3 <3
7 years ago
Eugen Rochko 8abeec1f4f Improve UI of admin site settings (#4163)
7 years ago
DJ Sundog be8eed1bd9 First lame pass at adding optional git commit hash display on /about/… (#67)
7 years ago
Eugen Rochko 49026e27e8 Redesign the landing page, mount public timeline on it (#4122)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) b9e0dbe326 Require stylesheets in common.js (#4152)
7 years ago
STJrInuyasha 098eef3211 Remote following success page (#4129)
7 years ago
Yamagishi Kazutoshi 865f5170a8 Add setting a always mark media as sensitive (#4136)
7 years ago
Sorin Davidoi 4264c62111 refactor: Make all reducers sync (#4125)
7 years ago
abcang 87e607cab2 Change account link to admin account link on report page (#4119)
7 years ago
Eugen Rochko 0d54e620d9 Replace OEmbed and initial state Rabl templates with serializers (#4110)
7 years ago
Sylvhem 9f5ab101ee Various fixes in the French translation (#4107)
7 years ago
Sorin Davidoi 40b32ffb12 Lazy load components (#3879)
7 years ago
Eugen Rochko 20e15ecfb3 Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)
7 years ago
のら 82e6af199a Togglable filter links (#4021)
7 years ago
Damien Erambert 387de88e2f Add a setting allowing the use of system's default font in Web UI (#4033)
7 years ago
abcang a4615ad12a Improve Activity stream spoiler (#4088)
7 years ago
Yamagishi Kazutoshi 560b6e861c Format datetime of subscriptions on admin UI (#4078)
7 years ago
Yamagishi Kazutoshi 68abc90aec Customizable privacy policy from admin interface (#4062)
7 years ago
Yamagishi Kazutoshi 5829ad0799 Add fa-fw class to user agent icon (#4047)
7 years ago
kibigo! 9dae02caeb Images now behind CWs on static pages
7 years ago
kibigo! ea972105b9 Improvements to static metadata styling, especially for mobile
7 years ago
kibigo! fe5edb4175 Backend YAML Processing + Profile Metadata on Static Pages
7 years ago
m4sk1n a7547bd97f i18n: Use instance name in email notifications instead of Mastodon (pl) (#3976)
7 years ago
beatrix-bitrot cdcb74ffb6 Merge remote-tracking branch 'upstream/master'
7 years ago
Midgard 39b7512782 Use instance name in email notifications instead of "Mastodon" (#3763)
7 years ago
Eugen Rochko d0221b05bc Fix #1624 - Send e-mail notifications to admins about new reports (#3949)
7 years ago
beatrix-bitrot ecfb516588 update bio length to 500
7 years ago
Eugen Rochko b90a44b6d0 Fix #3910 - Require OTP authentication to disable 2FA (#3935)
7 years ago
Eugen Rochko c465c5b3a8 Add overview of active sessions (#3929)
7 years ago
Charlotte Fields a7a7613e71 cybre cleanup
7 years ago
Chronister 2edadd7fe7 All cybrespace changes through 5/28
7 years ago
masarakki d947978192 setting-for-account-deletable (#3852)
8 years ago
Daigo 3 Dango 0483235216 Link to /about from public page on a single user instance (#3814)
8 years ago
Eugen Rochko 8bed91d94c Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847)
8 years ago
abcang 3d49aa4bfb Fix ogp url (#3802)
8 years ago
Eugen Rochko 1c7e2ddd65 Account deletion (#3728)
8 years ago
Eugen Rochko 9ba171309b Simplify getting started links localization. Link "powered by Mastodon" to joinmastodon.org (#3725)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 5c54ae381a Localize date in digest and cover NotificationMailer more (#3694)
8 years ago
Eugen Rochko b8bc26d60f Improve RTL detection (#3682)
8 years ago
Yamagishi Kazutoshi 7f99456ab0 Refactor views/admin/reports/show.html.haml (#3656)
8 years ago
Eugen Rochko 9eefd60136 Add explit admin actions to (re)subscribe/unsubscribe remote accounts (#3640)
8 years ago
Sorin Davidoi 4ce6597e3a fix: Warn if JavaScript is disabled (#3634)
8 years ago
STJrInuyasha 8e32541b74 Don't show business e-mail if it's blank (#3619)
8 years ago
Eugen Rochko 143ab47410 Fix #3063 - Add dynamic app manifest (#3563)
8 years ago
IkUrA ade29d417f Add streaming_api_base_url to /api/v1/instance (#3556)
8 years ago
Yamagishi Kazutoshi c55eaa47e0 Fix broken embed page (#3577)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 6b0fdf95b9 Resolve custom application stylesheet with Webpack (#3373)
8 years ago
Matt Jankowski 1066fd1ab5 Spec coverage and refactor for the api/v1/accounts controllers (#3451)
8 years ago
Matt Jankowski 81ce4e4318 Move admin/pubsubhubbub controller to admin/subscriptions (#3442)
8 years ago
Matt Jankowski deb4ae7392 Add Instance class to list admin records (#3443)
8 years ago
Matt Jankowski 533a8cc68b Misc tidying and clean ups (#3445)
8 years ago
Matt Jankowski b89dbac199 Refactor and spec coverage for api/v1/timelines actions (#3482)
8 years ago
Atsushi Yamamoto 4547e3585a Add preference setting for delete toot modal (#3368)
8 years ago
Eugen Rochko a46c2a5e19 Fix #2922 - Load stylesheet from "custom.css" entrypoint when present (#3332)
8 years ago
Quent-in 8b906782a2 i18n update for Occitan language (#3362)
8 years ago
Eugen Rochko 04a0a1d4ba Add "meta" attribute to return of POST /api/v1/media method as well (#3333)
8 years ago
Yamagishi Kazutoshi 19241464e8 Add localization of datetime in public page (#3296)
8 years ago
Daigo 3 Dango 97882e63a4 Replace \u2014 with &mdash; (#3301)
8 years ago
alpaca-tc 46ca699d72 Toggle sensitive from admin page (#3261)
8 years ago
Matt Jankowski fecc2c2f47 Refactor of API timeline actions (#3263)
8 years ago
Eugen Rochko a2f664f763 Fix locale regression from #3055 (#3231)
8 years ago
Nolan Lawson 2d7aacf747 Only load Intl data for current language (#3130)
8 years ago
Masoud Abkenar 9ce65dd7dc Persian translation update (#3206)
8 years ago
Eugen Rochko 9f05b5a078 Fix forgotten to include language attribute in statuses JSON (#3209)
8 years ago
vidarlee 601c3668e3 Enhance for the Chinese translation (#3198)
8 years ago
Eugen Rochko 9ade22cd04 Improve language filter preferences look (#3184)
8 years ago
Matt Jankowski 1122249e51 Filter languages with opt out (#3175)
8 years ago
ButterflyOfFire 9054d82d51 Update reset_password_instructions.ar.html.erb (#3163)
8 years ago
Eugen Rochko 5695449335 Add buttons to block and unblock domain (#3127)
8 years ago
Matt Jankowski bab5df2872 Use stylesheet_pack_tag in embedded layout, avoids pipeline deprecation warning (#3123)
8 years ago
Eugen Rochko ae6984de48 Fix character counter not updating for bio (#3101)
8 years ago
Eugen Rochko 4faf1e3d73 Add reset button to admin accounts search, improve looks a little (#3100)
8 years ago
alpaca-tc f6a167b30e Render translated view (#3093)
8 years ago
alpaca-tc c0791aa647 Add filter to AccountFilter (#2968)
8 years ago