| 
								
								
									 Phil Hagelberg | e944a2213d | Use gettext for sensitive media warning. | 2019-11-09 18:07:50 -08:00 |  | 
				
					
						| 
								
								
									 Phil Hagelberg | 2d1897e8a7 | Apply all suggested changes from reviewers. | 2019-11-09 18:07:50 -08:00 |  | 
				
					
						| 
								
								
									 Phil Hagelberg | cc1b07132f | Notices should show entire thread from context. | 2019-11-09 18:07:08 -08:00 |  | 
				
					
						| 
								
								
									 Phil Hagelberg | 748d800acb | Show images, video, and audio attachments to notices. | 2019-11-09 18:07:08 -08:00 |  | 
				
					
						| 
								
								
									 Phil Hagelberg | c1fc139986 | Add permalinks to the static-fe notice rendering. | 2019-11-09 18:06:51 -08:00 |  | 
				
					
						| 
								
								
									 William Pitcock | ca5ef201ef | static fe: add remote follow button | 2019-11-09 18:06:51 -08:00 |  | 
				
					
						| 
								
								
									 William Pitcock | b33fbd58e3 | static fe: add support for message subjects | 2019-11-09 18:06:51 -08:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 2b5bd5236d | static fe: add user profile rendering | 2019-11-09 18:06:51 -08:00 |  | 
				
					
						| 
								
								
									 William Pitcock | a4d3a8ec03 | static fe: proof of concept | 2019-11-09 18:06:51 -08:00 |  | 
				
					
						| 
								
								
									 KokaKiwi | 638457ba94 | MastoFE: Add PWA manifest. | 2019-10-19 12:15:14 +02:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | c00ae10af8 | feed: don't advertise salmon endpoint | 2019-10-18 14:50:09 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 4f82e42e4e | websub: remove entirely | 2019-10-18 14:50:09 +00:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | 4b3f77a99f | Extract RSS Feed functionality from OStatus | 2019-10-07 12:20:41 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | d3c404af12 | Add MastoFEController | 2019-10-02 20:36:08 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 158231cd20 | Add configurable colors and logo for the digest template | 2019-08-16 18:32:25 +07:00 |  | 
				
					
						| 
								
								
									 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 |  |