50 Commits (c20b27a9f44b69756624d7a15a52187d0486f03f)

Author SHA1 Message Date
Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge
6 years ago
Maciek Baron ca2cc556f1 Crush PNGs to reduce overall size (#7954)
6 years ago
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko 90f12f2e5a
Focal points (#6520)
7 years ago
Eugen Rochko 61ed133fea
Account archive download (#6460)
7 years ago
Jenkins 0e10667fbe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 2fc2725076
Fix e-mail icon for reblog being stretched (#6336)
7 years ago
David Yip 071c2c9c85
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 79b34a0fa2
Restore onboarding modal (#6303)
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 540b3f37ae
Replace drawer elephant graphic with a vector image (#6286)
7 years ago
David Yip 26ecee79bf
Merge pull request #332 from glitch-soc/merge-upstream
7 years ago
Eugen Rochko d799921c75
Replace tutorial modal with welcome e-mail (#6273)
7 years ago
David Yip d3f64812a6
Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update
7 years ago
David Yip 201e82686f
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 7badad7797
Fix home regeneration (#6251)
7 years ago
Jenkins aa2bf07281 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 6f244ba82c
Use better reblog icon and improve contrast in HTML e-mails (#6272)
7 years ago
Eugen Rochko 02194838dd
HTML e-mails for NotificationMailer (#6263)
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
Andrew 56312df73b Z indexes and colors
7 years ago
Andrew 7a93acd803 To 2.1.2
7 years ago
Andrew 077f2e600c Win95 to 2.1
7 years ago
Andrew ed574fbc09 Theme: Windows 95
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
David Yip e4944d065b
Switch to tootsuite's elephant friend for the drawer
7 years ago
David Yip 7174d1c955
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Akihiko Odaki 65f30f65a2 Move the mastodon on Getting Started column to drawer column (#6109)
7 years ago
kibigo! bdca1614d5 Screenshot support for themes
7 years ago
kibigo! 321fa41930 Merge remote-tracking branch 'cybre/theme_win95' into glitch-theme
7 years ago
Andrew 2827f852c0 Theme: Windows 95
7 years ago
Ondřej Hruška 9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
7 years ago
Eugen Rochko 0d1215e82f Remove redundant width/height values from SVGs to fix Safari bug (#4956)
7 years ago
Eugen Rochko 9239e4ce4d Uploads for admin site settings (#4913)
7 years ago
Ondřej Hruška 7e5691804d Merge git://github.com/tootsuite/mastodon into tootsuite-master
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
kibigo! 79d898ae0a Merge upstream!! #64 <3 <3
7 years ago
Eugen Rochko e19eefe219 Redesign the landing page, mount public timeline on it (#4122)
7 years ago
beatrix d9b9bb8c5e glitch the getting started image
7 years ago
Charlotte Fields b27842dc70 cybre cleanup
7 years ago
Chronister 65528fc54e All cybrespace changes through 5/28
7 years ago
Eugen Rochko bd21afb5ed Replace onboarding elephant with friendlier graphic, shorter animation (#3337)
7 years ago
Yamagishi Kazutoshi e6fbf0334f Remove unnecessary .keep files (#2976)
7 years ago
Matt Jankowski d91ba3c8d0 Remove screenshot image (#2736)
7 years ago
Eugen Rochko f5bf5ebb82 Replace sprockets/browserify with Webpack (#2617)
7 years ago