Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								4b7f1c6995 
								
							 
						 
						
							
							
								
								Improve digest email template  
							
							
							
						 
						
							2019-08-14 20:46:05 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								29807ef6a5 
								
							 
						 
						
							
							
								
								Merge branch 'feature/digest-email' into 'develop'  
							
							... 
							
							
							
							Feature/digest email
See merge request pleroma/pleroma!1078  
							
						 
						
							2019-08-08 14:38:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a035ab8c1d 
								
							 
						 
						
							
							
								
								templates/layout/app.html.eex: Style anchors  
							
							... 
							
							
							
							[ci skip] 
							
						 
						
							2019-08-03 23:18:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								657277ffc0 
								
							 
						 
						
							
							
								
								Resolve conflicts  
							
							
							
						 
						
							2019-06-29 00:52:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								a0c4ebb4d7 
								
							 
						 
						
							
							
								
								[ #184 ] small refactoring  reset password  
							
							
							
						 
						
							2019-06-24 19:01:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								4b2c29016c 
								
							 
						 
						
							
							
								
								[ #963 ] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring.  
							
							
							
						 
						
							2019-06-12 21:30:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b1b1a270e8 
								
							 
						 
						
							
							
								
								Fix conflict  
							
							
							
						 
						
							2019-06-05 02:45:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								3e17610587 
								
							 
						 
						
							
							
								
								Add task to test emails  
							
							
							
						 
						
							2019-06-04 02:48: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5d3ece2861 
								
							 
						 
						
							
							
								
								Remove now useless flavours switching  
							
							
							
						 
						
							2019-06-01 01:44:10 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9a98f48ec3 
								
							 
						 
						
							
							
								
								Remove incorrect statement about valid characters  
							
							
							
						 
						
							2019-05-01 12:29:48 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								64a2c6a041 
								
							 
						 
						
							
							
								
								Digest emails  
							
							
							
						 
						
							2019-04-20 19:42:19 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								218d96a26b 
								
							 
						 
						
							
							
								
								Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'  
							
							... 
							
							
							
							OAuth consumer params handling refactoring
See merge request pleroma/pleroma!1047  
							
						 
						
							2019-04-19 07:49:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								57d5ff57d6 
								
							 
						 
						
							
							
								
								Merge branch 'fix/732-password-align' into 'develop'  
							
							... 
							
							
							
							password reset page labels align
See merge request pleroma/pleroma!986  
							
						 
						
							2019-04-12 09:13:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d6d5f46bae 
								
							 
						 
						
							
							
								
								Update OAuth web template  
							
							
							
						 
						
							2019-04-11 16:02:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c3f12cf3c3 
								
							 
						 
						
							
							
								
								[ #923 ] OAuth consumer params handling refactoring.  
							
							... 
							
							
							
							Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic. 
							
						 
						
							2019-04-10 21:40:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e3328bc138 
								
							 
						 
						
							
							
								
								[ #923 ] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.  
							
							
							
						 
						
							2019-04-07 11:08:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								47a236f753 
								
							 
						 
						
							
							
								
								[ #923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.  
							
							
							
						 
						
							2019-04-05 15:12:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f7cd9131d4 
								
							 
						 
						
							
							
								
								[ #923 ] OAuth consumer controller tests. Misc. improvements.  
							
							
							
						 
						
							2019-04-04 22:41:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								3ca6c4f443 
								
							 
						 
						
							
							
								
								password reset page labels align  
							
							
							
						 
						
							2019-03-27 22:37:20 +06:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2a95014b9d 
								
							 
						 
						
							
							
								
								[ #923 ] OAuth consumer improvements, fixes, refactoring.  
							
							
							
						 
						
							2019-03-27 15:39:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								af68a42ef7 
								
							 
						 
						
							
							
								
								[ #923 ] Support for multiple OAuth consumer strategies.  
							
							
							
						 
						
							2019-03-20 20:25:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e17a9a1f66 
								
							 
						 
						
							
							
								
								[ #923 ] Nickname & email selection for external registrations, option to connect to existing account.  
							
							
							
						 
						
							2019-03-20 10:35:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								aacbf0f570 
								
							 
						 
						
							
							
								
								[ #923 ] OAuth: prototype of sign in / sign up with Twitter.  
							
							
							
						 
						
							2019-03-15 17:08:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								63ab61ed3f 
								
							 
						 
						
							
							
								
								Sign in via Twitter (WIP).  
							
							
							
						 
						
							2019-03-11 20:37:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								c0ecbf6669 
								
							 
						 
						
							
							
								
								[ #468 ] Merged upstream/develop.  
							
							
							
						 
						
							2019-02-19 19:10:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								bc4f77b10b 
								
							 
						 
						
							
							
								
								[ #468 ] Merged upstream/develop, resolved conflicts.  
							
							
							
						 
						
							2019-02-17 14:07:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								dcf24a3233 
								
							 
						 
						
							
							
								
								[ #468 ] Refactored OAuth scopes' defaults & missing selection handling.  
							
							
							
						 
						
							2019-02-17 13:49:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4df455f69b 
								
							 
						 
						
							
							
								
								[MastoAPI] Add switching of frontend flavours  
							
							
							
						 
						
							2019-02-16 19:50:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2a4a4f3342 
								
							 
						 
						
							
							
								
								[ #468 ] Defined OAuth restrictions for all applicable routes.  
							
							... 
							
							
							
							Improved missing "scopes" param handling.
Allowed "any of" / "all of" mode specification in OAuthScopesPlug.
Fixed auth UI / behavior when user selects no permissions at /oauth/authorize. 
							
						 
						
							2019-02-15 19:54:37 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								4ad843fb9d 
								
							 
						 
						
							
							
								
								[ #468 ] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.  
							
							
							
						 
						
							2019-02-09 17:09:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								2c59eb3cfc 
								
							 
						 
						
							
							
								
								Add responsive features to layout  
							
							
							
						 
						
							2019-02-02 13:40:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								872241d7c5 
								
							 
						 
						
							
							
								
								/web/index template: Modify for glitch-soc  
							
							
							
						 
						
							2019-01-28 04:43:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								908943352f 
								
							 
						 
						
							
							
								
								[ #114 ] Refactored password_reset (moved to TwitterAPI). Added homepage links to password reset result pages.  
							
							
							
						 
						
							2018-12-13 13:17:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6cc94404d7 
								
							 
						 
						
							
							
								
								Replace this hardcoded <title>  
							
							
							
						 
						
							2018-11-26 22:51:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4f640c43ed 
								
							 
						 
						
							
							
								
								Unify Mastodon Login with OAuth login.  
							
							... 
							
							
							
							This removes duplication in the login code. 
							
						 
						
							2018-11-06 15:19:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								835345754d 
								
							 
						 
						
							
							
								
								/web/* template: Add class system-font  
							
							
							
						 
						
							2018-07-03 17:26:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Normandy 
								
							 
						 
						
							
							
							
							
								
							
							
								715c90e54f 
								
							 
						 
						
							
							
								
								Fix typo in MastoFE login page.  
							
							... 
							
							
							
							see https://git.pleroma.social/pleroma/mastofe/issues/13  
							
						 
						
							2018-04-24 21:58:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								947431e9aa 
								
							 
						 
						
							
							
								
								MastoAPI and OAuth: allow login with either email or username.  
							
							
							
						 
						
							2018-04-18 13:13:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Morgan Bazalgette 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7f2174d811 
								
							 
						 
						
							
							
								
								Remove pl-dark-masto-fe, add preloading for common scripts  
							
							
							
						 
						
							2018-03-31 19:14:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2b2fa94e94 
								
							 
						 
						
							
							
								
								Move stuff around.  
							
							
							
						 
						
							2018-03-13 14:58:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wim Vanderbauwhede 
								
							 
						 
						
							
							
							
							
								
							
							
								36f615135f 
								
							 
						 
						
							
							
								
								A small patch to show the instance name and favicon in the browser title  
							
							... 
							
							
							
							bar. 
							
						 
						
							2018-03-13 09:37:55 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Calv Collins 
								
							 
						 
						
							
							
							
							
								
							
							
								bdb5dd2194 
								
							 
						 
						
							
							
								
								Create action_fallback for username/password incorrect input  
							
							
							
						 
						
							2018-02-08 16:57:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								29be70c008 
								
							 
						 
						
							
							
								
								Add remote following of local profiles.  
							
							
							
						 
						
							2018-02-02 00:14:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								beb13bf3a9 
								
							 
						 
						
							
							
								
								Revert "Revert "Add remote follow pages.""  
							
							... 
							
							
							
							This reverts commit b259b4e4d1 
							
						 
						
							2018-01-18 18:42:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								b259b4e4d1 
								
							 
						 
						
							
							
								
								Revert "Add remote follow pages."  
							
							... 
							
							
							
							This reverts commit 47e8c8db05 
							
						 
						
							2018-01-18 03:42:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								47e8c8db05 
								
							 
						 
						
							
							
								
								Add remote follow pages.  
							
							
							
						 
						
							2018-01-18 03:11:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								d16b613929 
								
							 
						 
						
							
							
								
								MastodonUI login: Show error message on error.  
							
							
							
						 
						
							2017-11-23 12:06:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hyper! (Stitch) 
								
							 
						 
						
							
							
							
							
								
							
							
								36011fee4e 
								
							 
						 
						
							
							
								
								Add Custom Pleroma-dark theme  
							
							
							
						 
						
							2017-11-19 19:07:19 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								5fc6e9d467 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop  
							
							
							
						 
						
							2017-11-12 14:25:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								d293ceb1b5 
								
							 
						 
						
							
							
								
								Add Mastodon frontend.  
							
							
							
						 
						
							2017-11-12 14:23:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								6af164f27b 
								
							 
						 
						
							
							
								
								Add password reset.  
							
							
							
						 
						
							2017-10-19 17:37:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								ac3f32da7e 
								
							 
						 
						
							
							
								
								Preserve state in oauth  
							
							
							
						 
						
							2017-09-14 09:29:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								2a298d70f9 
								
							 
						 
						
							
							
								
								Add very basic oauth and mastodon api support.  
							
							
							
						 
						
							2017-09-06 19:06:25 +02:00