| 
								
								
									 Alexander Strizhakov | 88f0be9693 | Feature/826 healthcheck endpoint | 2019-04-22 07:19:53 +00:00 |  | 
				
					
						| 
								
								
									 Normandy | d4a749cfb2 | Handle new-style mastodon follow lists Fixes https://git.pleroma.social/pleroma/pleroma/issues/814 | 2019-04-16 18:35:38 +00:00 |  | 
				
					
						| 
								
								
									 lambda | c8440b5e0c | Merge branch 'fix/emoji-api-nonsense' into 'develop' Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038 | 2019-04-10 06:22:51 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 97395e013e | Merge branch 'notification-pleroma-settings' into 'develop' Notification controls
Closes #738
See merge request pleroma/pleroma!988 | 2019-04-10 02:10:31 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | b57b43027c | Change response format of /api/pleroma/emoji to the one that actually makes sense | 2019-04-09 23:20:31 +03:00 |  | 
				
					
						| 
								
								
									 Alex S | fa8483cb80 | Merging develop into feature/770-add-emoji-tags Conflict test/web/twitter_api/util_controller_test.exs | 2019-04-02 20:39:52 +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 |  | 
				
					
						| 
								
								
									 Sachin Joshi | 1d01e8e656 | [OStatus] adds status to pleroma instance if the url given is a status | 2019-04-01 22:26:58 +05:45 |  | 
				
					
						| 
								
								
									 Alex S | 3601f03147 | Adding tag to emoji ets table changes in apis | 2019-04-01 17:17:57 +07:00 |  | 
				
					
						| 
								
								
									 eugenijm | cd90695a34 | Add PUT /api/pleroma/notification_settings endpoint | 2019-03-28 18:55:16 +03:00 |  | 
				
					
						| 
								
								
									 lain | bf27190f7f | UtilController: Return state of safe dm mentions. | 2019-03-21 16:20:58 +01:00 |  | 
				
					
						| 
								
								
									 eugenijm | 43fb03be5a | Allow to mark a single notification as read | 2019-03-15 23:56:14 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 04ee877a20 | [#468] Added OAuth scopes-specific tests. | 2019-02-19 22:28:21 +03:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 73e6a1f1dd | test: twitterapi: fix another possible test failure case | 2019-02-05 20:08:16 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | c4d317ccb6 | test: twitterapi: fix the test breakage for real | 2019-02-05 18:49:02 +00:00 |  | 
				
					
						| 
								
								
									 lain | 8e8a1e1ba8 | Return new-style config if old-style config is set to false. This is in preparation for 1.0. We'll be able to switch the config to the new
mechanism on PleromaFE then as well. | 2019-01-28 13:07:12 +01:00 |  | 
				
					
						| 
								
								
									 lain | e221c681dc | New frontend configuration mechanism. | 2019-01-23 12:40:57 +01:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 67b4297f4d | [#483] Refactored blocks and follows import, added tests. | 2018-12-29 12:02:37 +03:00 |  |