Commit Graph

10 Commits (d62ea55d51ab487d792f99209b98abcdeac218f2)

Author SHA1 Message Date
Thibaut Girka 617c3a8006 Restore glitch-soc's 500 characters limit for bios (fixes #625) 7 years ago
Thibaut Girka 5e6cec4a40 Import upstream's emojify function in settings.js
This fixes updating the profile preview when changing display name.
7 years ago
Thibaut Girka c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream
Manually-resolved conflicts:
	.circleci/config.yml
	app/controllers/accounts_controller.rb
	app/controllers/auth/passwords_controller.rb
	app/controllers/statuses_controller.rb
	app/javascript/packs/public.js
	app/models/media_attachment.rb
	app/views/stream_entries/_content_spoiler.html.haml
	app/views/stream_entries/_media.html.haml
	config/locales/en.yml
	config/locales/ja.yml
	config/locales/pl.yml
	lib/mastodon/version.rb

Some content from app/javascript/packs/public.js has been split to
app/javascript/core/settings.js.

Translation strings for glitch-soc's keyword mutes were dropped.

Everything else was mostly “take both”.
7 years ago
Thibaut Girka 88b593a63f Drop glitch-style account bio fields
Upstream's implementation has been merged a while ago and is the preferred
way to set fields, as it is the only one compatible with upstream and is
more user-friendly.

This commit deletes the legacy glitch-soc FrontMatter functionality in order
to clean up the code and make it easier to maintain.
7 years ago
kibigo! dabf66e676 Moved flavour UI into own prefs tab 7 years ago
kibigo! 5bed0f10ed Various fixes 7 years ago
kibigo! bc4fa6b198 Rename themes -> flavours ? ? 7 years ago
kibigo! 541fe9b110 Skins support 8 years ago
kibigo! bdbbd06dad Finalized theme loading and stuff 8 years ago
kibigo! a9ed857171 WIP static themeing 8 years ago