| 
								
								
									 Egor Kislitsyn | 3c5ecb70b4 | Add PleromaAPI.AccountController | 2019-09-30 19:10:55 +07:00 |  | 
				
					
						| 
								
								
									 lain | b923842e96 | Merge remote-tracking branch 'origin/develop' into reactions | 2019-09-30 13:57:54 +02:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 1d7cbdaf7b | change new scrobble endpoint | 2019-09-30 10:39:48 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | e653edd182 | split scrobble functions into their own controller | 2019-09-30 10:39:48 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | a6e1469767 | router: change scrobble timeline route from now-playing to scrobbles | 2019-09-30 10:39:48 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 7cad6ea67a | pleroma api: hook up scrobbler controller | 2019-09-30 10:39:17 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | e9d1aa75d5 | Revert subscription refactoring. As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10, reversing
changes made toc4fbb56984. | 2019-09-29 18:43:27 +03:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | b4b147000c | Merge develop | 2019-09-26 10:38:54 +03:00 |  | 
				
					
						| 
								
								
									 Ekaterina Vaartis | 118d6dcdf4 | Fix nodeinfo handling | 2019-09-25 12:32:19 +02:00 |  | 
				
					
						| 
								
								
									 Ekaterina Vaartis | ba9d35a904 | Add an API endpoint for listing remote packs | 2019-09-25 12:32:19 +02:00 |  | 
				
					
						| 
								
								
									 vaartis | a6e85215e1 | Credo fix (remove parens on function definition) | 2019-09-25 12:32:19 +02:00 |  | 
				
					
						| 
								
								
									 vaartis | f21dbbc021 | Move emoji_dir_path & cache_seconds_per_file | 2019-09-25 12:32:19 +02:00 |  | 
				
					
						| 
								
								
									 Ekaterina Vaartis | cdbe7cd37a | When listing emoji packs, be sure to create the directory | 2019-09-25 12:32:19 +02:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 1a858134ed | Merge branch 'develop' into issue/1218 | 2019-09-25 12:24:12 +03:00 |  | 
				
					
						| 
								
								
									 Ekaterina Vaartis | e63f167f01 | Also pretty print pack.json | 2019-09-24 00:37:27 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 6b3d5ed6db | Emoji API Controller: Follow phoenix directory structure | 2019-09-23 21:14:51 +03:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | 9fa2586abd | Refactor SubscriptionNotificationView | 2019-09-17 17:44:10 +03:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | e9f69a3eb7 | Move pleroma_api controllers into controllers sub-folders | 2019-09-17 16:52:23 +03:00 |  |