| 
								
								
									 Eugenij | 5184b0f41a | Use fallback values for search queries This is to make sure the entire request doesn't return a 500 error if
user or status search times out. | 2019-07-03 10:19:51 +00:00 |  | 
				
					
						| 
								
								
									 Eugenij | 1f76740e10 | Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses) | 2019-06-30 09:08:46 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 889a9c3a3f | Polish IdempotencyPlug | 2019-06-27 01:53:58 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 0b8aeac0f3 | Remove previous idempotency implementation from post_status | 2019-06-26 18:49:14 +07:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | a7a54068f9 | Fix Controller.render/4 deprecation | 2019-06-26 03:28:02 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | df2dab69a7 | Merge branch 'begone-the-dot-hack' into 'develop' Remove the dot hack when posting from Mastodon API and add proper errors when the post exceeds character limits
See merge request pleroma/pleroma!1298 | 2019-06-19 10:22:23 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | c7acca2abb | Mastodon API: Sanitize display names Closes #1000 | 2019-06-18 14:12:11 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | dce27de733 | Mastodon API: Remove the dot hack | 2019-06-18 05:04:41 +03:00 |  | 
				
					
						| 
								
								
									 Maksim | a04bf131e0 | [#570] add user:notification stream | 2019-06-16 10:33:25 +00:00 |  | 
				
					
						| 
								
								
									 lain | 135c196769 | Merge branch 'bugfix/980-polls-double-vote' into 'develop' MastodonAPI Controller: Band-Aid double vote problem.
See merge request pleroma/pleroma!1275 | 2019-06-15 15:13:48 +00:00 |  | 
				
					
						| 
								
								
									 lain | a440cf856d | Mastodon API: Return the token needed for the chat. | 2019-06-15 10:59:35 +02:00 |  | 
				
					
						| 
								
								
									 rinpatch | 62ffc00a5d | Merge branch 'feature/add-background-image-to-mastoapi' into 'develop' AccountView: Add user background.
See merge request pleroma/pleroma!1280 | 2019-06-14 16:49:28 +00:00 |  | 
				
					
						| 
								
								
									 Maksim | ee4ed87fb4 | [#948] /api/v1/account_search added optional parameters (limit, offset, following) | 2019-06-14 11:39:57 +00:00 |  | 
				
					
						| 
								
								
									 lain | eac298083f | MastodonAPI: Add a way to update the background image. | 2019-06-14 11:19:22 +02:00 |  | 
				
					
						| 
								
								
									 lain | 5965efb216 | AccountView: Add user background. | 2019-06-13 19:08:05 +02:00 |  | 
				
					
						| 
								
								
									 lain | 966543379d | MastodonAPI Controller: Band-Aid double vote problem. | 2019-06-12 16:36:23 +02:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | ad04d12de6 | Replace MastodonAPIController.account_register/2rate limiter | 2019-06-11 16:06:03 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | bc8f059367 | Add rate limiting for search endpoints | 2019-06-11 14:28:39 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 93397fce3d | Contain search for unauthenticated users | 2019-06-05 16:37:43 +07:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 4f2e359687 | Merge branch 'develop' into issue/941 | 2019-06-04 09:49:08 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | 9d2563a3de | Merge branch 'generic-fe-settings' into 'develop' Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221 | 2019-06-04 05:43:43 +00:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | f13d6c7f78 | update api to set skip_thread_containment | 2019-06-03 21:02:57 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | dc91bcc0af | Merge branch 'develop' into feature/polls-2-electric-boogalo | 2019-06-03 13:16:17 +03:00 |  | 
				
					
						| 
								
								
									 lambda | 314758c25b | Merge branch 'align-mastodon-conversations' into 'develop' Mastodon Conversations API: Align to Mastodon behavior
See merge request pleroma/pleroma!1215 | 2019-06-03 09:48:37 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 026b245dbc | Merge branch 'develop' into feature/polls-2-electric-boogalo | 2019-06-03 11:14:52 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 1fd8e19d76 | Remove a TODO comment as the tests for poll view were written | 2019-06-02 23:46:17 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | e3c460353d | Refresh the object in CommonAPI.vote instead of MastoAPI controller | 2019-06-02 23:24:48 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 6bc9e5c020 | Mastodon API: Refresh the object before rendering it after voting | 2019-06-01 21:41:49 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 444406167b | Mastodon API: actually check for poll votes | 2019-06-01 21:41:23 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 65db5e9f52 | Resolve merge conflicts | 2019-06-01 16:29:58 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 300d94c628 | Add poll votes Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects | 2019-06-01 16:17:46 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 5d3ece2861 | Remove now useless flavours switching | 2019-06-01 01:44:10 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | aa9f52edd2 | mastodon_api_controller.ex: Remove vanilla from supported_flavours | 2019-06-01 01:44:10 +02:00 |  | 
				
					
						| 
								
								
									 lain | 7861974ab2 | MastodonAPI: Add extension to set and get pleroma_settings_store. | 2019-05-31 14:50:18 +02:00 |  | 
				
					
						| 
								
								
									 lain | aaad85c4d9 | AccountView: settings -> settings_store | 2019-05-31 14:49:46 +02:00 |  | 
				
					
						| 
								
								
									 lain | eb2963bc43 | User: Add settings store to Info, AccountView This is to provide a generic frontend settings storage mechanism for all kinds
of frontends. | 2019-05-31 14:27:15 +02:00 |  | 
				
					
						| 
								
								
									 lain | 97fb50d9fa | Mastodon Conversation API: Don't return own account in 'accounts'. | 2019-05-31 11:27:14 +02:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | 1690be991e | Replace missing non-nullable Card attributes with empty strings | 2019-05-30 21:03:31 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 672fddb721 | Default search limit should be 40 https://docs.joinmastodon.org/api/rest/search/ | 2019-05-29 08:06:26 -05:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 9bec891eb4 | kill @httpoison | 2019-05-25 04:24:21 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | e6b175ed6c | Fix credo issues | 2019-05-22 21:57:46 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | cdac5efd10 | Merge branch 'bugfix/account_view_source.note' into 'develop' MastoAPI AccountView: fill source.note with plaintext version of note
Closes #926
See merge request pleroma/pleroma!1189 | 2019-05-22 05:39:01 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 0e2c215a00 | MastoAPI AccountView: fill source.note with plaintext version of note Closes: https://git.pleroma.social/pleroma/pleroma/issues/926 | 2019-05-22 07:22:19 +02:00 |  | 
				
					
						| 
								
								
									 rinpatch | 63b0b7190c | MastoAPI: Add GET /api/v1/polls/:id | 2019-05-21 20:40:35 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 0407ffe75f | Change validation error status codes to be more appropriate | 2019-05-21 17:12:38 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | f28747858b | Actual vote count in poll view | 2019-05-21 14:27:09 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 3f96b3e4b8 | Enforce poll limits and add error handling for MastodonAPI's post endpoint | 2019-05-21 10:54:20 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 76a7429bef | Add poll limits to /api/v1/instance and initial state | 2019-05-21 09:13:10 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | d4847b17ca | Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop' Add virtual :thread_muted? field
Closes #901
See merge request pleroma/pleroma!1178 | 2019-05-20 23:30:19 +00:00 |  | 
				
					
						| 
								
								
									 Aaron Tinio | eb02edcad9 | Add virtual :thread_muted? field that may be set when fetching activities | 2019-05-21 00:35:46 +08:00 |  |