lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1dd71026a1 
								
							 
						 
						
							
							
								
								Add 'about' to restricted list.  
							
							... 
							
							
							
							And correct pleromaFE config. 
							
						 
						
							2018-12-26 14:51:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8da2c45c27 
								
							 
						 
						
							
							
								
								Add ~ to the list of restricted names.  
							
							
							
						 
						
							2018-12-26 14:16:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								91724d160a 
								
							 
						 
						
							
							
								
								Reserve a few user names  
							
							... 
							
							
							
							These are all names that are used for domain.com/:route routes or projected to be. 
							
						 
						
							2018-12-25 20:10:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								c76179419d 
								
							 
						 
						
							
							
								
								Renamed the things  
							
							
							
						 
						
							2018-12-23 11:14:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								409ff60bf8 
								
							 
						 
						
							
							
								
								Fix formatting  
							
							
							
						 
						
							2018-12-22 23:32:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								92362e1e22 
								
							 
						 
						
							
							
								
								Implement large thread filter  
							
							
							
						 
						
							2018-12-22 23:18:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								fda148a9a2 
								
							 
						 
						
							
							
								
								Merge branch 'documentation/copy-pleroma-api' into 'develop'  
							
							... 
							
							
							
							Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints
See merge request pleroma/pleroma!571  
							
						 
						
							2018-12-20 04:01:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f3eb414e28 
								
							 
						 
						
							
							
								
								Add a way to use the admin api without a user.  
							
							
							
						 
						
							2018-12-18 21:08:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6adea5a7b2 
								
							 
						 
						
							
							
								
								Move to docs  
							
							
							
						 
						
							2018-12-18 17:16:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								443d59baa0 
								
							 
						 
						
							
							
								
								Merge branch 'feature/new-user-routes' into 'develop'  
							
							... 
							
							
							
							Use "~" as a route namespace symbol on FE
See merge request pleroma/pleroma!530  
							
						 
						
							2018-12-18 15:42:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b1860fe85a 
								
							 
						 
						
							
							
								
								Instance/Static runtime plug  
							
							... 
							
							
							
							This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.
If the files are not present in the directory, the bundled ones in
priv/static will be used. 
							
						 
						
							2018-12-17 22:50:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								52ac7dce5c 
								
							 
						 
						
							
							
								
								Merge branch 'captcha' into 'develop'  
							
							... 
							
							
							
							Captcha
