Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								9dd36e5bcb 
								
							 
						 
						
							
							
								
								Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )  
							
							
							
						 
						
							2019-04-23 02:47:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								10c40e13d2 
								
							 
						 
						
							
							
								
								Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'  
							
							... 
							
							
							
							Add `in_reply_to_account_acct` to MastoAPI status entity
See merge request pleroma/pleroma!1086  
							
						 
						
							2019-04-23 02:43:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								aa9d378985 
								
							 
						 
						
							
							
								
								Merge branch 'fix/normalize-activities' into 'develop'  
							
							... 
							
							
							
							Normalize acitvities instead of objects inside them
See merge request pleroma/pleroma!1085  
							
						 
						
							2019-04-23 02:43:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								d35246c449 
								
							 
						 
						
							
							
								
								added healthcheck setting to instance config  
							
							
							
						 
						
							2019-04-22 17:00:06 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f60d072bbb 
								
							 
						 
						
							
							
								
								Add pleroma.in_reply_to_account_acct to MastoAPI status entity  
							
							
							
						 
						
							2019-04-22 11:54:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d21d921def 
								
							 
						 
						
							
							
								
								Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading  
							
							
							
						 
						
							2019-04-22 11:27:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								952a4ae68e 
								
							 
						 
						
							
							
								
								Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix  
							
							... 
							
							
							
							task docs 
							
						 
						
							2019-04-22 11:02:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor 
								
							 
						 
						
							
							
							
							
								
							
							
								b9cdf6d3b9 
								
							 
						 
						
							
							
								
								Use User.get_cached* everywhere  
							
							
							
						 
						
							2019-04-22 07:20:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								88f0be9693 
								
							 
						 
						
							
							
								
								Feature/826 healthcheck endpoint  
							
							
							
						 
						
							2019-04-22 07:19:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								7fcbda702e 
								
							 
						 
						
							
							
								
								Merge branch 'rework-emoji-management' into 'develop'  
							
							... 
							
							
							
							Remove finmoji and add a way to download emojis in packs
