| 
								
								
									 kaniini | 576368237c | Merge branch 'activitypub-tombstone-fix' into 'develop' Don't crash on AP request for tombstone
See merge request pleroma/pleroma!630 | 2019-01-05 22:29:08 +00:00 |  | 
				
					
						| 
								
								
									 scarlett | 145d6fe6e9 | Merge branch 'emoji-in-summary' into 'develop' Strip HTML in and allow emoji in summaries.
See merge request pleroma/pleroma!631 | 2019-01-05 21:52:02 +00:00 |  | 
				
					
						| 
								
								
									 scarlett | 57df7d6e1d | Add tests for emoji and lack of HTML in summaries. | 2019-01-05 21:46:42 +00:00 |  | 
				
					
						| 
								
								
									 scarlett | 096e121879 | Remove redundant comma. | 2019-01-05 18:25:36 +00:00 |  | 
				
					
						| 
								
								
									 scarlett | 6556be344d | Resolve some test failures. | 2019-01-05 18:20:42 +00:00 |  | 
				
					
						| 
								
								
									 sxsdv1 | 2d7da5f437 | Don't crash on AP request for tombstone Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api | 2019-01-05 11:16:05 +01:00 |  | 
				
					
						| 
								
								
									 kaniini | 4258dd8633 | Merge branch 'feature/rich-media' into 'develop' URL previews in posts
Closes #402
See merge request pleroma/pleroma!617 | 2019-01-04 20:50:18 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | ffea81b84f | Merge branch 'activitypub-c2s-delete-activity' into 'develop' Activitypub c2s delete activity
See merge request pleroma/pleroma!618 | 2019-01-04 20:32:10 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | b73a1a33de | Merge branch 'captcha' into 'develop' Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585 | 2019-01-03 17:04:27 +00:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 48e81d3d40 | Add RichMediaController and tests | 2019-01-02 17:02:50 +03:00 |  | 
				
					
						| 
								
								
									 sxsdv1 | 4e1cc2bab6 | Implement delete activity | 2019-01-01 23:20:43 +01:00 |  | 
				
					
						| 
								
								
									 sxsdv1 | 551c3d9391 | Split create activity specifics from update_outbox | 2019-01-01 23:20:28 +01:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 2aab4e03c3 | Add OGP parser | 2019-01-01 23:26:40 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | 90e157ef80 | Merge branch 'features/admin-api-user-views' into 'develop' User/Account views: Add rights.admin
