kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								ccf0b46dd6
								
							
						 | 
						
							
							
								
								Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
							
							
							
							
							
							
							
							[#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496 
							
						 | 
						
							2018-12-06 07:36:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3e90f688f1
								
							
						 | 
						
							
							
								
								[#210] Mastodon: actor storing for media uploads, ownership check to update_media.
							
							
							
							
							
							
							
							Refactoring. 
							
						 | 
						
							2018-12-06 10:26:17 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								48a0315646
								
							
						 | 
						
							
							
								
								Merge branch 'follower-hiding' into 'develop'
							
							
							
							
							
							
							
							Network hiding
Closes #356
See merge request pleroma/pleroma!490 
							
						 | 
						
							2018-12-05 21:41:53 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								76d6b1c6ab
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin' into follower-hiding
							
							
							
							
							
						 | 
						
							2018-12-05 21:27:56 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								3ea4476445
								
							
						 | 
						
							
							
								
								MastodonAPI: Show users their own network.
							
							
							
							
							
						 | 
						
							2018-12-05 21:25:06 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Vald
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c8ffe7ed3
								
							
						 | 
						
							
							
								
								resolved activity view test
							
							
							
							
							
						 | 
						
							2018-12-06 01:54:04 +05:30 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Vald
								
							 
						 | 
						
							
							
							
							
								
							
							
								028904c333
								
							
						 | 
						
							
							
								
								lint
							
							
							
							
							
						 | 
						
							2018-12-06 01:46:53 +05:30 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Vald
								
							 
						 | 
						
							
							
							
							
								
							
							
								911a877576
								
							
						 | 
						
							
							
								
								resolved api and controller test failures
							
							
							
							
							
						 | 
						
							2018-12-06 01:46:30 +05:30 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								fdac215091
								
							
						 | 
						
							
							
								
								TwitterAPI: Show users their own network.
							
							
							
							
							
						 | 
						
							2018-12-05 21:14:06 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Vald
								
							 
						 | 
						
							
							
							
							
								
							
							
								743a09132b
								
							
						 | 
						
							
							
								
								linting
							
							
							
							
							
						 | 
						
							2018-12-06 01:28:52 +05:30 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Vald
								
							 
						 | 
						
							
							
							
							
								
							
							
								812b20d49f
								
							
						 | 
						
							
							
								
								resolved formatter_test failures
							
							
							
							
							
						 | 
						
							2018-12-06 01:27:08 +05:30 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								839526a913
								
							
						 | 
						
							
							
								
								TwitterAPI: Add network hiding.
							
							
							
							
							
						 | 
						
							2018-12-05 19:22:40 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								c524c50509
								
							
						 | 
						
							
							
								
								fix/273
							
							
							
							
							
						 | 
						
							2018-12-05 17:32:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ba345e4c29
								
							
						 | 
						
							
							
								
								[#210] Formatting fix.
							
							
							
							
							
						 | 
						
							2018-12-05 13:43:00 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								848151f7cb
								
							
						 | 
						
							
							
								
								[#210] [TwitterAPI] Made actor be stored for uploads. Added ownership check
							
							
							
							
							
							
							
							to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring. 
							
						 | 
						
							2018-12-05 13:37:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								53797d19c5
								
							
						 | 
						
							
							
								
								[#210] Test update (replaced bang- with non-bang method).
							
							
							
							
							
						 | 
						
							2018-12-05 11:56:31 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f061bea0c
								
							
						 | 
						
							
							
								
								tests: add regression test for bug #408
							
							
							
							
							
						 | 
						
							2018-12-05 03:41:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a9e3e387c9
								
							
						 | 
						
							
							
								
								add test
							
							
							
							
							
						 | 
						
							2018-12-04 20:37:13 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								44ab3dbe2c
								
							
						 | 
						
							
							
								
								[#210] Refactoring.
							
							
							
							
							
						 | 
						
							2018-12-04 19:45:09 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								826fc446d5
								
							
						 | 
						
							
							
								
								[#210] TwitterAPI: implemented /api/media/metadata/create
							
							
							
							
							
							
							
							to allow uploads description (alt text) setting. 
							
						 | 
						
							2018-12-04 18:35:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								50e72f6c48
								
							
						 | 
						
							
							
								
								remove httpoison_mock
							
							
							
							
							
						 | 
						
							2018-12-04 18:09:22 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								dd8aee332c
								
							
						 | 
						
							
							
								
								formatting the code
							
							
							
							
							
						 | 
						
							2018-12-04 17:48:55 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5c6d47614d
								
							
						 | 
						
							
							
								
								all tests passed
							
							
							
							
							
						 | 
						
							2018-12-04 17:44:15 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a9e4a97586
								
							
						 | 
						
							
							
								
								update test
							
							
							
							
							
						 | 
						
							2018-12-04 14:04:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								7ec64ac33f
								
							
						 | 
						
							
							
								
								update test
							
							
							
							
							
						 | 
						
							2018-12-04 14:04:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								80bfdb4e7d
								
							
						 | 
						
							
							
								
								update test
							
							
							
							
							
						 | 
						
							2018-12-04 14:04:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								6cfdc11e32
								
							
						 | 
						
							
							
								
								update test
							
							
							
							
							
						 | 
						
							2018-12-04 14:04:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								c508d41c34
								
							
						 | 
						
							
							
								
								add http requests mock
							
							
							
							
							
						 | 
						
							2018-12-04 14:04:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								87109482f3
								
							
						 | 
						
							
							
								
								status_code -> status
							
							
							
							
							
						 | 
						
							2018-12-04 14:04:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ec34de0c1f
								
							
						 | 
						
							
							
								
								WebSub fix test
							
							
							
							
							
						 | 
						
							2018-12-04 14:03:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								88b05aeabb
								
							
						 | 
						
							
							
								
								Merge branch 'fix/parse-user-bio' into 'develop'
							
							
							
							
							
							
							
							Parse user's bio on register
See merge request pleroma/pleroma!492 
							
						 | 
						
							2018-12-03 16:31:00 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b70e5eae9
								
							
						 | 
						
							
							
								
								Parse bio for MastodonAPI
							
							
							
							
							
						 | 
						
							2018-12-03 18:59:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								8148943368
								
							
						 | 
						
							
							
								
								Format files
							
							
							
							
							
						 | 
						
							2018-12-02 22:08:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ce98d5eb9b
								
							
						 | 
						
							
							
								
								Parse user's bio on register
							
							
							
							
							
						 | 
						
							2018-12-02 22:03:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								8c9a4e8b40
								
							
						 | 
						
							
							
								
								TwitterAPI: Implement hide_network.
							
							
							
							
							
						 | 
						
							2018-12-02 18:14:13 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								2a639de9b3
								
							
						 | 
						
							
							
								
								MastodonApi: Implement hide_network.
							
							
							
							
							
						 | 
						
							2018-12-02 17:48:00 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								6be0ab1e55
								
							
						 | 
						
							
							
								
								Hide network in ap.
							
							
							
							
							
						 | 
						
							2018-12-02 17:35:32 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								91065e1968
								
							
						 | 
						
							
							
								
								Fix background updating / handling.
							
							
							
							
							
						 | 
						
							2018-12-02 11:20:38 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								f18b86fd5f
								
							
						 | 
						
							
							
								
								More fixes for Info schema.
							
							
							
							
							
						 | 
						
							2018-12-01 12:46:08 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								93f2dc19d9
								
							
						 | 
						
							
							
								
								TwitterAPI: Fix banner and background update.
							
							
							
							
							
						 | 
						
							2018-12-01 12:01:22 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								347df6421d
								
							
						 | 
						
							
							
								
								Fix masto api user updating.
							
							
							
							
							
						 | 
						
							2018-12-01 10:40:01 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								c443c9bd72
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
							
							
							
							
							
						 | 
						
							2018-12-01 09:55:46 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								1c67277c80
								
							
						 | 
						
							
							
								
								Fix admin api.
							
							
							
							
							
						 | 
						
							2018-12-01 09:03:16 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e9982c521b
								
							
						 | 
						
							
							
								
								Upload filter: anonymize filename
							
							
							
							
							
							
							
							It replaces the original filename with a randomly generated string. 
							
						 | 
						
							2018-11-30 19:33:34 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								ca24ad2a2b
								
							
						 | 
						
							
							
								
								Merge branch 'feature/reverse-proxy' into 'develop'
							
							
							
							
							
							
							
							reverse proxy / uploads
See merge request pleroma/pleroma!470 
							
						 | 
						
							2018-11-30 18:15:44 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								253da275bd
								
							
						 | 
						
							
							
								
								Pleroma.Config.delete/1
							
							
							
							
							
						 | 
						
							2018-11-30 18:27:27 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								65e7307d68
								
							
						 | 
						
							
							
								
								Upload: bring back base_url
							
							
							
							
							
						 | 
						
							2018-11-30 18:02:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1d537bc74f
								
							
						 | 
						
							
							
								
								remove eal
							
							
							
							
							
							
							
							i like you eal don't take it personally<3 
							
						 | 
						
							2018-11-30 18:02:49 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								02d3dc6869
								
							
						 | 
						
							
							
								
								Uploads fun, part. 2
							
							
							
							
							
						 | 
						
							2018-11-30 18:02:37 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b19597f602
								
							
						 | 
						
							
							
								
								reverse proxy / uploads
							
							
							
							
							
						 | 
						
							2018-11-30 18:00:47 +01:00 | 
						
						
							
							
							
								
							
							
						 |