Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								0cb94cfa94
								
							
						 | 
						
							
							
								
								Merge branch 'fix-slow-relationships' into 'develop'
							
							
							
							
							
							
							
							ActivityPub Utils: Greatly speed up the follow / block activity fetching.
See merge request pleroma/pleroma!1011 
							
						 | 
						
							2019-04-02 18:43:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								256b492a58
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/wrong-date-format' into 'develop'
							
							
							
							
							
							
							
							Support activities with dates in the Unix timestamp format
Closes #763
See merge request pleroma/pleroma!1004 
							
						 | 
						
							2019-04-02 14:18:23 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								a79ce94dd4
								
							
						 | 
						
							
							
								
								Merge branch 'feature/fake-statuses' into 'develop'
							
							
							
							
							
							
							
							Add fake status submit
See merge request pleroma/pleroma!995 
							
						 | 
						
							2019-04-02 14:17:43 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								39bcf93007
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
							
							
							
							
							
						 | 
						
							2019-04-02 16:10:38 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								fd07745d1b
								
							
						 | 
						
							
							
								
								ActivityPub Utils: Greatly speed up the follow / block activity fetching.
							
							
							
							
							
						 | 
						
							2019-04-02 16:08:55 +02: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								ce9284b36f
								
							
						 | 
						
							
							
								
								Merge branch 'remove-user-activities' into 'develop'
							
							
							
							
							
							
							
							[#757] Add mix task to delete user's activities
See merge request pleroma/pleroma!1008 
							
						 | 
						
							2019-04-02 12:45:29 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								b95cf3d490
								
							
						 | 
						
							
							
								
								Merge branch 'get_by_id' into 'develop'
							
							
							
							
							
							
							
							Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010 
							
						 | 
						
							2019-04-02 12:43:28 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								fdb4357e9b
								
							
						 | 
						
							
							
								
								Rename fake param to preview and make the tests check that the object was not inserted to the db
							
							
							
							
							
						 | 
						
							2019-04-02 14:31:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								20c619f85f
								
							
						 | 
						
							
							
								
								replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname) in tests
							
							
							
							
							
						 | 
						
							2019-04-02 17:58:32 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								091baf9316
								
							
						 | 
						
							
							
								
								Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
							
							
							
							
							
							
							
							MastoAPI 2.6.0 `force_login` option
Closes #734
See merge request pleroma/pleroma!999 
							
						 | 
						
							2019-04-02 10:57:38 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								26d509cc86
								
							
						 | 
						
							
							
								
								Merge branch 'get_by_id' into 'develop'
							
							
							
							
							
							
							
							Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible
