| 
								
								
									 eugenijm | a4ab60ac54 | Add vapid_key to the POST /api/v1/appsresponse | 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 | 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 |  | 
				
					
						| 
								
								
									 kaniini | 1c3d3d0c2b | Merge branch 'safe-mentions' into 'develop' Add safe dm mode option.
See merge request pleroma/pleroma!958 | 2019-03-22 00:50:24 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | a223e65f35 | tests: fixup | 2019-03-21 23:56:57 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 3cc2554fa3 | mastodon api: add conversation_id extension (ref #674) | 2019-03-21 23:25:41 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | fea3696799 | common api: move context functions from twitterapi | 2019-03-21 23:24:04 +00:00 |  | 
				
					
						| 
								
								
									 lain | bf27190f7f | UtilController: Return state of safe dm mentions. | 2019-03-21 16:20:58 +01:00 |  | 
				
					
						| 
								
								
									 link0ff | f858df819b | Skip tests in LDAPAuthorizationTest if :eldap module is unavailable | 2019-03-21 12:31:16 +02:00 |  | 
				
					
						| 
								
								
									 lain | 8468f3f6d4 | Add safe dm mode option. | 2019-03-20 21:09:36 +01:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 455bb526f6 | test: add test for list sanitization | 2019-03-19 17:53:40 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | fd0aa58ee0 | tests: add test for as:Public issues | 2019-03-19 17:49:29 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 43bd7f47db | Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop' Order users by nickname
See merge request pleroma/pleroma!945 | 2019-03-18 23:08:31 +00:00 |  | 
				
					
						| 
								
								
									 eugenijm | 1588688a11 | Added support for exclude_types, limit, and min_id in Mastodon notifications.
Unify Mastodon-compatible pagination logic. | 2019-03-18 11:27:27 +03:00 |  | 
				
					
						| 
								
								
									 Fong-Wan Chau | 4ed2618f6c | Allow 'rel' attribute on <a>link with specific values (for hashtag recognition). | 2019-03-17 11:03:19 -04:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 76a13bc5a2 | Fix test | 2019-03-17 13:29:28 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | 6d6f48d079 | Merge branch 'feature/federated-flags' into 'develop' Federated reports
See merge request pleroma/pleroma!935 | 2019-03-16 19:27:56 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 28df397454 | Merge branch 'feature/oauth-me' into 'develop' oauth: add me property to token responses
See merge request pleroma/pleroma!942 | 2019-03-16 08:44:02 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | c69dc2acf1 | Merge branch 'feature/reblog-muting' into 'develop' Implement mastodon's reblog hiding feature
See merge request pleroma/pleroma!916 | 2019-03-16 04:31:31 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 40134598a8 | test: fix defective ldap setup/teardown | 2019-03-16 04:05:19 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | e0edc706cf | oauth: add me property to token responses | 2019-03-16 01:12:50 +00:00 |  | 
				
					
						| 
								
								
									 eugenijm | 43fb03be5a | Allow to mark a single notification as read | 2019-03-15 23:56:14 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | 8b352af4dd | Merge branch 'feature/openldap-support' into 'develop' OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859 | 2019-03-15 19:57:09 +00:00 |  | 
				
					
						| 
								
								
									 link0ff | a070dd4a83 | Add tests for LDAP authorization | 2019-03-15 16:28:46 +02:00 |  | 
				
					
						| 
								
								
									 Karen Konou | ebfc10c834 | Fix streamer test | 2019-03-15 14:20:08 +01:00 |  | 
				
					
						| 
								
								
									 Karen Konou | da53c079db | Refactor to store user ap_id, add tests | 2019-03-15 14:20:08 +01:00 |  | 
				
					
						| 
								
								
									 Karen Konou | 13c298d354 | Fix tests to assume reblogs shown by default | 2019-03-15 14:18:21 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn | 41fc67aa49 | Merge branch 'mastoapi/mime_type' into 'develop' Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938 | 2019-03-15 09:48:50 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | d7a34b604b | Extend MastoAPI to provide attachment mimetypes | 2019-03-15 11:58:12 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | 100413bf2c | Add is_seento MastoAPI notifications, extract rendering logic into separate NotificationView, add tests | 2019-03-15 01:35:48 +03:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 414d4b8088 | test: add a test for accepting inbound Flag activities | 2019-03-14 19:04:33 +00:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 257d8e78e5 | Add tags | 2019-03-14 01:52:24 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 4872914d32 | Add test when local is false | 2019-03-13 17:56:15 +03:00 |  |