See merge request pleroma/pleroma!550  
							
						 
						
							2018-12-17 19:45:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b12a904911 
								
							 
						 
						
							
							
								
								Integration tests for mastodon websocket  
							
							
							
						 
						
							2018-12-17 17:09:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								77b5154c82 
								
							 
						 
						
							
							
								
								Cowboy handler for Mastodon WebSocket  
							
							
							
						 
						
							2018-12-17 17:06:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								6e2f64a0a6 
								
							 
						 
						
							
							
								
								minutes->seconds_retained in config.md  
							
							
							
						 
						
							2018-12-17 06:41:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								3a31fdaf06 
								
							 
						 
						
							
							
								
								Change minutes_retained config to seconds_retained  
							
							
							
						 
						
							2018-12-16 22:40:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								1d31fd0722 
								
							 
						 
						
							
							
								
								Make the hosted kocaptcha the default value  
							
							
							
						 
						
							2018-12-16 22:37:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								6062885df6 
								
							 
						 
						
							
							
								
								Add a configurable auto-cleanup for captchas  
							
							
							
						 
						
							2018-12-16 22:08:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								7c522f38f0 
								
							 
						 
						
							
							
								
								Enable unsecure cookies by default in dev.exs  
							
							
							
						 
						
							2018-12-16 08:49:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								c859cd1d61 
								
							 
						 
						
							
							
								
								Fix style  
							
							
							
						 
						
							2018-12-15 23:39:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								e8537208bd 
								
							 
						 
						
							
							
								
								Add a captcha mock for tests  
							
							
							
						 
						
							2018-12-15 22:38:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								98e10c0d4f 
								
							 
						 
						
							
							
								
								Add captcha documentation to config.md  
							
							
							
						 
						
							2018-12-15 22:12:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								23549d3952 
								
							 
						 
						
							
							
								
								Formatting fixes  
							
							
							
						 
						
							2018-12-15 22:08:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ff7ce9a9fb 
								
							 
						 
						
							
							
								
								config/config.exs: Add application/jrd+json => jrd+json to fix webfinger  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/551  
							
						 
						
							2018-12-15 15:58:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								28c43a417e 
								
							 
						 
						
							
							
								
								Add an ability to disabled captcha  
							
							
							
						 
						
							2018-12-15 03:12:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								a2399c1c7c 
								
							 
						 
						
							
							
								
								Add base CAPTCHA support (currently only kocaptcha)  
							
							
							
						 
						
							2018-12-15 03:12:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
							
							
								
							
							
								bfe27c1b55 
								
							 
						 
						
							
							
								
								Merge branch '114_email_invites' into 'develop'  
							
							... 
							
							
							
							[#114 ] Email invites
See merge request pleroma/pleroma!541  
							
						 
						
							2018-12-14 20:22:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								ef10e08efe 
								
							 
						 
						
							
							
								
								Update config.md  
							
							
							
						 
						
							2018-12-14 15:06:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3b65f31606 
								
							 
						 
						
							
							
								
								Update config.md  
							
							
							
						 
						
							2018-12-14 13:05:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								658edb166f 
								
							 
						 
						
							
							
								
								fix and improve web push; add configuration docs  
							
							
							
						 
						
							2018-12-14 13:05:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9666376f5f 
								
							 
						 
						
							
							
								
								[ #114 ] Readded invites_enabled config setting, updated readme.  
							
							
							
						 
						
							2018-12-14 12:37:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
							
							
								
							
							
								30dc81667c 
								
							 
						 
						
							
							
								
								Merge branch '114_user_registration_emails' into 'develop'  
							
							... 
							
							
							
							[#114 ] User registration emails
Closes  #114 
See merge request pleroma/pleroma!531  
							
						 
						
							2018-12-14 09:16:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f81213910f 
								
							 
						 
						
							
							
								
								[ #114 ] Addressed MR comments. Removed functionality to be extracted to other MRs.  
							
							
							
						 
						
							2018-12-14 12:09:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7214d57463 
								
							 
						 
						
							
							
								
								Extended nicknames: allow dashes.  
							
							
							
						 
						
							2018-12-12 21:48:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7d9ddbe689 
								
							 
						 
						
							
							
								
								Allow underscores in usernames.  
							
							... 
							
							
							
							Fixes  #429 . 
						
							2018-12-12 18:57:33 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								4e7d98922e 
								
							 
						 
						
							
							
								
								[ #114 ] Added tests for "POST /api/account/password_reset".  
							
							
							
						 
						
							2018-12-12 17:04:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								12905ce1ad 
								
							 
						 
						
							
							
								
								[ #114 ] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.  
							
							
							
						 
						
							2018-12-12 17:02:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								10c156d98f 
								
							 
						 
						
							
							
								
								[ #114 ] SMTP deps and config.  
							
							
							
						 
						
							2018-12-12 17:01:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								e1cbb18327 
								
							 
						 
						
							
							
								
								Document the new frontend options.  
							
							
							
						 
						
							2018-12-10 23:23:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								213176c3c3 
								
							 
						 
						
							
							
								
								Add new frontend options to server-side config.  
							
							
							
						 
						
							2018-12-10 23:15:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								729321ad20 
								
							 
						 
						
							
							
								
								Merge branch 'fix/config-md-typos' into 'develop'  
							
							... 
							
							
							
							config.md: Fix typos and add  `federating` option description
See merge request pleroma/pleroma!525  
							
						 
						
							2018-12-10 19:06:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								09c13d0929 
								
							 
						 
						
							
							
								
								Use "~" as a route namespace symbol on FE  
							
							
							
						 
						
							2018-12-10 01:22:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								100a06afe1 
								
							 
						 
						
							
							
								
								config.md: Fix typos and add  option description  
							
							
							
						 
						
							2018-12-09 11:09:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f079ca7181 
								
							 
						 
						
							
							
								
								Remove french.  
							
							
							
						 
						
							2018-12-08 11:09:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3b27f61ffa 
								
							 
						 
						
							
							
								
								AnonymizeFilename: allow for a pre-defined text instead of random string  
							
							... 
							
							
							
							Improve docs 
							
						 
						
							2018-12-07 14:07:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								b0adea30b3 
								
							 
						 
						
							
							
								
								Merge branch 're-mrf' into 'develop'  
							
							... 
							
							
							
							Add a MRF Policy for appending re: to identical subjects in replies.
See merge request pleroma/pleroma!499  
							
						 
						
							2018-12-06 15:36:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								0020b22688 
								
							 
						 
						
							
							
								
								add VAPID to test config  
							
							
							
						 
						
							2018-12-06 20:17:00 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								8a1df182cf 
								
							 
						 
						
							
							
								
								Add a MRF Policy for appending re: to identical subjects in replies.  
							
							
							
						 
						
							2018-12-04 23:35:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								ec34de0c1f 
								
							 
						 
						
							
							
								
								WebSub fix test  
							
							
							
						 
						
							2018-12-04 14:03:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								3ce16e5a56 
								
							 
						 
						
							
							
								
								init tesla and updated the http requests in Pleroma.Web.Websub  
							
							
							
						 
						
							2018-12-04 14:03:32 +03:00