123 Commits (ef620dfadddbf37c9269f413e29cf7ac2460862b)

Author SHA1 Message Date
Thibaut Girka af504e62ff Merge branch 'master' into glitch-soc/master
7 years ago
Eugen Rochko 7ff3c849d1 Bot nameplates (#7391)
7 years ago
Eugen Rochko a1398887ae Add hint about 7 day cooldown for archive takeout (#7375)
7 years ago
David Yip 9697c6d9f0 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 466442b764 Add bio fields (#6645)
7 years ago
David Yip c08c971dd3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko d60ae00b8e Fix margin on top action button, fix width of counters on frontpage (#6573)
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko f6884555d7 Account archive download (#6460)
7 years ago
David Yip 799b205766 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 219b28e172 Add preference to always display sensitive media (#6448)
7 years ago
David Yip 6d1023b2e9 Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Charlotte Fields 9c94c1e66f moved save button (#3792)
7 years ago
kibigo! 134e6590c6 Don't show skins selector when there's only one (#256)
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! f4c233f59f Ruby intl8n for themes
7 years ago
cwm 41bbfeec7c add initial components based off of tootsuite pr #1507
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
kibigo! 36b9f4df56 Skins support
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 5f689cdf78 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ysksn 08cb63c360 Remove empty strings (#5732)
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
David Yip 7caca589c1 Override Action View name inference in settings/keyword_mutes.
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 e19bc7835a Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
Nolan Lawson a54c272a1f Add option to reduce motion (#5393)
7 years ago
kibigo! 02827345ae Merge upstream 2.0ish #165
7 years ago
Yamagishi Kazutoshi 6bd4e3bf97 Separate notifications preferences from general preferences (#4447)
7 years ago
Eugen Rochko 06ef1b0ac4 Reorganize preferences page (#5161)
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 914c0465b1 Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
7 years ago
kibigo! aac16a82d6 Better themeing support!!
7 years ago
Andrew b4842ef0b9 Add support for multiple themes (#4959)
7 years ago
unarist b25c112d31 Reset preview image if avatar/header image selection was cancelled (#4893)
7 years ago
David Yip 017738c604 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
7 years ago
David Yip da3f22ee7d Merge branch 'origin/master' into sync/upstream
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