10 Commits (5f41bbd274bb771a712ee7d38df6d1ec47c26212)

Author	SHA1	Message	Date
Thibaut Girka	617c3a8006	Restore glitch-soc's 500 characters limit for bios (fixes #625)	2018-08-06 08:20:29 +02:00
Thibaut Girka	5e6cec4a40	Import upstream's emojify function in settings.js ... This fixes updating the profile preview when changing display name.	2018-08-05 12:57:20 +02:00
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”.	2018-08-01 00:18:13 +02:00
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.	2018-07-31 16:26:36 +02:00
kibigo!	dabf66e676	Moved flavour UI into own prefs tab	2017-12-10 20:32:27 -08:00
kibigo!	5bed0f10ed	Various fixes	2017-12-04 21:58:10 -08:00
kibigo!	bc4fa6b198	Rename themes -> flavours ? ?	2017-12-03 23:26:40 -08:00
kibigo!	541fe9b110	Skins support	2017-11-30 19:29:47 -08:00
kibigo!	bdbbd06dad	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
kibigo!	a9ed857171	WIP static themeing	2017-11-18 15:12:52 -08:00