| 
								
								
									 Ivan Tashkinov | 6ed5044c4e | [#394] Refactoring (using Ecto.Multi; "untag" route change). | 2018-12-07 11:04:39 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 7a2162bbcb | [#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map. | 2018-12-06 22:26:25 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | abbf347dc7 | [#394] View tests fix. | 2018-12-06 20:38:52 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 22830c8fc9 | [#394] Formatting fix. | 2018-12-06 20:13:07 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 7b19487389 | [#394] Added users.tagsand 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 lain | 839526a913 | TwitterAPI: Add network hiding. | 2018-12-05 19:22:40 +01: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 |  | 
				
					
						| 
								
								
									 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 | 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 | 1c67277c80 | Fix admin api. | 2018-12-01 09:03:16 +01:00 |  | 
				
					
						| 
								
								
									 lain | d0ec2812bd | Merge remote-tracking branch 'origin' into validate-user-info | 2018-11-30 17:34:20 +01:00 |  | 
				
					
						| 
								
								
									 lain | 48b95a9b95 | Assorted fixes. | 2018-11-30 17:08:02 +01:00 |  | 
				
					
						| 
								
								
									 lain | d407f662af | Fix TwitterApiController. | 2018-11-30 17:07:37 +01:00 |  | 
				
					
						| 
								
								
									 lain | a6812bc9df | Remove "most recent notification" endpoint. | 2018-11-30 16:47:37 +01:00 |  | 
				
					
						| 
								
								
									 lain | 6ac5d48575 | More fixes | 2018-11-29 00:25:43 +01:00 |  | 
				
					
						| 
								
								
									 KokaKiwi | 87098d1676 | Streamer: Don't send unwanted DMs to list streams | 2018-11-27 20:50:19 +01:00 |  | 
				
					
						| 
								
								
									 lain | e002858071 | Fix ostatus test. | 2018-11-27 18:37:46 +01:00 |  | 
				
					
						| 
								
								
									 lain | 3c61df6b9e | Webfinger fixes. | 2018-11-27 18:31:44 +01:00 |  | 
				
					
						| 
								
								
									 lain | 5bd3b3a215 | More and more fixes. | 2018-11-27 18:21:05 +01:00 |  |