24 commits

Author	SHA1	Message	Date
Roman Chvanikov	b1b1a270e8	Fix conflict	2019-06-05 02:45:21 +03:00
Mark Felder	6ef145b4fc	Merge branch 'develop' into feature/digest-email	2019-06-03 15:29:53 -05:00
eugenijm	f2c4c99e03	Remove repeated scope lists	2019-06-03 19:18:21 +03:00
eugenijm	243d8ed94e	Use workaround for the heavy checkmark symbol in iOS	2019-06-03 18:28:36 +03:00
Mark Felder	f4e2595592	Merge branch 'develop' into update-oauth-template	2019-06-03 09:12:17 -05:00
Egor Kislitsyn	99f70c7e20	Use Pleroma.Config everywhere	2019-05-30 15:33:58 +07:00
Mark Felder	3c4cab9be1	Merge branch 'develop' into update-oauth-template	2019-05-01 12:32:17 -05:00
Roman Chvanikov	64a2c6a041	Digest emails	2019-04-20 19:42:19 +07:00
Mark Felder	d6d5f46bae	Update OAuth web template	2019-04-11 16:02:38 +00:00
Alex S	3ca6c4f443	password reset page labels align	2019-03-27 22:37:20 +06:30
Shpuld Shpuldson	50edead11c	Remove chromium input hilight that clashes with our own	2019-03-11 15:10:42 +02:00
Shpuld Shpuldson	8ddbedcd9a	Style again the login page to fit pleroma more	2019-03-11 14:57:04 +02:00
kaniini	5a4e2905fe	Merge branch 'fix/twittercards' into 'develop' ... Fix Twitter Cards See merge request pleroma/pleroma!815	2019-02-22 04:38:14 +00:00
href	f4bfc628ca	Player: allow styles on CSP, loop videos	2019-02-19 18:56:57 +01:00
Mark Felder	2d21ea1a0e	Merge branch 'develop' into fix/twittercards	2019-02-19 16:58:28 +00:00
href	10a11f083c	Embed player suitable for Twitter Cards	2019-02-19 17:47:48 +01:00
Ivan Tashkinov	bc4f77b10b	[#468] Merged upstream/develop, resolved conflicts.	2019-02-17 14:07:04 +03:00
Mark Felder	f62c1d6266	Improve login error for OAuth flow	2019-02-13 22:33:22 +00:00
Ivan Tashkinov	063baca5e4	[#468] User UI for OAuth permissions restriction. Standardized storage format for scopes fields, updated usages.	2019-02-14 00:29:29 +03:00
Maxim Filippov	2c59eb3cfc	Add responsive features to layout	2019-02-02 13:40:34 +03:00
Mark Felder	6cc94404d7	Replace this hardcoded <title>	2018-11-26 22:51:25 +00:00
Roger Braun	43499848d0	Small css fix.	2017-11-16 12:58:33 +01:00
Shpuld Shpuldson	189513e4ff	Add styles to make login page resemble mastodon's	2017-11-16 13:26:56 +02:00
Roger Braun	2a298d70f9	Add very basic oauth and mastodon api support.	2017-09-06 19:06:25 +02:00