186 Commits (44b1a39682f7b93642726695980bbd600ee529fe)

Author SHA1 Message Date
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
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
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko 5f3bee345d
Fix container regression (#6531)
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
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
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
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 933840bebf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Otakan ce854ed506 delete X-UA-Compatible (#6068)
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 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
kibigo! 1c728df92e Only localize js when there's a theme
7 years ago
kibigo! b28cd6769c Javascript intl8n flavour support
7 years ago
kibigo! 5bed0f10ed Various fixes
7 years ago
kibigo! bc4fa6b198 Rename themes -> flavours ? ?
7 years ago
kibigo! 541fe9b110 Skins support
7 years ago
kibigo! 8812bab687 Minor fixes
7 years ago
kibigo! bdbbd06dad Finalized theme loading and stuff
7 years ago
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936
7 years ago
Nolan Lawson 3de22a82bf Refactor initial state: reduce_motion and auto_play_gif (#5501)
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
Ondřej Hruška 0bf9261e65
Merge remote-tracking branch 'upstream/master'
7 years ago
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165
7 years ago
Nolan Lawson 6a50329a9c Only preload JS in /web pages (#5325)
7 years ago
Eugen Rochko 6e9e0c14e6 Fix dependency of error page generation on database (#5280)
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
Ondřej Hruška 83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
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 1e02ba111a Add emoji autosuggest (#5053)
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
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
Eugen Rochko 09cffaaf04 Fix #4551 - Use correct syntax for content preloading (#4798)
7 years ago
Yamagishi Kazutoshi 6fd2e8c3c5 Fix profile page when use system's font (#4774)
7 years ago
Yamagishi Kazutoshi 2305f7c391 Use system's default font on non web UI pages (#4553)
7 years ago
Ondřej Hruška 7a1ca8b0df Merge remote-tracking branch 'upstream/master'
7 years ago
Eugen Rochko df605f0f8b Add "signed in as" header to some pages (#4523)
7 years ago
Gô Shoemake b61e3daf98 Multiple frontend support (#110)
7 years ago
Eugen Rochko 0e0f18ce7c New logo (#4306)
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
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
Sorin Davidoi 37c832cdf7 refactor: Make all reducers sync (#4125)
7 years ago
Sorin Davidoi 348d6f5e75 Lazy load components (#3879)
7 years ago
Daigo 3 Dango 5bd3715a4c Link to /about from public page on a single user instance (#3814)
8 years ago
Eugen Rochko 47ace633dc Simplify getting started links localization. Link "powered by Mastodon" to joinmastodon.org (#3725)
8 years ago
Yamagishi Kazutoshi 4addf051d4 Fix broken embed page (#3577)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) e98559c3ff Resolve custom application stylesheet with Webpack (#3373)
8 years ago
Eugen Rochko 62ca37884a Fix #2922 - Load stylesheet from "custom.css" entrypoint when present (#3332)
8 years ago
Daigo 3 Dango 838f51770b Replace \u2014 with — (#3301)
8 years ago
Nolan Lawson 9d04de1c8d Only load Intl data for current language (#3130)
8 years ago
Matt Jankowski d2542dcec0 Use stylesheet_pack_tag in embedded layout, avoids pipeline deprecation warning (#3123)
8 years ago
Akihiko Odaki 85c9496340 Introduce common JavaScript file (#2981)
8 years ago
yhirano 48594b18e6 Added haml-lint and fix warnings (#2773)
8 years ago
Eugen Rochko f5bf5ebb82 Replace sprockets/browserify with Webpack (#2617)
8 years ago
Ashley 1736badf28 Added '(dev)' to the title in development mode (#2524)
8 years ago
Lindsey Bieda 25cbb8454c Red favicon for dev (#2470)
8 years ago
STJrInuyasha 1b9447853b Login link for single user instances (#2393)
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
Matt Jankowski 532bec6e56 Clean up flash display in views (#2336)
8 years ago
Matt Jankowski 598d3defd5 Use default locale for html lang in layouts (#2212)
8 years ago
Eugen baabbce672 Fix double-escaping of display names in <title> (#2155)
8 years ago
Matt Jankowski 389f8f8249 Instance helper to replace site title helper (#2038)
8 years ago
Dale Price f3b86c1bda Add mask-icon.svg (#1572) (#1585)
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
maxypy a6807201d2 Implementing Subresource Integrity (#1729)
8 years ago
Matt Jankowski ca44c13455 Use Setting.site_title value for `og:site_name` occurrences (#1194)
8 years ago
Eugen 1c351709bc Force UTF8 encoding on generated XML (#1140)
8 years ago
Eugen Rochko e8875c6046 Import feature for following/blocking lists (addresses #62, #177, #201, #454)
8 years ago
Eugen Rochko 6b81d10030 Add digest e-mails
8 years ago
Eugen Rochko d2619e0b53 Site title is now a setting
8 years ago
Eugen Rochko f4bc9620a9 Update settings to re-use admin layout, one big navigation tree, improve settings forms
8 years ago
Eugen Rochko e22a56183a Improve error page layouting. 500 page has to stay static because it's
8 years ago
Effy Elden f876a8681d Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places
8 years ago
Eugen Rochko f79ba2de83 Fix admin UI not loading JS, make sure to strip "acct:" out of remote account's usernames when authorizing follow
8 years ago
Eugen Rochko b302b9202b Add page for authorizing/rejecting follow requests
8 years ago
Eugen Rochko 587bf6820e Improved launcher icon on Android
8 years ago
Eugen Rochko e09d3a2c66 Fix #249 - use window.location hack to let people login from sandboxed iOS homescreen
8 years ago