170 Commits (47c8707f01d51e292f5009cd1027cbdf10961a0d)

Author SHA1 Message Date
David Yip 813da6788e
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 78ed4ab75f
Add bio fields (#6645)
7 years ago
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 473a69ab18
Fix margin on top action button, fix width of counters on frontpage (#6573)
7 years ago
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko 61ed133fea
Account archive download (#6460)
7 years ago
David Yip 020b40efdb
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 76f3d5d16b
Add preference to always display sensitive media (#6448)
7 years ago
David Yip 4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Charlotte Fields af40824998 moved save button (#3792)
7 years ago
kibigo! 44792de49a Don't show skins selector when there's only one (#256)
7 years ago
kibigo! ed7231947c Added styling
7 years ago
kibigo! bdca1614d5 Screenshot support for themes
7 years ago
kibigo! dabf66e676 Moved flavour UI into own prefs tab
7 years ago
cwm 072ab191cc pulled master, moved locale entry to new location
7 years ago
kibigo! d08d0f9f33 Ruby intl8n for themes
7 years ago
cwm abe95b614b add initial components based off of tootsuite pr #1507
7 years ago
David Yip a807e3b71b
current_theme -> current_flavour (#229)
7 years ago
David Yip d9800a5647
Merge branch 'gs-master' into glitch-theme
7 years ago
kibigo! 1c74ede69e Fixed a name + localizations
7 years ago
kibigo! bc4fa6b198 Rename themes -> flavours ? ?
7 years ago
kibigo! 541fe9b110 Skins support
7 years ago
David Yip 7463d80ff4
Merge remote-tracking branch 'tootsuite/master'
7 years ago
Eugen Rochko 706e534455
Add UI for setting up account migration (#5832)
7 years ago
David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ysksn 9dd5e329ab Remove empty strings (#5732)
7 years ago
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936
7 years ago
Eugen Rochko fbef909c2a
Add option to block direct messages from people you don't follow (#5669)
7 years ago
David Yip 9226257a1b Override Action View name inference in settings/keyword_mutes.
7 years ago
David Yip 1a60445a5f Address unused translation errors.
7 years ago
David Yip cd04e3df58 Fill in create, edit, update, and destroy for keyword mutes interface.
7 years ago
David Yip 2e03a10059 Spike out index and new views for keyword mutes controller.
7 years ago
David Yip 4fa2f7e82d Set up /settings/keyword_mutes. #164.
7 years ago
David Yip dbb1fce94d Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
Nolan Lawson fa0be3f834 Add option to reduce motion (#5393)
7 years ago
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165
7 years ago
Yamagishi Kazutoshi 178f718a9b Separate notifications preferences from general preferences (#4447)
7 years ago
Eugen Rochko 0b3f1ec62a Reorganize preferences page (#5161)
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
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
Lynx Kotoura 3c45d3963a Scrollable tables in settings pages (#4857)
7 years ago
Eugen Rochko 1caf11ddcc Fix language filter codes (#4841)
7 years ago
Yamagishi Kazutoshi b88635202f Add label for application scopes (#4691)
7 years ago
nullkal 80393a23d0 Use checkboxes for application scope setting (#4671)
7 years ago
Eugen Rochko c1b086a538 Fix up the applications area (#4664)
7 years ago
Colin Mitchell 871c0d251a Application prefs section (#2758)
7 years ago
kibigo! 8150689b48 Merge upstream (#111)
7 years ago
Lynx Kotoura 57a794d8eb Fix autocomplete option in haml files (#4438)
7 years ago
beatrix-bitrot 984d2d4cb6 Merge that good fresh upstream shit
7 years ago
Eugen Rochko 7bf7ed6123 Fix #3220 - Show avatar/header on edit profile page (#4288)
7 years ago
Ondřej Hruška d69fa9e1f4 Merge changes from upstream with the CSS reload fix
7 years ago
Yamagishi Kazutoshi 3267e4a785 Add unfollow modal (optional) (#4246)
7 years ago
kibigo! 09cfc079b0 Merge upstream (#81)
7 years ago
Eugen Rochko c42092ba7a Add option to opt out of search engines on public profile/status pages (#4199)
7 years ago
kibigo! 79d898ae0a Merge upstream!! #64 <3 <3
7 years ago
Yamagishi Kazutoshi 2b9721d1b3 Add setting a always mark media as sensitive (#4136)
7 years ago
Damien Erambert 18d3fa953b Add a setting allowing the use of system's default font in Web UI (#4033)
7 years ago
beatrix-bitrot ddafde942c Merge remote-tracking branch 'upstream/master'
7 years ago
beatrix-bitrot c0a665865e update bio length to 500
7 years ago
Eugen Rochko 5e8d037e27 Fix #3910 - Require OTP authentication to disable 2FA (#3935)
7 years ago
Eugen Rochko 4a618908e8 Account deletion (#3728)
8 years ago
Atsushi Yamamoto 402c19a924 Add preference setting for delete toot modal (#3368)
8 years ago
Eugen Rochko d78f555254 Improve language filter preferences look (#3184)
8 years ago
Matt Jankowski 8f4b7c1820 Filter languages with opt out (#3175)
8 years ago
Eugen Rochko 76449df903 Fix character counter not updating for bio (#3101)
8 years ago
Stephen Burgess 4bd0488a77 feat(count): Just yml count syntax to provide different rule for 1 (#2685)
8 years ago
Yamagishi Kazutoshi 459bbfa4b2 Prevent selection of unacceptable Content-Type files (#2910)
8 years ago
yhirano 48594b18e6 Added haml-lint and fix warnings (#2773)
8 years ago
AA4ch1 a50a87457e Fix language selector on preferences page (#2794)
8 years ago
Matt Jankowski f025cc6782 Filter on allowed user language preferences (#2361)
8 years ago
Eugen 501514960a Followers-only post federation (#2111)
8 years ago
Matt Jankowski 67dea31b0f 2FA controller cleanup (#2296)
8 years ago
Sebastian Morr 74c474a652 Display remaining characters when editing display name and bio (#2219)
8 years ago
Matt Jankowski 2dda356e3f Clean up settings/preferences controller (#2237)
8 years ago
Matt Jankowski 84b5fae8e3 Simplify renders in views (#2084)
8 years ago
Eugen Rochko 57d784f1e4 Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif
8 years ago
Patrick Figel ffb99325ca Add gif auto-play/pause preference
8 years ago
Yuki Nakagawa 548ff54714 Optimize user setting page for mobile browser (#1924)
8 years ago
Matt Jankowski 7efde22c3a Use local vars in partials (#1935)
8 years ago
Eugen 8a58942c80 Fix up recovery codes design a little (#1866)
8 years ago
Patrick Figel df4ff9a8e1 Add recovery code support for two-factor auth (#1773)
8 years ago
Matt Jankowski 0e39cc6a35 Settings export refactor (#1646)
8 years ago
Matt Jankowski 7f0a865b05 Allow import/export of mutes list (#1541)
8 years ago
Matt Jankowski 3ddd936b03 Refactor exports controller (#1567)
8 years ago
blackle 06444bf050 Allow user to disable the boost confirm dialog in preferences
8 years ago
Eugen 9acdb166e8 Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278)
8 years ago
Eugen Rochko e8875c6046 Import feature for following/blocking lists (addresses #62, #177, #201, #454)
8 years ago
Eugen Rochko f864fee116 Fix up some localizations
8 years ago
Eugen Rochko 98571b0ce4 Don't list "direct" under default post privacy settings
8 years ago
Eugen Rochko 8803ca9efe Improved landing page
8 years ago
Eugen Rochko 56d998cbdb Export follow/block lists as CSV
8 years ago
Eugen Rochko 6b81d10030 Add digest e-mails
8 years ago
Eugen Rochko 175a9b9caa Fix #104 - Style OAuth authorized applications page
8 years ago
Eugen Rochko 63886bdc59 Fix #587 - Display TOTP secret next to QR code
8 years ago
Eugen Rochko 347a153b3d Add API modifiers to limit returned toots from public/hashtag timelines
8 years ago