Closes  #817  and #821 
See merge request pleroma/pleroma!1073  
							
						 
						
							2019-04-22 02:07:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								3cefdc62e0 
								
							 
						 
						
							
							
								
								Fix emoji.txt / custom_emoji.txt / shortcode_globs handling  
							
							
							
						 
						
							2019-04-21 23:07:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								ba19ba8a88 
								
							 
						 
						
							
							
								
								Formatting  
							
							
							
						 
						
							2019-04-21 22:33:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								153f5375a6 
								
							 
						 
						
							
							
								
								Replace MD5 with SHA256 for emoji pack verification  
							
							
							
						 
						
							2019-04-21 22:28:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								d5c0fd35e1 
								
							 
						 
						
							
							
								
								Wrap the docstrings to 70 characters  
							
							
							
						 
						
							2019-04-21 22:16:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9256d2d4b4 
								
							 
						 
						
							
							
								
								[ #923 ] Refactored OAuthController#authorize definitions, added test.  
							
							
							
						 
						
							2019-04-21 10:51:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								375fd21055 
								
							 
						 
						
							
							
								
								Set correct values in the MastoAPI reblog status view  
							
							
							
						 
						
							2019-04-21 05:40:22 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								8f93d4c423 
								
							 
						 
						
							
							
								
								Remove most finmoji mentions where appropriate  
							
							
							
						 
						
							2019-04-20 15:42:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								53a3e61016 
								
							 
						 
						
							
							
								
								Fix priv/static/instance/static to be just instance/static  
							
							... 
							
							
							
							It was a misunderstanding 
							
						 
						
							2019-04-20 15:08:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								31cff7dbca 
								
							 
						 
						
							
							
								
								Document the pleroma.emoji task  
							
							
							
						 
						
							2019-04-20 15:06:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								1e311d6662 
								
							 
						 
						
							
							
								
								Add a newline at the end of pack in ls-packs  
							
							
							
						 
						
							2019-04-20 11:34:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								52ed287e87 
								
							 
						 
						
							
							
								
								Fix incorrect multiple emoji tag handling introduced in initial impl  
							
							
							
						 
						
							2019-04-20 11:17:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								9bd5e2dec9 
								
							 
						 
						
							
							
								
								Make emoji default_manifest a config option  
							
							
							
						 
						
							2019-04-20 11:17:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								98d4b3de53 
								
							 
						 
						
							
							
								
								Treat the manifest path as a file if it doesn't start with http  
							
							
							
						 
						
							2019-04-20 11:17:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								aaaa428512 
								
							 
						 
						
							
							
								
								mix format  
							
							
							
						 
						
							2019-04-20 11:17:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								a141f0807b 
								
							 
						 
						
							
							
								
								Assume packs without emoji.txt only have emoji pictures, unhardcode  
							
							... 
							
							
							
							unhardcode: remove hardcoded /instance/static and actually use the config option
as it is used in other places.
packs without emoji.txt: these are now assumed to have .png files that
are all emojis, their names are used as shortcodes 
							
						 
						
							2019-04-20 11:17:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								eff725c3af 
								
							 
						 
						
							
							
								
								Add a task to generate emoji packs  
							
							
							
						 
						
							2019-04-20 11:17:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								1e44b5478d 
								
							 
						 
						
							
							
								
								Remove useless comment  
							
							
							
						 
						
							2019-04-20 11:17:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								c5b7286b5f 
								
							 
						 
						
							
							
								
								Move helper functions of emoji manager task down in the file  
							
							
							
						 
						
							2019-04-20 11:17:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								06db3ee1a8 
								
							 
						 
						
							
							
								
								Add MD5 verification for emoji pack source  
							
							
							
						 
						
							2019-04-20 11:17:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								af5494f942 
								
							 
						 
						
							
							
								
								Separate emoji pack file lists in a different file  
							
							... 
							
							
							
							The file should be in the same directory as the manifest file 
							
						 
						
							2019-04-20 11:17:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								21b39c54a3 
								
							 
						 
						
							
							
								
								Allow using a custom manfest and getting multiple packs at once  
							
							... 
							
							
							
							A custom manifest can be provided as a command-line options --manifest/-m 
							
						 
						
							2019-04-20 11:17:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								c26724cc55 
								
							 
						 
						
							
							
								
								Remove finmoji and add a way to download emojis in packs  
							
							... 
							
							
							
							These packs are stored in a git repo on pleroma gitlab 
							
						 
						
							2019-04-20 11:17:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								fa48532387 
								
							 
						 
						
							
							
								
								Handle reblogs on the first follow request in MastoAPI  
							
							
							
						 
						
							2019-04-20 04:39:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								9da8b287f8 
								
							 
						 
						
							
							
								
								Merge branch 'feature/database-compaction' into 'develop'  
							
							... 
							
							
							
							database compaction
See merge request pleroma/pleroma!473  
							
						 
						
							2019-04-19 16:55:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								ada384207b 
								
							 
						 
						
							
							
								
								typo fix  
							
							... 
							
							
							
							docs for RelMe provider 
							
						 
						
							2019-04-19 07:50:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								218d96a26b 
								
							 
						 
						
							
							
								
								Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'  
							
							... 
							
							
							
							OAuth consumer params handling refactoring
See merge request pleroma/pleroma!1047  
							
						 
						
							2019-04-19 07:49:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f9865cf943 
								
							 
						 
						
							
							
								
								Stream out deletes, mistakingly removed when resolving merge conflicts  
							
							
							
						 
						
							2019-04-19 00:47:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								73b8c5387b 
								
							 
						 
						
							
							
								
								Add some logging  
							
							
							
						 
						
							2019-04-19 00:17:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								945325013a 
								
							 
						 
						
							
							
								
								remove query timeouts  
							
							
							
						 
						
							2019-04-18 23:58:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								099f89367e 
								
							 
						 
						
							
							
								
								Replace embedded object migration with a mix task  
							
							
							
						 
						
							2019-04-18 23:34:01 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9238dccac1 
								
							 
						 
						
							
							
								
								Add a guard to fetching reply activity  
							
							
							
						 
						
							2019-04-18 21:40:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								eba3db0966 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/filter-boosted-blocks' into 'develop'  
							
							... 
							
							
							
							activitypub: fix filtering of boosts from blocked users
See merge request pleroma/pleroma!1074  
							
						 
						
							2019-04-18 18:29:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								1aa4994f6d 
								
							 
						 
						
							
							
								
								Do not require authentication for user search in MastoAPI  
							
							
							
						 
						
							2019-04-18 12:44:25 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a11ca87f40 
								
							 
						 
						
							
							
								
								Add a migration to remove embeded objects  
							
							
							
						 
						
							2019-04-18 13:10:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								83589ca6a5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/database-compaction  
							
							
							
						 
						
							2019-04-18 12:56:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ac04311b3f 
								
							 
						 
						
							
							
								
								Fix search in TwitterAPI  
							
							
							
						 
						
							2019-04-18 10:24:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6069d0fd36 
								
							 
						 
						
							
							
								
								Fix object search depending on embeded object  
							
							
							
						 
						
							2019-04-18 09:28:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e31a22043b 
								
							 
						 
						
							
							
								
								Fix media timeline depending on embeded object and add some guards  
							
							
							
						 
						
							2019-04-18 08:31:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2abc09570f 
								
							 
						 
						
							
							
								
								Use the preloaded object in tag queries  
							
							
							
						 
						
							2019-04-18 01:37:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								36f78c6dcd 
								
							 
						 
						
							
							
								
								activitypub: fix filtering of boosts from blocked users  
							
							
							
						 
						
							2019-04-17 22:27:59 +00:00