Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e17a9a1f66 
								
							 
						 
						
							
							
								
								[ #923 ] Nickname & email selection for external registrations, option to connect to existing account.  
							
							 
							
							
							
						 
						
							2019-03-20 10:35:31 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								40e9a04c31 
								
							 
						 
						
							
							
								
								[ #923 ] Registration validations & unique index on [:user_id, :provider].  
							
							 
							
							
							
						 
						
							2019-03-18 20:31:24 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								26b6354095 
								
							 
						 
						
							
							
								
								[ #923 ] Support for multiple (external) registrations per user via Registration.  
							
							 
							
							
							
						 
						
							2019-03-18 17:23:38 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2739057442 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth  
							
							 
							
							
							
						 
						
							2019-03-15 17:11:00 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								aacbf0f570 
								
							 
						 
						
							
							
								
								[ #923 ] OAuth: prototype of sign in / sign up with Twitter.  
							
							 
							
							
							
						 
						
							2019-03-15 17:08:03 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pearson 
								
							 
						 
						
							
							
							
							
								
							
							
								3dadaa4432 
								
							 
						 
						
							
							
								
								robots.txt  
							
							 
							
							... 
							
							
							
							Add default robots.txt that allows bots access to all paths.
Add mix task to generate robots.txt taht allows bots access to no paths.
Document custom emojis, MRF and static_dir
static_dir documentation includes docs for the robots.txt Mix task. 
							
						 
						
							2019-03-15 02:28:18 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								05cad042ba 
								
							 
						 
						
							
							
								
								Update Mastodon Frontend to 2019-03-07 bundle  
							
							 
							
							... 
							
							
							
							See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-03-07 
[ci skip] 
							
						 
						
							2019-03-08 00:28:40 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								3a097bd770 
								
							 
						 
						
							
							
								
								update pleroma frontend  
							
							 
							
							
							
						 
						
							2019-03-07 13:31:03 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								8a1e0c9bee 
								
							 
						 
						
							
							
								
								Added migration to update existing user note counters  
							
							 
							
							
							
						 
						
							2019-03-03 15:35:32 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								85734c0d49 
								
							 
						 
						
							
							
								
								Added migration for setting default tags in existing users records  
							
							 
							
							
							
						 
						
							2019-03-01 14:02:25 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b227ccab82 
								
							 
						 
						
							
							
								
								Fixed scopes of apps / authorizations / tokens from apps initially created with space-delimited scope.  
							
							 
							
							
							
						 
						
							2019-02-22 14:00:18 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								553ce57d42 
								
							 
						 
						
							
							
								
								update frontend  
							
							 
							
							
							
						 
						
							2019-02-21 09:04:35 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor 
								
							 
						 
						
							
							
							
							
								
							
							
								bff9eb5ef7 
								
							 
						 
						
							
							
								
								Reports  
							
							 
							
							
							
						 
						
							2019-02-20 16:51:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								bc4f77b10b 
								
							 
						 
						
							
							
								
								[ #468 ] Merged upstream/develop, resolved conflicts.  
							
							 
							
							
							
						 
						
							2019-02-17 14:07:04 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								949e35e26d 
								
							 
						 
						
							
							
								
								[ #468 ] OAuth scopes-related data migration simplification.  
							
							 
							
							
							
						 
						
							2019-02-14 14:28:26 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								063baca5e4 
								
							 
						 
						
							
							
								
								[ #468 ] User UI for OAuth permissions restriction. Standardized storage format for scopes fields, updated usages.  
							
							 
							
							
							
						 
						
							2019-02-14 00:29:29 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								dd989962e6 
								
							 
						 
						
							
							
								
								litepub schema: add oauthRegistrationEndpoint [ci skip]  
							
							 
							
							
							
						 
						
							2019-02-13 19:34:43 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								ac72b578da 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/thread-muting  
							
							 
							
							
							
						 
						
							2019-02-11 12:10:49 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fcd8a2d0d6 
								
							 
						 
						
							
							
								
								Update Mastodon Frontend to 2019-02-10 bundle  
							
							 
							
							... 
							
							
							
							See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-02-10 
[ci skip] 
							
						 
						
							2019-02-10 19:55:22 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								6a150de3bd 
								
							 
						 
						
							
							
								
								Add unique index and unique constraint check, uniqueness test fails  
							
							 
							
							
							
						 
						
							2019-02-09 20:52:11 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								4ad843fb9d 
								
							 
						 
						
							
							
								
								[ #468 ] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.  
							
							 
							
							
							
						 
						
							2019-02-09 17:09:08 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								98ec578f4d 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/thread-muting  
							
							 
							
							
							
						 
						
							2019-02-08 12:44:02 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								c43f414a79 
								
							 
						 
						
							
							
								
								Somehow fixed the repo insert [skip-ci]  
							
							 
							
							
							
						 
						
							2019-02-07 23:44:49 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								77448de492 
								
							 
						 
						
							
							
								
								ugghhhh  
							
							 
							
							
							
						 
						
							2019-02-07 22:25:07 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								f4ff4ffba2 
								
							 
						 
						
							
							
								
								Migration and some boilerplate stuff  
							
							 
							
							
							
						 
						
							2019-02-07 17:36:14 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								f1b72bfb70 
								
							 
						 
						
							
							
								
								Split hide_networ only for local users  
							
							 
							
							
							
						 
						
							2019-02-06 13:41:36 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								78a51f4dd4 
								
							 
						 
						
							
							
								
								update frontend  
							
							 
							
							
							
						 
						
							2019-02-06 10:40:01 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								d120aa63f0 
								
							 
						 
						
							
							
								
								Merge branch 'fix-dm-index' into 'develop'  
							
							 
							
							... 
							
							
							
							Massage index until it actually does the stuff we want.
See merge request pleroma/pleroma!772  
							
						 
						
							2019-02-05 20:27:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								c48aba3c2a 
								
							 
						 
						
							
							
								
								Fix SQL  
							
							 
							
							
							
						 
						
							2019-02-05 10:22:31 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f3c8b02d65 
								
							 
						 
						
							
							
								
								Massage index until it actually does the stuff we want.  
							
							 
							
							... 
							
							
							
							Also makes the index a lot smoler. 
							
						 
						
							2019-02-04 23:47:29 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								cd6606b7f6 
								
							 
						 
						
							
							
								
								Initialize hide_network with false  
							
							 
							
							
							
						 
						
							2019-02-04 22:23:09 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								16ce129e38 
								
							 
						 
						
							
							
								
								Split hide_network into hide_followers & hide_followings (fixed)  
							
							 
							
							
							
						 
						
							2019-02-03 21:55:04 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								486749064f 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'feature/split-hide-network' into 'develop'"  
							
							 
							
							... 
							
							
							
							This reverts merge request !733  
							
						 
						
							2019-02-01 20:22:58 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								0a82a7e6d6 
								
							 
						 
						
							
							
								
								Merge branch 'feature/split-hide-network' into 'develop'  
							
							 
							
							... 
							
							
							
							Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733  
							
						 
						
							2019-02-01 17:05:29 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
							
							
								
							
							
								b3b0855456 
								
							 
						 
						
							
							
								
								Merge branch '534_federation_targets_reachability' into 'develop'  
							
							 
							
							... 
							
							
							
							[#534 ] Unreachable federation targets retirement
Closes  #534 
See merge request pleroma/pleroma!703  
							
						 
						
							2019-02-01 09:14:35 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								a43a1c6d4e 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'spc-fix-3' into 'develop'"  
							
							 
							
							... 
							
							
							
							This reverts merge request !682  
							
						 
						
							2019-01-31 12:16:23 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								4d3655c479 
								
							 
						 
						
							
							
								
								Merge branch 'spc-fix-3' into 'develop'  
							
							 
							
							... 
							
							
							
							Spc fix 3
See merge request pleroma/pleroma!682  
							
						 
						
							2019-01-31 11:29:29 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								00d4333373 
								
							 
						 
						
							
							
								
								Merge branch 'features/glitch-soc-frontend' into 'develop'  
							
							 
							
							... 
							
							
							
							Features/glitch soc frontend
See merge request pleroma/pleroma!192  
							
						 
						
							2019-01-31 10:16:11 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								de0c1c641a 
								
							 
						 
						
							
							
								
								[MastodonFE] Update Frontend (glitch)  
							
							 
							
							
							
						 
						
							2019-01-31 10:35:44 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								88a40308d3 
								
							 
						 
						
							
							
								
								update frontend  
							
							 
							
							
							
						 
						
							2019-01-30 21:04:58 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								d03a116654 
								
							 
						 
						
							
							
								
								Merge branch 'hj-happiness-improvement' into 'develop'  
							
							 
							
							... 
							
							
							
							New frontend configuration mechanism.
Closes  #445 
See merge request pleroma/pleroma!700  
							
						 
						
							2019-01-29 13:54:10 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								50d6183893 
								
							 
						 
						
							
							
								
								Split hide_network into hide_followers & hide_followings  
							
							 
							
							
							
						 
						
							2019-01-28 21:40:08 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								d3f9e6f6fe 
								
							 
						 
						
							
							
								
								[ #534 ] Merged upstream/develop.  
							
							 
							
							
							
						 
						
							2019-01-28 15:39:14 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								39b2457734 
								
							 
						 
						
							
							
								
								Change default bg image in new config.  
							
							 
							
							
							
						 
						
							2019-01-28 13:04:51 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9560abea10 
								
							 
						 
						
							
							
								
								[ #534 ] Refactoring / tweaks per MR review.  
							
							 
							
							
							
						 
						
							2019-01-28 11:03:52 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cda1470e02 
								
							 
						 
						
							
							
								
								[MastoAPI][GlitchAPI] Add bookmarks  
							
							 
							
							
							
						 
						
							2019-01-28 04:47:32 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								15d12a69a4 
								
							 
						 
						
							
							
								
								add activities likes index, fixes favorites API call  
							
							 
							
							
							
						 
						
							2019-01-27 15:15:33 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4a13bb75bd 
								
							 
						 
						
							
							
								
								Change webpush endpoint to unlimited varchar  
							
							 
							
							... 
							
							
							
							Fixes  #552  
							
						 
						
							2019-01-26 17:18:34 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								57c3f8214c 
								
							 
						 
						
							
							
								
								update pleroma frontend (summary_html hotfix)  
							
							 
							
							
							
						 
						
							2019-01-25 10:17:00 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								4df71cd88b 
								
							 
						 
						
							
							
								
								Merge branch 'classic-flakeids' into 'develop'  
							
							 
							
							... 
							
							
							
							Flake Ids for Users and Activities
Closes  #450 
See merge request pleroma/pleroma!645  
							
						 
						
							2019-01-25 04:59:06 +00:00