Closes #472
See merge request pleroma/pleroma!589 | 2018-12-31 15:49:34 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 33e3a7ba7d | Merge branch 'fix/scrubber-cache' into 'develop' [#481] Store scrubbed posts in Cachex
Closes #481
See merge request pleroma/pleroma!610 | 2018-12-31 09:56:26 +00:00 |  | 
				
					
						| 
								
								
									 Rin Toshaka | 9f5881cbb1 | Fix a typo in user_test.ex | 2018-12-31 08:34:14 +01:00 |  | 
				
					
						| 
								
								
									 kaniini | 8e7da98b18 | Merge branch 'mr/retry-queue' into 'develop' Improves RetryQueue behavior
See merge request pleroma/pleroma!609 | 2018-12-30 21:47:50 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 05743e2000 | Get default scrubbers from config instead of hardcoded | 2018-12-31 00:12:14 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 91d5a7e81c | Fix test failure | 2018-12-31 00:03:03 +03:00 |  | 
				
					
						| 
								
								
									 Michael Loftis | cb286fdeba | Improves RetryQueue behavior reduces to one single timer firing once a second
switches to a parallel worker model | 2018-12-30 15:16:26 +00:00 |  | 
				
					
						| 
								
								
									 sxsdv1 | 569bad8210 | Create activity when client posts to outbox | 2018-12-30 12:01:39 +01:00 |  | 
				
					
						| 
								
								
									 sxsdv1 | 26dc2dddab | Implement ActivityPub inbox view More or less verbatim copied from the outbox template with only changes
to the activities fetched and url reported | 2018-12-30 12:01:39 +01:00 |  | 
				
					
						| 
								
								
									 sxsdv1 | aa082ca7b6 | Wire up stub routes for client calls of activitypub inbox/outbox Code style: remove wrapping function of outbox | 2018-12-29 22:22:03 +01:00 |  | 
				
					
						| 
								
								
									 kaniini | 3dc5f04976 | Merge branch 'carrot-bullying' into 'develop' Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595 | 2018-12-29 11:46:06 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | dd8f2196f6 | Merge branch '483_blocks_import_export' into 'develop' [#483] Blocked users list import & export
Closes #483
See merge request pleroma/pleroma!603 | 2018-12-29 11:34:51 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 242cc9a658 | [#483] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests. | 2018-12-29 12:27:12 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 7bd49a3222 | [#483] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests. | 2018-12-29 12:26:23 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 67b4297f4d | [#483] Refactored blocks and follows import, added tests. | 2018-12-29 12:02:37 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 6e9a15b181 | [#483] Blocked users export for TwitterAPI. | 2018-12-28 21:08:07 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | b43d630f30 | Web.TwitterAPI.UserView: Add rights.admin | 2018-12-28 17:38:32 +01:00 |  | 
				
					
						| 
								
								
									 Vyr Cossont | d8cc96cb1f | Fix Twitter timelines for private instances | 2018-12-27 22:43:40 -08:00 |  | 
				
					
						| 
								
								
									 kaniini | bee6acd51d | Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop' Create tombstone instead of object deletion
See merge request pleroma/pleroma!593 | 2018-12-27 19:37:55 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | cff0292d4b | Merge branch 'reserve-user-names' into 'develop' Reserve a few user names
See merge request pleroma/pleroma!594 | 2018-12-27 19:35:06 +00:00 |  | 
				
					
						| 
								
								
									 Vyr Cossont | e4562105e7 | Implement exclude_reblogs and include_rts | 2018-12-26 21:38:00 -08:00 |  | 
				
					
						| 
								
								
									 lain | 551d80cc01 | Expose restricted names in nodeinfo. | 2018-12-26 12:46:16 +01:00 |  | 
				
					
						| 
								
								
									 lain | 5811e65e67 | Add some hard limits on inserted activities. | 2018-12-26 12:39:35 +01:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 012b7ab5e6 | Add test to check /object/:id does not leak the tombstone itself | 2018-12-25 23:40:57 +03:00 |  | 
				
					
						| 
								
								
									 lain | 91724d160a | Reserve a few user names These are all names that are used for domain.com/:route routes or projected to be. | 2018-12-25 20:10:45 +01:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 340dd7a75e | Format | 2018-12-25 03:47:20 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | ab2ee43634 | Fix Activity test | 2018-12-25 03:41:14 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | aeb89bece6 | Remove unused test | 2018-12-25 03:38:02 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | f75f707f6c | Revert Activity tombstones, add ObjectTombstone struct | 2018-12-25 03:00:06 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 2bbec33c71 | Fix failing tests | 2018-12-25 00:29:13 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 18a4cbb244 | Capitalize "tombstone" | 2018-12-24 20:09:18 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 0f412cf6e6 | Create tombstone instead of object deletion | 2018-12-24 02:25:36 +03:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 3c08d229db | tests: add legal boilerplate | 2018-12-23 20:57:10 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | a2bceaf688 | tests: twitter api: add test proving that peertube videos are correctly handled | 2018-12-23 14:00:54 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 873938d223 | tests: twitter api: activity view test: enable tesla mock | 2018-12-23 14:00:54 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 9f48485f64 | tests: mastodon api: add test verifying that peertube videos are correctly rendered | 2018-12-23 13:44:01 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 71f6d9f418 | transmogrifier: significantly rework handling of peertube videos, add test | 2018-12-23 13:31:08 +00:00 |  |