| 
								
								
									 lambda | ff363f70b5 | Merge branch 'refactor/keys' into 'develop' move key generation functions into Pleroma.Keys module
See merge request pleroma/pleroma!1186 | 2019-05-22 06:28:16 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | cdac5efd10 | Merge branch 'bugfix/account_view_source.note' into 'develop' MastoAPI AccountView: fill source.note with plaintext version of note
Closes #926
See merge request pleroma/pleroma!1189 | 2019-05-22 05:39:01 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 0e2c215a00 | MastoAPI AccountView: fill source.note with plaintext version of note Closes: https://git.pleroma.social/pleroma/pleroma/issues/926 | 2019-05-22 07:22:19 +02:00 |  | 
				
					
						| 
								
								
									 kaniini | 79c2cef2fb | Merge branch 'mongooseim-support' into 'develop' MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172 | 2019-05-22 04:06:54 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | ab6e15622b | Merge branch 'fix/api-fallback' into 'develop' Do not fallback to index.html for /api/* routes
Closes #920
See merge request pleroma/pleroma!1182 | 2019-05-22 04:05:41 +00:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | 9134848170 | Do not truncate DM when it contains newlines and safe_dm_mentions is set to true | 2019-05-22 04:04:20 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 045803346d | move key generation functions into Pleroma.Keys module | 2019-05-22 03:58:15 +00:00 |  | 
				
					
						| 
								
								
									 Aaron Tinio | f76268135c | Fix failing test | 2019-05-22 07:16:11 +08:00 |  | 
				
					
						| 
								
								
									 Aaron Tinio | 3ab9255eda | Respond with a 404 Not implemented JSON error message when requested API is not implemented | 2019-05-22 07:15:52 +08:00 |  | 
				
					
						| 
								
								
									 Aaron Tinio | a13d449b24 | Add tests for fallback routes | 2019-05-22 05:39:29 +08:00 |  | 
				
					
						| 
								
								
									 kaniini | d4847b17ca | Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop' Add virtual :thread_muted? field
Closes #901
See merge request pleroma/pleroma!1178 | 2019-05-20 23:30:19 +00:00 |  | 
				
					
						| 
								
								
									 Aaron Tinio | eb02edcad9 | Add virtual :thread_muted? field that may be set when fetching activities | 2019-05-21 00:35:46 +08:00 |  | 
				
					
						| 
								
								
									 Sadposter | dc916ba15f | Format mascot tests | 2019-05-20 12:58:17 +01:00 |  | 
				
					
						| 
								
								
									 Sadposter | e81f0fc6d4 | Add mascot get/set tests | 2019-05-20 12:58:06 +01:00 |  | 
				
					
						| 
								
								
									 Aaron Tinio | 2375e9a95b | Add report filtering to MRF.SimplePolicy | 2019-05-20 06:02:50 +08:00 |  | 
				
					
						| 
								
								
									 William Pitcock | dc08159538 | also suppress link previews from posts marked #nsfw | 2019-05-17 22:13:24 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 0da1233e8e | rich media: suppress link previews if post is marked as sensitive | 2019-05-17 18:49:43 +00:00 |  | 
				
					
						| 
								
								
									 lain | f959bf7aa6 | MongooseIM: Add basic integration endpoints. | 2019-05-17 18:21:11 +02:00 |  | 
				
					
						| 
								
								
									 lain | 249b31ffe5 | Fix specs. | 2019-05-17 11:49:13 +02:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 7ed682213f | Fix/902 random compile failing | 2019-05-17 07:25:20 +00:00 |  | 
				
					
						| 
								
								
									 Aaron Tinio | 443cd68a4c | Add tests for MRF.SimplePolicy | 2019-05-17 09:02:34 +08:00 |  | 
				
					
						| 
								
								
									 kaniini | bf84d50c76 | Merge branch 'feature/890-add-report-uri' into 'develop' Feature/890 add report uri
Closes #890
See merge request pleroma/pleroma!1164 | 2019-05-16 20:11:12 +00:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | 2c303afc8b | Remove duplicated entries in users' following lists | 2019-05-16 20:04:08 +00:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | e2b3a27204 | Add Reports to Admin API | 2019-05-16 19:09:18 +00:00 |  | 
				
					
						| 
								
								
									 feld | e190b3022b | Merge branch 'fix/domain-unblocked-reblogs' into 'develop' Fix domain-unblocked reblogs
Closes #892
See merge request pleroma/pleroma!1157 | 2019-05-16 18:57:14 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | ebb0482116 | Merge branch 'develop' into conversations-import | 2019-05-16 13:11:17 -05:00 |  | 
				
					
						| 
								
								
									 lambda | fde30aee43 | Merge branch 'feature/sql-thread-sat' into 'develop' SQL thread visibility solver
See merge request pleroma/pleroma!971 | 2019-05-16 13:44:22 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 73ae58fdfa | Feature/896 toggling confirmation | 2019-05-16 13:23:41 +00:00 |  | 
				
					
						| 
								
								
									 Alex S | 4711d8151c | try this | 2019-05-16 17:35:07 +07:00 |  | 
				
					
						| 
								
								
									 Alex S | aa11fa4864 | add report uri and report to | 2019-05-16 12:49:40 +07:00 |  | 
				
					
						| 
								
								
									 Aaron Tinio | 2b6119dfbf | Restrict reblogs of activities from blocked domains | 2019-05-16 05:53:51 +08:00 |  | 
				
					
						| 
								
								
									 Aaron Tinio | 64495b96e9 | Add test for blocked domains | 2019-05-16 05:53:51 +08:00 |  | 
				
					
						| 
								
								
									 William Pitcock | f09c3afdf5 | chase test failures | 2019-05-15 16:23:01 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | c7644313e7 | test: update obsolete test | 2019-05-15 15:54:10 +00:00 |  | 
				
					
						| 
								
								
									 lain | f168a1cbdc | Merge remote-tracking branch 'origin/develop' into conversations-import | 2019-05-15 17:47:29 +02:00 |  | 
				
					
						| 
								
								
									 kaniini | 62516be9c4 | Merge branch 'fix/public-option-not-working' into 'develop' Fix public option not working
Closes #873
See merge request pleroma/pleroma!1143 | 2019-05-15 15:42:21 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 4440e23547 | Merge branch 'chore/extricate-http-signatures' into 'develop' switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155 | 2019-05-15 15:37:31 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 4429c1b7da | tests: fixup | 2019-05-15 15:29:42 +00:00 |  | 
				
					
						| 
								
								
									 lain | cbb3451023 | CommonAPI: Refactor visibility, forbid public to private replies. | 2019-05-15 16:30:08 +02:00 |  | 
				
					
						| 
								
								
									 Sachin Joshi | ee22fff5ac | remove deprecated PleromaFE configuration | 2019-05-15 15:29:59 +05:45 |  | 
				
					
						| 
								
								
									 Aaron Tinio | 70c81b95d0 | Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug | 2019-05-15 05:09:32 +08:00 |  | 
				
					
						| 
								
								
									 Aaron Tinio | 7b8dc99ef1 | Implement Pleroma.Plugs.EnsurePublicOrAuthenticated | 2019-05-15 05:09:29 +08:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 071f78733a | switch to pleroma/http_signatures library | 2019-05-14 20:03:13 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | dfd031c26a | Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop' Fix Pleroma.Config.get!/1 raising an error when value is false
See merge request pleroma/pleroma!1148 | 2019-05-14 14:58:45 +00:00 |  | 
				
					
						| 
								
								
									 Maksim | 52297920e7 | Refactoring  oauth response. | 2019-05-14 14:49:45 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 5e2b491276 | Merge remote-tracking branch 'pleroma/develop' into feature/disable-account | 2019-05-14 18:15:56 +07:00 |  | 
				
					
						| 
								
								
									 Aaron Tinio | a18b2c0b12 | Fix Pleroma.Config.get!/1 raising an error when value is false | 2019-05-14 06:40:59 +08:00 |  | 
				
					
						| 
								
								
									 lambda | b14a314ce7 | Merge branch 'feature/federator-behaviours' into 'develop' federator modularization (outgoing)
See merge request pleroma/pleroma!1140 | 2019-05-13 18:58:04 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | a2be420f94 | differences_in_mastoapi_responses.md: fullname & bio are optionnal [ci skip] | 2019-05-13 18:35:45 +00:00 |  | 
				
					
						| 
								
								
									 Sachin Joshi | 7701a4c841 | Make irreversible field default to false in filters | 2019-05-14 00:13:15 +05:45 |  |