73 Commits (105ffaef8fb83c0246ef829a1023cb01778ca03c)

Author SHA1 Message Date
Jenkins 837b3804bf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki ff7941e652 Show media modal on public pages (#6801)
7 years ago
Akihiko Odaki 7a6eaad445 Do not require images in about.js and share.js (#6622)
7 years ago
abcang 8cd2828e91 Fix hide and show media button on admin page (#6347)
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
kibigo! 541fe9b110 Skins support
7 years ago
kibigo! bdbbd06dad Finalized theme loading and stuff
7 years ago
kibigo! a9ed857171 WIP static themeing
7 years ago
kibigo! 08a01dd037 Public pack fix
7 years ago
kibigo! 45c44989c8 Forking glitch theme
7 years ago
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936
7 years ago
Ondřej Hruška 37ff061d9b
satisfy eslint and jest
7 years ago
Ondřej Hruška 4b397adb5b
fix some lint errors
7 years ago
David Yip dbb1fce94d Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
Yamagishi Kazutoshi bf0ee1a25c Enable ESLint rules import/* (#5414)
7 years ago
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165
7 years ago
Eugen Rochko f486ef2666 Redesign public hashtag pages (#5237)
7 years ago
Nolan Lawson fd7f0732fe Compress and combine emoji data (#5229)
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 9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
7 years ago
kibigo! 86e617a839 Better themeing support!!
7 years ago
Andrew 0401a24558 Add support for multiple themes (#4959)
7 years ago
Eugen Rochko 2bbf987a0a Redesign video player (#4911)
7 years ago
unarist 47d48fed8d Reset preview image if avatar/header image selection was cancelled (#4893)
7 years ago
David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
7 years ago
David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream
7 years ago
Eugen Rochko 6867681c7c Add script to make embedded iframes autosize (#4853)
7 years ago
Eugen Rochko d1a78eba15 Embed modal (#4748)
7 years ago
Eugen Rochko e95bdec7c5 Update status embeds (#4742)
7 years ago
unarist fb8aa2b3ba Apply user timezone for the title attribute of .time-ago (#4693)
7 years ago
Eugen Rochko 3c6503038e Add protocol handler. Handle follow intents (#4511)
7 years ago
Gô Shoemake b61e3daf98 Multiple frontend support (#110)
7 years ago
beatrix-bitrot 984d2d4cb6 Merge that good fresh upstream shit
7 years ago
Yamagishi Kazutoshi f2390e2803 Dynamicaly change avatar and header bg from account setting (#4289)
7 years ago
beatrix e7edb4d1ee Merge pull request #87 from tootsuite/master
7 years ago
Cygnan bc1f9dc24b Fix a typo in public.js (double semicolons) (#4269)
7 years ago
Ondřej Hruška d69fa9e1f4 Merge changes from upstream with the CSS reload fix
7 years ago
abcang 4d42a38954 Improve admin page (#4121)
7 years ago
Akihiko Odaki b11ac88692 Require any modules after loading polyfill in entry points (#4231)
7 years ago
Ondřej Hruška c727eae441 Updated from tootsuite
7 years ago
Akihiko Odaki b15f790221 Require images in common.js (#4232)
7 years ago
kibigo! 09cfc079b0 Merge upstream (#81)
7 years ago
Yamagishi Kazutoshi 9008ab3407 Do not load unnecessary script files (#4193)
7 years ago
kibigo! 79d898ae0a Merge upstream!! #64 <3 <3
7 years ago
kibigo! 297921fce5 Moved glitch files to their own location ;)
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
abcang f76e71825d Improve Activity stream spoiler (#4088)
7 years ago