lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7e4932362b 
								
							 
						 
						
							
							
								
								SideEffects: Handle strange deletion case.  
							
							
							
						 
						
							2020-08-11 10:54:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								345ac512e4 
								
							 
						 
						
							
							
								
								added paginate+search for admin/MediaProxy URLs  
							
							
							
						 
						
							2020-08-11 10:30:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								78484fe0ef 
								
							 
						 
						
							
							
								
								Merge branch 'admin-active-filter' into 'develop'  
							
							... 
							
							
							
							Admin API: Filter out unapproved users when the `active` filter is on
Closes  #2037 
See merge request pleroma/pleroma!2872  
							
						 
						
							2020-08-10 17:16:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								024b7ce0b7 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/activity-expirations-again  
							
							
							
						 
						
							2020-08-10 11:32:24 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								249f21dcbb 
								
							 
						 
						
							
							
								
								Admin API: Filter out unapproved users when the active filter is on  
							
							
							
						 
						
							2020-08-10 18:27:39 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								93fbf39954 
								
							 
						 
						
							
							
								
								Merge branch 'revert-a6d3bb5f' into 'develop'  
							
							... 
							
							
							
							Revert "Merge branch 'issue/1023' into 'develop'"
Closes  #2033 
See merge request pleroma/pleroma!2868  
							
						 
						
							2020-08-10 13:59:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								353f3466d6 
								
							 
						 
						
							
							
								
								Merge branch 'remove-unreachable-code' into 'develop'  
							
							... 
							
							
							
							Transmogrifier: Remove duplicate code.
See merge request pleroma/pleroma!2871  
							
						 
						
							2020-08-10 13:47:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								73af60d02f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'develop'  
							
							... 
							
							
							
							docs: add cmake to other installation guides
Closes  #2039 
See merge request pleroma/pleroma!2870  
							
						 
						
							2020-08-10 13:47:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								517d42646a 
								
							 
						 
						
							
							
								
								Merge branch '2039-cmake' into 'develop'  
							
							... 
							
							
							
							Docs: Add cmake dependency
Closes  #2039 
See merge request pleroma/pleroma!2869  
							
						 
						
							2020-08-10 13:46:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								11fc90744c 
								
							 
						 
						
							
							
								
								Transmogrifier: Remove duplicate code.  
							
							
							
						 
						
							2020-08-10 15:31:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								a2f2ba3fbb 
								
							 
						 
						
							
							
								
								docs: add cmake to other installation guides  
							
							
							
						 
						
							2020-08-10 16:24:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4d76c0ec8b 
								
							 
						 
						
							
							
								
								Docs: Add cmake dependency  
							
							
							
						 
						
							2020-08-10 15:12:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5c4548d5e7 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'issue/1023' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2763  
							
						 
						
							2020-08-10 13:05:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								bd7bf6cd19 
								
							 
						 
						
							
							
								
								Apply 1 suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2020-08-10 11:29:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								a4a2d38640 
								
							 
						 
						
							
							
								
								Apply 1 suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2020-08-10 11:29:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								00a4980c61 
								
							 
						 
						
							
							
								
								Merge branch 'fix/flaky-migration-episode-666' into 'develop'  
							
							... 
							
							
							
							20200802170532_fix_legacy_tags: Select only fields the migration needs
See merge request pleroma/pleroma!2863  
							
						 
						
							2020-08-10 09:17:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								21dfcafeb1 
								
							 
						 
						
							
							
								
								Merge branch '2038-old-update-info' into 'develop'  
							
							... 
							
							
							
							AccountController: Build the correct update activity.
