| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 lambda | 4a602230e4 | Merge branch 'bugfix/mrf-simple-media-removal' into 'develop' bugfix: MRF simple media removal
See merge request pleroma/pleroma!497 | 2018-12-04 18:36:34 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | b57d83e3c9 | MRF: simple policy: fix media removal | 2018-12-04 18:30:01 +00:00 |  | 
				
					
						| 
								
								
									 Rin Toshaka | 6396f1b58f | change new to gen in instance.ex . Refactor user.ex | 2018-12-04 19:00:45 +01: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 | 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 | 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 | 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 |  | 
				
					
						| 
								
								
									 kaniini | a3f9cca78c | Merge branch 'update-pleroma-frontend' into 'develop' update-pleroma-frontend
See merge request pleroma/pleroma!494 | 2018-12-03 06:03:09 +00:00 |  | 
				
					
						| 
								
								
									 hakabahitoyo | a7b1a66be3 | update-pleroma-frontend | 2018-12-03 13:24:25 +09:00 |  | 
				
					
						| 
								
								
									 Haelwenn | e1204c6f25 | Merge branch 'user_info_fixes_again' into 'develop' User info fixes again
See merge request pleroma/pleroma!489 | 2018-12-02 23:07:24 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 343b0adfa6 | Merge branch 'develop' into fix/theora-detection-read-bytes | 2018-12-03 00:34:04 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | a3953ca37a | Change @read_bytes to 35 | 2018-12-03 00:22:19 +03:00 |  | 
				
					
						| 
								
								
									 Rin Toshaka | 03b2d1016d | F O R M A T I N G | 2018-12-02 20:27:49 +01:00 |  | 
				
					
						| 
								
								
									 Rin Toshaka | 57c71f8468 | Move generate_invite to user.ex | 2018-12-02 20:26:15 +01:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 8148943368 | Format files | 2018-12-02 22:08:53 +03:00 |  | 
				
					
						| 
								
								
									 Rin Toshaka | d924b6cd3d | Refactor copypasta to a private function in instance.ex | 2018-12-02 20:04:33 +01:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | ce98d5eb9b | Parse user's bio on register | 2018-12-02 22:03:53 +03:00 |  | 
				
					
						| 
								
								
									 Rin Toshaka | cbe22deb51 | Lint fix | 2018-12-02 19:20:50 +01:00 |  | 
				
					
						| 
								
								
									 Rin Toshaka | faf1f2b304 | Move gen.instance to instance.ex | 2018-12-02 19:18:06 +01:00 |  | 
				
					
						| 
								
								
									 lain | 8c9a4e8b40 | TwitterAPI: Implement hide_network. | 2018-12-02 18:14:13 +01:00 |  | 
				
					
						| 
								
								
									 Rin Toshaka | 7983b0bdfe | Move unsubscribe user task to pleroma/user.ex. Delete unsubscribe_user.ex. Fix pleroma.user toggle_activated to work not only on local users. | 2018-12-02 18:05:59 +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 |  | 
				
					
						| 
								
								
									 Rin Toshaka | 31b3ac05ac | Lint fix | 2018-12-02 10:01:17 +01:00 |  | 
				
					
						| 
								
								
									 Rin Toshaka | a8ef6b1190 | Add admin option to pleroma.user new. Add user existence checking to toggle_activated | 2018-12-02 09:36:31 +01:00 |  | 
				
					
						| 
								
								
									 kaniini | 371d96b1da | Merge branch 'validate-user-info' into 'develop' Validate user info
See merge request pleroma/pleroma!465 | 2018-12-01 22:11:52 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | ae82852330 | Move set_admin task to lib/mix/tasks/pleroma/user.ex | 2018-12-01 18:55:52 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 6f174cbb71 | Delete reactivate user task | 2018-12-01 18:34:26 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 5f91d6b859 | Fix toggle_deactivated to reactivate a deactivated user | 2018-12-01 18:33:53 +03:00 |  | 
				
					
						| 
								
								
									 lambda | a836d7b93a | Merge branch 'fix/config-replace-try-catch-with-file-exists' into 'develop' #292 Replace try/rescue with File.Exists? in dev.exs
See merge request pleroma/pleroma!488 | 2018-12-01 15:17:41 +00:00 |  |