kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								5fbb14f5ec
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/federation-kroeg' into 'develop'
							
							
							
							
							
							
							
							fix federation with kroeg
See merge request pleroma/pleroma!272 
							
						 | 
						
							2018-08-16 15:20:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								38361e7b5e
								
							
						 | 
						
							
							
								
								Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'
							
							
							
							
							
							
							
							Fix: Output repeats at ActivityPub outbox
Closes #191
See merge request pleroma/pleroma!175 
							
						 | 
						
							2018-08-16 15:19:46 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								8dc715b30b
								
							
						 | 
						
							
							
								
								Merge branch 'fix/normalize-file-extension' into 'develop'
							
							
							
							
							
							
							
							Normalize file extension for uploaded files
Closes #218
See merge request pleroma/pleroma!233 
							
						 | 
						
							2018-08-16 15:17:17 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								8058443674
								
							
						 | 
						
							
							
								
								testsuite: add puckipedia test fixture
							
							
							
							
							
						 | 
						
							2018-08-16 15:10:57 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								b8560e5ed5
								
							
						 | 
						
							
							
								
								testsuite: formatting
							
							
							
							
							
						 | 
						
							2018-08-14 17:15:33 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								7fbcd4caaf
								
							
						 | 
						
							
							
								
								test: add kroeg fixtures
							
							
							
							
							
						 | 
						
							2018-08-14 17:09:17 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								13440a80e1
								
							
						 | 
						
							
							
								
								Merge branch 'feature/invites' into 'develop'
							
							
							
							
							
							
							
							Invites
Closes #108
See merge request pleroma/pleroma!208 
							
						 | 
						
							2018-08-12 12:04:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								ed9738e031
								
							
						 | 
						
							
							
								
								Add tests for emoji in user profiles
							
							
							
							
							
							
							
							Also use the correct field in TwitterAPI... 
							
						 | 
						
							2018-08-08 09:24:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								cee63ad3f7
								
							
						 | 
						
							
							
								
								TwitterAPI user view: add screen_name_html and description_html.
							
							
							
							
							
						 | 
						
							2018-08-08 08:38:25 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									hakabahitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								9c1b6f11c5
								
							
						 | 
						
							
							
								
								improve test
							
							
							
							
							
						 | 
						
							2018-07-21 02:57:56 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									hakabahitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								908cefd84a
								
							
						 | 
						
							
							
								
								debug
							
							
							
							
							
						 | 
						
							2018-07-21 02:19:20 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									hakabahitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								9c2afb2e71
								
							
						 | 
						
							
							
								
								improve test
							
							
							
							
							
						 | 
						
							2018-07-21 01:44:35 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								41b0ecef95
								
							
						 | 
						
							
							
								
								Merge branch 'tests/plume' into 'develop'
							
							
							
							
							
							
							
							Articles/Notes with a actor list outside object
See merge request pleroma/pleroma!252 
							
						 | 
						
							2018-07-19 07:35:34 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								54963a6379
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/activitystreams-notice-urls' into 'develop'
							
							
							
							
							
							
							
							ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
Closes #206
See merge request pleroma/pleroma!251 
							
						 | 
						
							2018-07-19 07:31:33 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								18cac1e36b
								
							
						 | 
						
							
							
								
								test: mastodon attachments: update for added description field
							
							
							
							
							
						 | 
						
							2018-07-17 03:40:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								489453c246
								
							
						 | 
						
							
							
								
								tests: verify media description api support is working
							
							
							
							
							
						 | 
						
							2018-07-17 03:40:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								24b5a75d09
								
							
						 | 
						
							
							
								
								Add test for Plume Articles
							
							
							
							
							
						 | 
						
							2018-07-12 23:08:28 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								f1a29fc43c
								
							
						 | 
						
							
							
								
								test: ostatus controller: add AS2 fetching tests
							
							
							
							
							
						 | 
						
							2018-07-12 20:32:56 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								4fb64c1d86
								
							
						 | 
						
							
							
								
								testsuite: twitter api: add summary where necessary
							
							
							
							
							
						 | 
						
							2018-07-12 16:12:25 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								fe4387077a
								
							
						 | 
						
							
							
								
								Merge branch 'feature/default-scope' into 'develop'
							
							
							
							
							
							
							
							default scope setting
See merge request pleroma/pleroma!239 
							
						 | 
						
							2018-07-12 05:59:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								4a922305af
								
							
						 | 
						
							
							
								
								Merge branch 'feature/article-support' into 'develop'
							
							
							
							
							
							
							
							article support (plume, etc)
See merge request pleroma/pleroma!240 
							
						 | 
						
							2018-07-12 05:58:39 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								8546551257
								
							
						 | 
						
							
							
								
								activitypub: switch to using x509 representation for public keys instead of pkcs#1
							
							
							
							
							
						 | 
						
							2018-07-12 03:30:22 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								66819ea784
								
							
						 | 
						
							
							
								
								twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic
							
							
							
							
							
						 | 
						
							2018-06-27 13:38:07 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								32211c4ada
								
							
						 | 
						
							
							
								
								tests: add default_scope where appropriate
							
							
							
							
							
						 | 
						
							2018-06-27 13:17:07 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								fc012491a5
								
							
						 | 
						
							
							
								
								Merge branch 'fix/mutes.json-emptyarray' into 'develop'
							
							
							
							
							
							
							
							Return empty array from /api/qvitter/mutes.json