Closes  #2038 
See merge request pleroma/pleroma!2867  
							
						 
						
							2020-08-10 09:04:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								15fa3b6bd8 
								
							 
						 
						
							
							
								
								20200802170532_fix_legacy_tags: chunk the user query  
							
							
							
						 
						
							2020-08-10 11:56:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a818587467 
								
							 
						 
						
							
							
								
								20200802170532_fix_legacy_tags: Select only fields the migration needs  
							
							... 
							
							
							
							Selecting the full struct will break as soon as a new field is added. 
							
						 
						
							2020-08-10 11:55:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								66122a11b5 
								
							 
						 
						
							
							
								
								AccountController: Build the correct update activity.  
							
							... 
							
							
							
							Will fix federation issues. 
							
						 
						
							2020-08-10 10:33:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0149dd0146 
								
							 
						 
						
							
							
								
								Merge branch 'feat/floki-fast-html-2' into 'develop'  
							
							... 
							
							
							
							Update to fast_html 2 and use it for Floki parsing
See merge request pleroma/pleroma!2861  
							
						 
						
							2020-08-09 11:18:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7625e50950 
								
							 
						 
						
							
							
								
								Merge branch 'security-policy' into 'develop'  
							
							... 
							
							
							
							Add security policy for Pleroma backend
Closes  #1848 
See merge request pleroma/pleroma!2862  
							
						 
						
							2020-08-09 11:06:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d0fc48ea67 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'feat/floki-fast-html-2'  
							
							... 
							
							
							
							# Conflicts:
#   config/config.exs 
							
						 
						
							2020-08-09 10:53:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e08ea01d09 
								
							 
						 
						
							
							
								
								Limit expirations for each cron execution to 50.  
							
							... 
							
							
							
							This should prevent servers from being crushed. 50/min is a pretty good rate. 
							
						 
						
							2020-08-08 12:49:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								761cc5b4a2 
								
							 
						 
						
							
							
								
								Don't filter on local  
							
							
							
						 
						
							2020-08-08 12:44:18 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								cf4c97242b 
								
							 
						 
						
							
							
								
								Ensure we only expire Create activities with the Mix task  
							
							
							
						 
						
							2020-08-08 12:40:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2e7c5fe2de 
								
							 
						 
						
							
							
								
								Add migration to remove invalid activity expirations  
							
							
							
						 
						
							2020-08-08 12:33:37 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ad29a4f2cf 
								
							 
						 
						
							
							
								
								Merge branch 'ensure-expiration-mix-task' into 'develop'  
							
							... 
							
							
							
							Add mix task to add expiration to all local statuses
Closes  #2020 
See merge request pleroma/pleroma!2865  
							
						 
						
							2020-08-08 15:16:55 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e5557bf8ba 
								
							 
						 
						
							
							
								
								Add mix task to add expiration to all local statuses  
							
							
							
						 
						
							2020-08-08 16:29:40 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								e0dee833f2 
								
							 
						 
						
							
							
								
								Improve static_dir documentation  
							
							... 
							
							
							
							* It was still written for From Source installs. Now it's both OTP and From Source
* I linked to the cheatsheet where it was about configuration
* I moved the mix tasks of the robot.txt section to the CLI tasks and linked to it
    * i checked the code at https://git.pleroma.social/pleroma/pleroma/-/blob/develop/lib/mix/tasks/pleroma/robotstxt.ex  and it doesn't seem to more than just this one command with this option
* I also added the location of robot.txt and an example to dissallow everything, but allow the fediverse.network crawlers
* The Thumbnail section still linked to distsn.org which doesn't exist any more. I changed it to a general statemant that it can be used by external applications. (I don't know any that actually use it.)
* Both the logo and TOS need an extra `static` folder. I've seen confusion about that in #pleroma so I added an Important note. 
							
						 
						
							2020-08-08 12:21:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								47698fc322 
								
							 
						 
						
							
							
								
								Merge branch 'fix/ldap-auth-issues' into 'develop'  
							
							... 
							
							
							
							Fix LDAP auth issues