See merge request pleroma/pleroma!1009 
							
						 | 
						
							2019-04-02 10:52:29 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									cascode
								
							 
						 | 
						
							
							
							
							
								
							
							
								95c92c49c9
								
							
						 | 
						
							
							
								
								Fix account lookup for nicknames beginning with numbers
							
							
							
							
							
						 | 
						
							2019-04-02 10:51:33 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								9a59c26619
								
							
						 | 
						
							
							
								
								replace Repo.get_by(User, ap_id: ap_id) with User.get_by_ap_id(ap_id)
							
							
							
							
							
						 | 
						
							2019-04-02 17:47:52 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								15ce710460
								
							
						 | 
						
							
							
								
								Added "GET /oauth/authorize" tests.
							
							
							
							
							
						 | 
						
							2019-04-02 13:43:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								11c2d6bdc4
								
							
						 | 
						
							
							
								
								change Repo.get(Activity, id) => Activity.get_by_id(id) in tests
							
							
							
							
							
						 | 
						
							2019-04-02 17:08:03 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								1b3d921921
								
							
						 | 
						
							
							
								
								change Repo.get(User, id) => User.get_by_id(id)
							
							
							
							
							
						 | 
						
							2019-04-02 17:01:26 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3db9235150
								
							
						 | 
						
							
							
								
								Ignore dates in wrong formats
							
							
							
							
							
						 | 
						
							2019-04-02 11:32:36 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								a14742f495
								
							
						 | 
						
							
							
								
								add user delete_activities mix task
							
							
							
							
							
						 | 
						
							2019-04-02 16:30:11 +07: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b6f9f7b8aa
								
							
						 | 
						
							
							
								
								Handle dates in the Unix timestamp format (Fixes #763)
							
							
							
							
							
						 | 
						
							2019-04-01 22:45:24 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sachin Joshi
								
							 
						 | 
						
							
							
							
							
								
							
							
								1d01e8e656
								
							
						 | 
						
							
							
								
								[OStatus] adds status to pleroma instance if the url given is a status
							
							
							
							
							
						 | 
						
							2019-04-01 22:26:58 +05:45 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								1bb4d5d65b
								
							
						 | 
						
							
							
								
								Implement fake status submit
							
							
							
							
							
						 | 
						
							2019-03-29 21:59:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor
								
							 
						 | 
						
							
							
							
							
								
							
							
								9a39d1d846
								
							
						 | 
						
							
							
								
								Replace Pleroma.Jobs with pleroma_job_queue
							
							
							
							
							
						 | 
						
							2019-03-29 12:46:05 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								10c81fc902
								
							
						 | 
						
							
							
								
								Add user show endpoint for Pleroma admin API
							
							
							
							
							
						 | 
						
							2019-03-27 21:44:15 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								926bf114b7
								
							
						 | 
						
							
							
								
								Merge branch 'feature/more-user-filters' into 'develop'
							
							
							
							
							
							
							
							Add more user filters + move search to its own module
See merge request pleroma/pleroma!982 
							
						 | 
						
							2019-03-27 11:33:13 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								776bb5137f
								
							
						 | 
						
							
							
								
								Fix muting reblogs tests
							
							
							
							
							
						 | 
						
							2019-03-27 13:43:43 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3cf7539bca
								
							
						 | 
						
							
							
								
								Add more user filters + move search to its own module
							
							
							
							
							
						 | 
						
							2019-03-27 03:51:59 +05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								a4ab60ac54
								
							
						 | 
						
							
							
								
								Add vapid_key to the POST /api/v1/apps response
							
							
							
							
							
						 | 
						
							2019-03-26 23:27:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								691d1208b5
								
							
						 | 
						
							
							
								
								Add GET /api/v1/apps/verify_credentials
							
							
							
							
							
						 | 
						
							2019-03-26 21:53:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								ff3b09f6b3
								
							
						 | 
						
							
							
								
								Merge branch 'fix/ap-icon' into 'develop'
							
							
							
							
							
							
							
							Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977 
							
						 | 
						
							2019-03-26 16:12:50 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								c6ab5ebe7c
								
							
						 | 
						
							
							
								
								Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
							
							
							
							
							
							
							
							Mastodon 2.7.2 instance attributes (registrations, languages)
See merge request pleroma/pleroma!979 
							
						 | 
						
							2019-03-26 16:01:52 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								10a7a4a868
								
							
						 | 
						
							
							
								
								AP UserView: Refactor banner / avatar display code, add test.
							
							
							
							
							
						 | 
						
							2019-03-26 16:59:28 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								47b49ab1a1
								
							
						 | 
						
							
							
								
								Test for MastoAPI /api/v1/instance response structure (formatting fix).
							
							
							
							
							
						 | 
						
							2019-03-26 18:18:36 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e3899bf36
								
							
						 | 
						
							
							
								
								Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
							
							
							
							
							
							
							
							Mastodon-based auth error messages. User#auth_active?/1 refactoring.
See merge request pleroma/pleroma!978 
							
						 | 
						
							2019-03-26 15:13:55 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								caf0e9cf33
								
							
						 | 
						
							
							
								
								Test for MastoAPI /api/v1/instance response structure.
							
							
							
							
							
						 | 
						
							2019-03-26 18:13:24 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								21ff78cd40
								
							
						 | 
						
							
							
								
								Merge branch 'replies-count' into 'develop'
							
							
							
							
							
							
							
							Increment replies_count (MastoAPI)
Closes #756
See merge request pleroma/pleroma!974 
							
						 | 
						
							2019-03-26 14:49:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								aacdcac1be
								
							
						 | 
						
							
							
								
								Credo is upset about me not remembering the alphabet
							
							
							
							
							
						 | 
						
							2019-03-26 17:35:45 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								087662d4fb
								
							
						 | 
						
							
							
								
								Fix formatting
							
							
							
							
							
						 | 
						
							2019-03-26 17:18:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								406d19331f
								
							
						 | 
						
							
							
								
								Remove ActivityRepresenter
							
							
							
							
							
						 | 
						
							2019-03-26 17:16:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								568e348588
								
							
						 | 
						
							
							
								
								Increment replies_count on replies (MastoAPI)
							
							
							
							
							
						 | 
						
							2019-03-26 15:27:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								263ca3dea2
								
							
						 | 
						
							
							
								
								Mastodon-based auth error messages. Defaulted User#auth_active?/1 to true.
							
							
							
							
							
						 | 
						
							2019-03-26 15:09:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								26b0c802c3
								
							
						 | 
						
							
							
								
								fix up missing announcements with preloads
							
							
							
							
							
						 | 
						
							2019-03-25 07:38:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								a32bcab04b
								
							
						 | 
						
							
							
								
								Merge branch 'fix/eldap-warnings' into 'develop'
							
							
							
							
							
							
							
							Ignore compilation warnings for undefined module :eldap
See merge request pleroma/pleroma!956 
							
						 | 
						
							2019-03-24 11:17:40 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								4a3dd86a55
								
							
						 | 
						
							
							
								
								tests: fix up activity collision test
							
							
							
							
							
						 | 
						
							2019-03-23 03:17:51 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								aaec91b9a1
								
							
						 | 
						
							
							
								
								relay test: don't do preloading (since follow objects are activities, it's a mess)
							
							
							
							
							
						 | 
						
							2019-03-23 01:23:02 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								73efe95368
								
							
						 | 
						
							
							
								
								activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
							
							
							
							
							
						 | 
						
							2019-03-23 01:09:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								fee360e581
								
							
						 | 
						
							
							
								
								Merge branch 'safe-mentions' into 'develop'
							
							
							
							
							
							
							
							NodeInfo: Return safe_dm_mentions feature flag.
See merge request pleroma/pleroma!964 
							
						 | 
						
							2019-03-22 11:03:56 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e2afce34b6
								
							
						 | 
						
							
							
								
								NodeInfo: Return safe_dm_mentions feature flag.
							
							
							
							
							
						 | 
						
							2019-03-22 11:57:20 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								3229c7a1d6
								
							
						 | 
						
							
							
								
								Ensure fts is prefered over trigram and use union_all instead of union in user search query
							
							
							
							
							
						 | 
						
							2019-03-22 08:39:49 +03:00 | 
						
						
							
							
							
								
							
							
						 |