See merge request pleroma/pleroma!234 
							
						 | 
						
							2018-06-25 08:45:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Vivian Lim
								
							 
						 | 
						
							
							
							
							
								
							
							
								6160a1b3c0
								
							
						 | 
						
							
							
								
								mix format
							
							
							
							
							
						 | 
						
							2018-06-24 15:24:41 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Vivian Lim
								
							 
						 | 
						
							
							
							
							
								
							
							
								1299bccc7d
								
							
						 | 
						
							
							
								
								return unquoted empty array from /api/qvitter/mutes.json
							
							
							
							
							
						 | 
						
							2018-06-23 23:20:30 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Vivian Lim
								
							 
						 | 
						
							
							
							
							
								
							
							
								6316003946
								
							
						 | 
						
							
							
								
								fixes- found that TwitterAPI.Controller adds .json suffix already
							
							
							
							
							
						 | 
						
							2018-06-23 23:05:54 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								359093d73b
								
							
						 | 
						
							
							
								
								Fake 2.4.0 API
							
							
							
							
							
						 | 
						
							2018-06-23 16:12:57 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								082920044a
								
							
						 | 
						
							
							
								
								Normalize file extension for uploaded files
							
							
							
							
							
						 | 
						
							2018-06-21 14:04:12 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								be800d7936
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/block-follow-relationships' into 'develop'
							
							
							
							
							
							
							
							fix follow relationship leaks when blocked
See merge request pleroma/pleroma!230 
							
						 | 
						
							2018-06-19 09:42:45 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								590e8d5555
								
							
						 | 
						
							
							
								
								tests: fix a completely bogus mastodon api test
							
							
							
							
							
						 | 
						
							2018-06-19 08:53:54 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								3707a7fa42
								
							
						 | 
						
							
							
								
								tests: transmogrifier: ensure incoming blocks have the same effect as local blocks
							
							
							
							
							
						 | 
						
							2018-06-19 00:59:28 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								e9ed7eb963
								
							
						 | 
						
							
							
								
								tests: prove that the block code is properly destroying follow relationships
							
							
							
							
							
						 | 
						
							2018-06-19 00:59:27 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								a2c6778ce6
								
							
						 | 
						
							
							
								
								tests: add regression test for contentMap-only posts
							
							
							
							
							
						 | 
						
							2018-06-18 22:14:51 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								72c2915ecd
								
							
						 | 
						
							
							
								
								Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads
							
							
							
							
							
						 | 
						
							2018-06-15 22:14:17 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								0a95b5594b
								
							
						 | 
						
							
							
								
								Add missing file extension if file does not have one
							
							
							
							
							
						 | 
						
							2018-06-14 12:16:34 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								8c7fdcb31b
								
							
						 | 
						
							
							
								
								Merge branch 'feature/twitterapi-unrepeat' into 'develop'
							
							
							
							
							
							
							
							Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218 
							
						 | 
						
							2018-06-14 07:19:36 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								fc15f30a3c
								
							
						 | 
						
							
							
								
								fixup test
							
							
							
							
							
						 | 
						
							2018-06-13 21:45:27 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								1555c66650
								
							
						 | 
						
							
							
								
								Add unretweet TwAPI endpoint and cleanup AP.unannounce
							
							
							
							
							
						 | 
						
							2018-06-13 21:33:36 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Henry Jameson
								
							 
						 | 
						
							
							
							
							
								
							
							
								9c1cf1befb
								
							
						 | 
						
							
							
								
								formatting
							
							
							
							
							
						 | 
						
							2018-06-12 15:01:40 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Henry Jameson
								
							 
						 | 
						
							
							
							
							
								
							
							
								f42ffbe9a8
								
							
						 | 
						
							
							
								
								Initial invites support + tests.
							
							
							
							
							
						 | 
						
							2018-06-12 14:55:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								3f42806b1b
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'develop'
							
							
							
							
							
							
							
							Dedupe uploads
See merge request pleroma/pleroma!115 
							
						 | 
						
							2018-06-12 08:26:26 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								564c73ab24
								
							
						 | 
						
							
							
								
								Merge branch 'feature/list-streaming' into 'develop'
							
							
							
							
							
							
							
							MastoAPI: Add streaming for lists.
See merge request pleroma/pleroma!183 
							
						 | 
						
							2018-06-12 07:19:45 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								c773f42ca4
								
							
						 | 
						
							
							
								
								tests: update twitterapi user view tests for new locked variable
							
							
							
							
							
						 | 
						
							2018-06-11 22:15:53 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								f8e0942745
								
							
						 | 
						
							
							
								
								twitter api: add approve/deny endpoints
							
							
							
							
							
						 | 
						
							2018-06-11 22:15:53 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								d116af3bee
								
							
						 | 
						
							
							
								
								tests: add tests for /api/pleroma/friend_requests
							
							
							
							
							
						 | 
						
							2018-06-11 22:15:53 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								993312cdb3
								
							
						 | 
						
							
							
								
								twitterapi: add profile setting for locked/unlocked accounts
							
							
							
							
							
						 | 
						
							2018-06-11 22:15:53 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								a0c5b42e29
								
							
						 | 
						
							
							
								
								tests: assert the state prior to mutating it as well as afterward
							
							
							
							
							
						 | 
						
							2018-06-11 22:15:53 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								c99b9b9d92
								
							
						 | 
						
							
							
								
								testsuite: add mastodon api tests
							
							
							
							
							
						 | 
						
							2018-06-11 22:15:53 +00:00 | 
						
						
							
							
							
								
							
							
						 |