14 Commits (02422158aec7b19bdc35c486f602d675bde3a18b)

Author	SHA1	Message	Date
Thibaut Girka	f5eaefc485	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb	6 years ago
Thibaut Girka	acf5099504	Fix maxCharacters in vanilla front-end	6 years ago
ふぁぼ原	bb8afc4608	Add a new preference to always hide all media (#8569)	6 years ago
Matt Sweetman	674865731a	Add user preference to always expand toots marked with content warnings (#8762)	6 years ago
Thibaut Girka	4ec907e413	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x	6 years ago
Eugen Rochko	e90b9a0b05	Display Mastodon version in footer of web UI (#8013) ... Fix #7846	6 years ago
Thibaut Girka	3d6c594903	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…	7 years ago
Eugen Rochko	a21c8a2e0e	Add "find friends", "invite people", and more to getting started footer (#7803) ... - Find friends from Twitter (bridge) - Invite people (when invites enabled) - Security (change e-mail/password) - Developers (create OAuth apps/tokens)	7 years ago
Lain Iwakura	8a66ab68e8	Handle character limit in initial state in frontend.	7 years ago
Eugen Rochko	a91ef56e80	When search enabled, display hint in search popout (#6593) ... * When advanced search is enabled, show different hint in search popout * Change "getting started" icon in tabs bar from asterisk to hamburger	7 years ago
Eugen Rochko	219b28e172	Add preference to always display sensitive media (#6448)	7 years ago
Nolan Lawson	b89628424d	Refactor initial state: "me" (#5563) ... * Refactor initial state: "me" * remove "me" from reducers/meta.js	7 years ago
Nolan Lawson	fc075b16d9	Reactor unfollow_modal, boost_modal, delete_modal (#5505)	7 years ago
Nolan Lawson	2085c1fa33	Refactor initial state: reduce_motion and auto_play_gif (#5501)	7 years ago