Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								7b19487389
								
							
						 | 
						
							
							
								
								[#394] Added users.tags and admin routes to tag and untag users. Added tests.
							
							
							
							
							
						 | 
						
							2018-12-06 20:06:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Vald
								
							 
						 | 
						
							
							
							
							
								
							
							
								194869c7db
								
							
						 | 
						
							
							
								
								added data attrs to twitter scrubber
							
							
							
							
							
						 | 
						
							2018-12-06 02:14:56 +05:30 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								7d5720f2e4
								
							
						 | 
						
							
							
								
								Fix merge.
							
							
							
							
							
						 | 
						
							2018-12-05 21:31:02 +01: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								fdac215091
								
							
						 | 
						
							
							
								
								TwitterAPI: Show users their own network.
							
							
							
							
							
						 | 
						
							2018-12-05 21:14:06 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Vald
								
							 
						 | 
						
							
							
							
							
								
							
							
								3ccfe226c0
								
							
						 | 
						
							
							
								
								added data attrs for user and tag
							
							
							
							
							
						 | 
						
							2018-12-06 01:05:41 +05:30 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3b5be09f45
								
							
						 | 
						
							
							
								
								[#210] Stylistic change.
							
							
							
							
							
						 | 
						
							2018-12-05 21:48:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								839526a913
								
							
						 | 
						
							
							
								
								TwitterAPI: Add network hiding.
							
							
							
							
							
						 | 
						
							2018-12-05 19:22:40 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								5f0c2372bc
								
							
						 | 
						
							
							
								
								Merge branch 'support/oauth_fetch_token' into 'develop'
							
							
							
							
							
							
							
							[#273] bugfix/273
See merge request pleroma/pleroma!502 
							
						 | 
						
							2018-12-05 17:55:51 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								c4f3c5e939
								
							
						 | 
						
							
							
								
								[#210] Stylistic change.
							
							
							
							
							
						 | 
						
							2018-12-05 20:23:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rin Toshaka
								
							 
						 | 
						
							
							
							
							
								
							
							
								c3519132df
								
							
						 | 
						
							
							
								
								Sorry
							
							
							
							
							
						 | 
						
							2018-12-05 16:44:15 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rin Toshaka
								
							 
						 | 
						
							
							
							
							
								
							
							
								5427d2af3a
								
							
						 | 
						
							
							
								
								Update mix tasks since User.info.info_changeset is deprecated
							
							
							
							
							
						 | 
						
							2018-12-05 16:41:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								c524c50509
								
							
						 | 
						
							
							
								
								fix/273
							
							
							
							
							
						 | 
						
							2018-12-05 17:32:06 +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
								
							 
						 | 
						
							
							
							
							
								
							
							
								be187f82f7
								
							
						 | 
						
							
							
								
								[#210] Further refactoring.
							
							
							
							
							
						 | 
						
							2018-12-05 11:48:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								956f3c75ca
								
							
						 | 
						
							
							
								
								user: put default user info when registering a user
							
							
							
							
							
						 | 
						
							2018-12-05 03:35:41 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								ec1ec32f20
								
							
						 | 
						
							
							
								
								Merge branch 'optional-retry-queue' into 'develop'
							
							
							
							
							
							
							
							Make retry queue optional.
See merge request pleroma/pleroma!498 
							
						 | 
						
							2018-12-04 19:00:18 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								925b05054f
								
							
						 | 
						
							
							
								
								Make retry queue optional.
							
							
							
							
							
							
							
							At the moment, it can use a lot of memory really fast. 
							
						 | 
						
							2018-12-04 19:54:42 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								114b95cee2
								
							
						 | 
						
							
							
								
								Merge branch 'feature/integration_tesla' into 'develop'
							
							
							
							
							
							
							
							[#354] Move all http interactions to Tesla
See merge request pleroma/pleroma!487 
							
						 | 
						
							2018-12-04 18:41:00 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								b57d83e3c9
								
							
						 | 
						
							
							
								
								MRF: simple policy: fix media removal
							
							
							
							
							
						 | 
						
							2018-12-04 18:30:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								48e6193bf2
								
							
						 | 
						
							
							
								
								[#210] Refactoring.
							
							
							
							
							
						 | 
						
							2018-12-04 19:24:41 +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
								
							 
						 | 
						
							
							
							
							
								
							
							
								a9e4a97586
								
							
						 | 
						
							
							
								
								update test
							
							
							
							
							
						 | 
						
							2018-12-04 14:04:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								87109482f3
								
							
						 | 
						
							
							
								
								status_code -> status
							
							
							
							
							
						 | 
						
							2018-12-04 14:04:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								97252a27d9
								
							
						 | 
						
							
							
								
								fix http request in Salmon
							
							
							
							
							
						 | 
						
							2018-12-04 14:04:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ec34de0c1f
								
							
						 | 
						
							
							
								
								WebSub fix test
							
							
							
							
							
						 | 
						
							2018-12-04 14:03:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3ce16e5a56
								
							
						 | 
						
							
							
								
								init tesla and updated the http requests in Pleroma.Web.Websub
							
							
							
							
							
						 | 
						
							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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								42ef7cd227
								
							
						 | 
						
							
							
								
								Merge branch 'fix-media-proxy-defaults' into 'develop'
							
							
							
							
							
							
							
							Fix media proxy config defaults
See merge request pleroma/pleroma!495 
							
						 | 
						
							2018-12-03 16:14:58 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b70e5eae9
								
							
						 | 
						
							
							
								
								Parse bio for MastodonAPI
							
							
							
							
							
						 | 
						
							2018-12-03 18:59:50 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								43d5e4f7fa
								
							
						 | 
						
							
							
								
								Fix media proxy config defaults
							
							
							
							
							
						 | 
						
							2018-12-02 11:24:02 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e3f3d13d99
								
							
						 | 
						
							
							
								
								Add uuid generation extension to sample_psql.eex.
							
							
							
							
							
						 | 
						
							2018-12-02 11:20:49 +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 | 
						
						
							
							
							
								
							
							
						 |