| 
								
								
									 Alexander Strizhakov | 5e72554f3c | Admin config fix | 2019-07-23 19:17:00 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 9169f331b6 | Merge branch 'develop' into feature/matstodon-statuses-by-name | 2019-07-19 16:55:10 -05:00 |  | 
				
					
						| 
								
								
									 Eugenij | 520ee6c591 | Add pleroma.deactivatedto the Account entity (Mastodon API) | 2019-07-16 11:14:46 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | ffb4eb9779 | Merge branch 'develop' into feature/matstodon-statuses-by-name | 2019-07-15 17:10:27 -05:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 0c66bb5857 | Update documentation | 2019-07-15 14:27:56 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 64a946643e | Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists | 2019-07-15 14:11:54 +07:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 360e4cdaa2 | Move these to pleroma namespace in Mastodon API | 2019-07-12 11:25:58 -05:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 846ad9a463 | admin api configure changes | 2019-07-11 13:02:13 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 182f7bbb11 | Merge branch 'develop' into feature/addressable-lists | 2019-07-11 13:26:59 +07:00 |  | 
				
					
						| 
								
								
									 feld | c91b5c87ff | Docs/more mastodon api | 2019-07-09 18:20:36 +00:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 9f23502856 | Fix docs | 2019-07-06 15:16:56 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 6c50fbcd14 | Admin API: Allow querying user by ID | 2019-07-05 19:33:53 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 611f6665ac | Update changelog and admin API docs with tags, display_name, avatar additions | 2019-07-01 03:36:42 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | c6705144a2 | don't delete config settings on admin update | 2019-06-27 04:19:44 +00:00 |  | 
				
					
						| 
								
								
									 Alex S | 982cad0268 | support for config groups | 2019-06-23 08:16:16 +03:00 |  | 
				
					
						| 
								
								
									 Alex S | 410add1c30 | support for tuples with more than 2 values | 2019-06-22 17:30:53 +03:00 |  | 
				
					
						| 
								
								
									 lain | 6745bc951c | Documentation: Document chat token response. | 2019-06-15 11:11:45 +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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 lain | 774637a2f4 | Mastodon API: Document changes. | 2019-06-14 11:24:09 +02:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | cfa5572d28 | Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists | 2019-06-05 17:53:15 +07:00 |  | 
				
					
						| 
								
								
									 kaniini | e4babb1c9f | Merge branch 'explicit-addressing' into 'develop' Explicit addressing
See merge request pleroma/pleroma!1239 | 2019-06-05 08:28:20 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 6ba9055b51 | Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists | 2019-06-05 12:54:30 +07:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 96121315f3 | fix merge | 2019-06-04 12:41:24 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 9ce928d823 | Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists | 2019-06-04 16:28:23 +07:00 |  | 
				
					
						| 
								
								
									 lain | 4cab98b7bf | Merge remote-tracking branch 'origin/develop' into explicit-addressing | 2019-06-04 11:23:46 +02:00 |  | 
				
					
						| 
								
								
									 lain | 25198d48f7 | Docs: Add Explicit addressing to Readme and changelog. | 2019-06-04 10:49:57 +02: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 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 5d3ece2861 | Remove now useless flavours switching | 2019-06-01 01:44:10 +02:00 |  | 
				
					
						| 
								
								
									 lain | 10fe02acef | Documentation: Document Settings store mechanism. | 2019-05-31 14:59:24 +02:00 |  | 
				
					
						| 
								
								
									 Mark Felder | e912f81c82 | Update docs to reflect we accept nickname for id for both of these endpoints | 2019-05-29 12:22:14 -05:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | f333041a0a | Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists | 2019-05-24 21:05:57 +07:00 |  | 
				
					
						| 
								
								
									 Sadposter | 54e9cb5c2d | Add API endpoints for a custom user mascot | 2019-05-20 12:39:23 +01:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 557f0e33a7 | Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists | 2019-05-17 19:57:14 +07:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | e2b3a27204 | Add Reports to Admin API | 2019-05-16 19:09:18 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | fc7246d715 | Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists | 2019-05-16 17:54:24 +07:00 |  | 
				
					
						| 
								
								
									 Angelina Filippova | 107c83ab2b | Note that nicknames is an array | 2019-05-16 01:48:53 +03:00 |  | 
				
					
						| 
								
								
									 Angelina Filippova | 0641e685c1 | Note that nicknames is an array | 2019-05-16 01:46:43 +03:00 |  | 
				
					
						| 
								
								
									 Angelina Filippova | 1d2923e5d0 | Update tag/untag docs | 2019-05-16 01:36:26 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | a7a8f3bc2c | Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists | 2019-05-15 14:31:24 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | fc9b4410c4 | Add documentation | 2019-05-14 20:27:40 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 5e2b491276 | Merge remote-tracking branch 'pleroma/develop' into feature/disable-account | 2019-05-14 18:15:56 +07:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | a2be420f94 | differences_in_mastoapi_responses.md: fullname & bio are optionnal [ci skip] | 2019-05-13 18:35:45 +00:00 |  | 
				
					
						| 
								
								
									 Sachin Joshi | f01f995816 | make url uniform in admin api | 2019-05-11 14:46:00 +05:45 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | bfeb33e951 | Merge develop Merge conflict in lib/pleroma/activity.ex | 2019-05-08 14:34:36 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 1557b99beb | Merge remote-tracking branch 'pleroma/develop' into feature/disable-account | 2019-05-07 16:51:11 +07:00 |  | 
				
					
						| 
								
								
									 Maksim | 1040caf096 | fix format Modified-by: Maksim Pechnikov <parallel588@gmail.com> | 2019-05-06 17:51:03 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | ce3789e39a | Add default_scope to /api/v1/update_credentials | 2019-04-27 23:55:54 +03:00 |  |