| 
								
								
									 rinpatch | e8120944d8 | Fix signed fetch inclusion publisher test Oban branch changed `actor` to `actor_id` and this test was not adjusted for that | 2019-09-16 13:23:06 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | c623b4324d | Revert "Merge branch 'streamer-refactoring' into 'develop'" This reverts merge request !1653 | 2019-09-16 09:09:21 +00:00 |  | 
				
					
						| 
								
								
									 Steven Fuchs | aab264db82 | Streamer refactoring | 2019-09-16 07:44:03 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 17142a3720 | Merge branch 'feature/delivery-tracking' into 'develop' Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661 | 2019-09-16 07:39:58 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | ca88e37a8f | Fix a race condition in tests | 2019-09-16 12:55:05 +07:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 610236d6be | [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue # Conflicts:
#	docs/config.md | 2019-09-15 10:12:24 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 62bbba80f3 | Merge branch 'fix/truncate-remote-user-fields' into 'develop' Truncate remote user fields
See merge request pleroma/pleroma!1619 | 2019-09-14 16:39:42 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 6bcedb693c | [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue # Conflicts:
#	docs/config.md
#	mix.lock | 2019-09-14 16:11:44 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | b870ae08fd | Fix Activity.all_by_actor_and_id/2test | 2019-09-14 19:31:20 +07:00 |  | 
				
					
						| 
								
								
									 rinpatch | a78a7ee455 | Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs | 2019-09-14 10:50:08 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 85b6144ffd | Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs | 2019-09-14 10:46:35 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 5c5ebd3861 | Mastodon API: Respect post privacy in favourited/reblogged endpoints | 2019-09-14 01:50:15 +03:00 |  | 
				
					
						| 
								
								
									 lain | a9b78f55e3 | Merge branch 'capture-test-errors' into 'develop' Capture test error messages where appropriate
See merge request pleroma/pleroma!1665 | 2019-09-13 17:07:14 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | ba70a8cae6 | Merge branch 'develop' into feature/delivery-tracking | 2019-09-13 19:42:53 +03:00 |  | 
				
					
						| 
								
								
									 stwf | 25a64a4aa0 | Capture test error messages where appropriate | 2019-09-13 11:46:41 -04:00 |  | 
				
					
						| 
								
								
									 lain | 53a3ad6043 | Merge branch 'cleanup-activity' into 'develop' Cleanup `Pleroma.Activity` and add more tests
See merge request pleroma/pleroma!1623 | 2019-09-13 14:48:00 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn | 0d9609894f | Merge branch 'feature/change-email' into 'develop' Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580 | 2019-09-13 12:46:16 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | f884987ace | Merge branch 'admin-config-description' into 'develop' Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611 | 2019-09-13 12:36:24 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | fb96facc32 | Remove unused functions and fix credo issues | 2019-09-13 12:29:42 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | ce23529d91 | Use delivery info when federating deletes | 2019-09-13 11:38:17 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 25d8216804 | Add email change endpoint | 2019-09-13 13:09:35 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 5bfbad13ad | Add more tests for Pleroma.Activity | 2019-09-13 12:49:52 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 39dc9b470c | Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils | 2019-09-13 12:44:59 +07:00 |  | 
				
					
						| 
								
								
									 rinpatch | 769fb778d4 | Track object/create activity fetches | 2019-09-12 21:37:36 +03:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 102eb4455c | Fix associated test as well | 2019-09-12 12:29:08 -05:00 |  | 
				
					
						| 
								
								
									 Alex S | a1f2dfb10a | expanding regex sigils to use modifiers | 2019-09-11 09:25:33 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 3d12e05f43 | Fix Activity.all_by_ids_with_object/1test | 2019-09-11 01:08:37 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | b40b10b53d | Add an endpoint to get multiple statuses by IDs | 2019-09-10 13:39:45 +07:00 |  | 
				
					
						| 
								
								
									 minibikini | 11e12b5761 | Add Pleroma.Plugs.Cache | 2019-09-09 18:53:08 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | e0f84d0043 | Fix ActivityPubController.read_inbox/2 | 2019-09-10 01:11:57 +07:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | ca1ba1e272 | [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue # Conflicts:
#	test/web/twitter_api/twitter_api_controller_test.exs | 2019-09-06 13:26:05 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 896ffabe37 | Merge branch 'so-long-twitterapi' into 'develop' Removing TwitterAPI
See merge request pleroma/pleroma!1605 | 2019-09-06 08:43:38 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn | fe7cf44c40 | Merge branch 'feature/mastoapi-accounts-external' into 'develop' Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id`
See merge request pleroma/pleroma!1622 | 2019-09-05 12:48:27 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | b312ca3d52 | Mastodon API Poll view: Fix handling of polls without an end date | 2019-09-05 12:03:39 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 79cf629e1a | Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue | 2019-09-05 11:30:41 +03:00 |  | 
				
					
						| 
								
								
									 Sadposter | 2975da284b | truncate remote user bio/display name | 2019-09-04 15:45:40 +01:00 |  | 
				
					
						| 
								
								
									 rinpatch | 3face45467 | Mastodon API: Add pleroma.thread_mutedto Status entityNeeded for pleroma-fe!941 | 2019-09-04 14:17:23 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | c2b6c1b089 | Extend /api/pleroma/notifications/readto mark multiple notificationsas read and make it respond with Mastoapi entities | 2019-09-04 12:38:27 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | cc1d1ee406 | Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id` | 2019-09-03 19:26:10 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | eb17cc17a1 | [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue # Conflicts:
#	CHANGELOG.md | 2019-09-03 17:12:15 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | b15cfd80ef | Return "total" optionally | 2019-09-03 13:58:27 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | a4c5f71e93 | Return total from pagination + tests | 2019-09-02 22:48:52 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | b49085c156 | [#1149] Refactoring: GenServer workers renamed to daemons, use Oban.Workermoved to helper. | 2019-09-02 14:57:40 +03:00 |  | 
				
					
						| 
								
								
									 Sadposter | e73685834c | add mandatory fields for user update | 2019-09-02 12:35:55 +01:00 |  | 
				
					
						| 
								
								
									 Sadposter | 05c935c396 | mix format | 2019-09-02 12:15:40 +01:00 |  | 
				
					
						| 
								
								
									 Sadposter | 35ef470d00 | truncate fields for remote users instead | 2019-09-02 12:15:21 +01:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | a90ea8ba15 | [#1149] Addressed code review comments (code style, jobs pruning etc.). | 2019-08-31 19:08:56 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | e890ea7e82 | [#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue # Conflicts:
#	config/config.exs | 2019-08-31 14:25:43 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 9cabc02864 | Remove a useless import | 2019-08-31 10:57:35 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | dbfcba85ec | Add a changelog entry for twitterapi removal and fix credo issues | 2019-08-31 10:45:37 +03:00 |  |