Closes  #1646 
See merge request pleroma/pleroma!2852  
							
						 
						
							2020-08-07 20:59:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								54e2af8293 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/ldap-auth-issues  
							
							
							
						 
						
							2020-08-07 14:55:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								474147a67a 
								
							 
						 
						
							
							
								
								Make a new function instead of overloading register_changeset/3  
							
							
							
						 
						
							2020-08-07 14:54:14 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								881fdb3a97 
								
							 
						 
						
							
							
								
								Add security policy for Pleroma backend  
							
							... 
							
							
							
							Closes  #1848  
						
							2020-08-07 21:27:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Angelina Filippova 
								
							 
						 
						
							
							
							
							
								
							
							
								f21b6ebd5d 
								
							 
						 
						
							
							
								
								Merge branch 'feature/update-welcome-setting-in-description' of git.pleroma.social:pleroma/pleroma into feature/update-welcome-setting-in-description  
							
							
							
						 
						
							2020-08-07 21:05:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Angelina Filippova 
								
							 
						 
						
							
							
							
							
								
							
							
								8e1f7a3eff 
								
							 
						 
						
							
							
								
								Add new image type to settings whose values are image urls  
							
							
							
						 
						
							2020-08-07 21:04:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								673e8e3ac1 
								
							 
						 
						
							
							
								
								Force 204 responses to be empty,  fixes   #2029  
							
							
							
						 
						
							2020-08-07 13:02:39 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								39ca4a23c6 
								
							 
						 
						
							
							
								
								Merge branch 'authenticator-docs' into 'develop'  
							
							... 
							
							
							
							Docs: Remove wrong / confusing auth docs.
Closes  #2028 
See merge request pleroma/pleroma!2860  
							
						 
						
							2020-08-07 17:51:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								60fe0a08f0 
								
							 
						 
						
							
							
								
								Docs: Remove wrong / confusing auth docs.  
							
							
							
						 
						
							2020-08-07 17:59:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								cb376c4c4c 
								
							 
						 
						
							
							
								
								CI: install cmake since fast_html now requires it  
							
							
							
						 
						
							2020-08-07 18:06:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								199ad47c22 
								
							 
						 
						
							
							
								
								Docs: Add OTP commands to frontend docs.  
							
							
							
						 
						
							2020-08-07 17:04:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9cebdf30a4 
								
							 
						 
						
							
							
								
								Merge branch 'spoopy-user' into 'develop'  
							
							... 
							
							
							
							restricted_nicknames: Add names from MastoAPI endpoints
See merge request pleroma/pleroma!2857  
							
						 
						
							2020-08-07 14:51:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6ddea8ebe8 
								
							 
						 
						
							
							
								
								Add a note about the proper value for uid  
							
							
							
						 
						
							2020-08-07 09:42:10 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								568ded5aa4 
								
							 
						 
						
							
							
								
								Merge branch 'object-age-changelog' into 'develop'  
							
							... 
							
							
							
							Changelog: Add information about the object age policy
See merge request pleroma/pleroma!2859  
							
						 
						
							2020-08-07 14:21:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ebb30128af 
								
							 
						 
						
							
							
								
								Changelog: Add information about the object age policy  
							
							
							
						 
						
							2020-08-07 16:20:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								50d5bdfd31 
								
							 
						 
						
							
							
								
								Mix Task Frontend test: Expand.  
							
							
							
						 
						
							2020-08-07 16:03:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c662b09eee 
								
							 
						 
						
							
							
								
								mix.exs: update fast_sanitize to 0.2.0  
							
							
							
						 
						
							2020-08-07 16:45:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								7e23a48d38 
								
							 
						 
						
							
							
								
								rel me test: fix HTML so broken browsers (and therefore  
							
							... 
							
							
							
							lexbor) refuse to parse it like mochiweb does 
							
						 
						
							2020-08-07 16:45:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								325c7c924b 
								
							 
						 
						
							
							
								
								Make Floki use fast_html  
							
							
							
						 
						
							2020-08-07 16:45:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								de00a4c0f1 
								
							 
						 
						
							
							
								
								Mix Task Frontend Test: Capture IO.  
							
							
							
						 
						
							2020-08-07 15:27:41 +02:00