| 
								
								
									 Maksim | c49a09ed88 | tests for Pleroma.Web.ActivityPub.Publisher | 2019-07-23 19:15:48 +00:00 |  | 
				
					
						| 
								
								
									 Maksim | b6b748d3e7 | tests for Uploader with webhook | 2019-07-18 12:30:18 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | f00562ed6b | HttpRequestMock: Add 404s on OStatus fetching for info.pleroma.site | 2019-07-14 13:55:41 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | efa9a13d4e | HttpRequestMock: Add missing mocks for object containment tests | 2019-07-14 13:55:41 +02:00 |  | 
				
					
						| 
								
								
									 kaniini | e4e3fd7e55 | Merge branch 'fix/1019-refactor' into 'develop' Fix/1019 refactor
See merge request pleroma/pleroma!1397 | 2019-07-11 13:01:11 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | a237c6a2d4 | support for idna domains | 2019-07-10 15:23:25 +00:00 |  | 
				
					
						| 
								
								
									 Alex S | beba7bbc85 | removing synchronization worker | 2019-07-10 17:42:18 +03:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | ff55e3c16f | Create mentions only for explicitly mentioned users | 2019-07-10 13:29:50 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 829e997223 | [#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests # Conflicts:
#	lib/pleroma/object.ex
#	test/web/activity_pub/transmogrifier_test.exs
#	test/web/ostatus/ostatus_test.exs | 2019-07-09 21:46:16 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | d6b0fce6e9 | Fix/1019 correct count remote users | 2019-07-09 17:36:35 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 4948117fcf | Merge branch 'remove-swift' into 'develop' Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374 | 2019-07-09 16:54:32 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 46cf81a544 | [#878] Formatting fix. | 2019-07-08 20:05:02 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | daff85a985 | [#878] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity. | 2019-07-08 19:53:02 +03:00 |  | 
				
					
						| 
								
								
									 Maksim | 6dadf5d6f4 | [#1043] fix search accounts. | 2019-07-05 04:22:08 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 11143c542a | Remove httpoisonfrom dependencies | 2019-07-03 14:42:24 +07:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 4ad15ad2a9 | add ignore hosts and TLDs for rich_media | 2019-06-25 22:25:37 +03:00 |  | 
				
					
						| 
								
								
									 Alex S | 982cad0268 | support for config groups | 2019-06-23 08:16:16 +03:00 |  | 
				
					
						| 
								
								
									 Alex S | 0f59265a50 | salmon fix removed some ownership sandbox error | 2019-06-16 20:10:12 +08:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | c2ca1f22a2 | it is changed in compile time we can't change module attributes and endpoint settings in runtime | 2019-06-14 15:45:05 +00:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | 84cc131b59 | Add missing HTTP Request mocks | 2019-06-04 05:46:19 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 65db5e9f52 | Resolve merge conflicts | 2019-06-01 16:29:58 +03:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | 1690be991e | Replace missing non-nullable Card attributes with empty strings | 2019-05-30 21:03:31 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 56fd7dbdd7 | remove @websub and @ostatus module-level constants | 2019-05-25 04:43:11 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 5ece901af3 | Resolve merge conflicts and remove IO.inspects | 2019-05-18 13:37:38 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 7ed682213f | Fix/902 random compile failing | 2019-05-17 07:25:20 +00:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | e2b3a27204 | Add Reports to Admin API | 2019-05-16 19:09:18 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 62e42b03ab | Handle incoming Question objects | 2019-05-15 20:10:16 +03:00 |  | 
				
					
						| 
								
								
									 lain | 45f790becc | Merge remote-tracking branch 'origin/develop' into conversations_three | 2019-05-01 18:40:41 +02:00 |  | 
				
					
						| 
								
								
									 lain | 64c1c3a407 | Participations: Add marking as read and unread. | 2019-04-10 15:12:01 +02:00 |  | 
				
					
						| 
								
								
									 lain | d1da6b155a | Conversation: Add Conversations and Participations. | 2019-04-10 15:01:42 +02:00 |  | 
				
					
						| 
								
								
									 lambda | e5d553aa45 | Merge branch 'feature/767-multiple-use-invite-token' into 'develop' Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032 | 2019-04-10 10:10:08 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | bffddf5e31 | [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth # Conflicts:
#	docs/config.md
#	test/support/factory.ex | 2019-04-08 12:20:26 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | fc92a0fd8d | Added limits and media attachments for scheduled activities. | 2019-04-06 23:55:58 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | 7bf622ce73 | Add scheduled activities | 2019-04-06 23:55:58 +03:00 |  | 
				
					
						| 
								
								
									 Alex S | be54e40890 | twitter api registration fix for twitter api tests | 2019-04-06 17:18:59 +07:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | 325a268017 | Redirect to the referer url after mastofe authorization | 2019-04-05 23:36:42 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 45765918c3 | [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth # Conflicts:
#	mix.exs | 2019-04-04 23:43:08 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | f7cd9131d4 | [#923] OAuth consumer controller tests. Misc. improvements. | 2019-04-04 22:41:03 +03:00 |  | 
				
					
						| 
								
								
									 lambda | 180b87257c | Merge branch 'bugfix/share-mastodon' into 'develop' [OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002 | 2019-04-02 12:47:40 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 15ce710460 | Added "GET /oauth/authorize" tests. | 2019-04-02 13:43:33 +03:00 |  | 
				
					
						| 
								
								
									 Sachin Joshi | 6386c1c9c1 | fetch url for OStatus to know if it is a/c or status | 2019-04-02 10:26:09 +05:45 |  | 
				
					
						| 
								
								
									 Sachin Joshi | 1d01e8e656 | [OStatus] adds status to pleroma instance if the url given is a status | 2019-04-01 22:26:58 +05:45 |  | 
				
					
						| 
								
								
									 Egor | 9a39d1d846 | Replace Pleroma.Jobs with pleroma_job_queue | 2019-03-29 12:46:05 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | fb82f6fc7c | [Credo] Remove parentesis on argument-less functions | 2019-03-13 04:26:56 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | a3a9cec483 | [Credo] fix Credo.Check.Readability.AliasOrder | 2019-03-13 04:26:54 +01:00 |  | 
				
					
						| 
								
								
									 Maksim | bc7570c282 | [#647] tests for web push | 2019-03-06 13:20:12 +00:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | cc7b35e097 | Add status text to notifications (mentions and reposts) | 2019-03-04 20:47:34 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | b574d97c2e | [#468] Added support for pushOAuth scope (Mastodon 2.4+). | 2019-02-20 17:27:41 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | c0ecbf6669 | [#468] Merged upstream/develop. | 2019-02-19 19:10:55 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | 833161b5d2 | Merge branch 'feature/jobs' into 'develop' Job Queue
See merge request pleroma/pleroma!732 | 2019-02-18 19:43:06 +00:00 |  |