Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b11dbbf403
								
							
						 | 
						
							
							
								
								UserController: fall back to frontend when user isn't found
							
							
							
							
							
						 | 
						
							2021-08-17 18:32:32 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f2134e605b
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
							
							
							
							
							
						 | 
						
							2021-05-31 16:49:46 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								51a9f97e87
								
							
						 | 
						
							
							
								
								Deprecate Pleroma.Web.base_url/0
							
							
							
							
							
							
							
							Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles. 
							
						 | 
						
							2021-05-31 16:48:03 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ad7d4ff8bc
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into alias-router-helpers
							
							
							
							
							
						 | 
						
							2021-05-19 12:49:00 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								07fed0fda2
								
							
						 | 
						
							
							
								
								Switch to aliasing Router.Helpers instead of importing
							
							
							
							
							
						 | 
						
							2021-05-18 17:45:30 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e350898828
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
							
							
							
							
							
						 | 
						
							2021-01-13 22:11:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c4439c630f
								
							
						 | 
						
							
							
								
								Bump Copyright to 2021
							
							
							
							
							
							
							
							grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;' 
							
						 | 
						
							2021-01-13 07:49:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e1e7e4d379
								
							
						 | 
						
							
							
								
								Object: Rework how Object.normalize works
							
							
							
							
							
							
							
							Now it defaults to not fetching, and the option is named. 
							
						 | 
						
							2021-01-04 13:38:31 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								3966add048
								
							
						 | 
						
							
							
								
								Revert "Merge branch 'features/hashtag-column' into 'develop'"
							
							
							
							
							
							
							
							This reverts merge request !2824 
							
						 | 
						
							2020-12-28 12:02:16 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								18b536c176
								
							
						 | 
						
							
							
								
								Pleroma.Object/1: take %Object{} as argument instead
							
							
							
							
							
						 | 
						
							2020-12-28 11:05:24 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ee221277b0
								
							
						 | 
						
							
							
								
								Encapsulation of tags / hashtags fetching from objects.
							
							
							
							
							
						 | 
						
							2020-12-21 22:54:26 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								cebe3c7def
								
							
						 | 
						
							
							
								
								Fix for dropping posts/notifs in WS when mix task is executed
							
							
							
							
							
							
							
							- start oban in mix tasks with empty queues, plugins and crontab
- fix for update_users_following_followers_counts
- fix for removed logo.png
- typo in resend confirmation emails mix task docs
- fix for uploads mix task (start Majic.Pool)
- fix for creating user mix task (start :fast_html app) 
							
						 | 
						
							2020-12-14 11:02:32 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0c68b9ac13
								
							
						 | 
						
							
							
								
								escaping summary and other fields in xml templates
							
							
							
							
							
						 | 
						
							2020-11-10 10:46:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								d54233760f
								
							
						 | 
						
							
							
								
								[#3053] Post-merge fix.
							
							
							
							
							
						 | 
						
							2020-10-17 13:33:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								049ece1ef3
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/web/feed/user_controller.ex
#	lib/pleroma/web/o_status/o_status_controller.ex
#	lib/pleroma/web/router.ex
#	lib/pleroma/web/static_fe/static_fe_controller.ex 
							
						 | 
						
							2020-10-17 13:12:39 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9f4fe5485b
								
							
						 | 
						
							
							
								
								alias alphabetically order
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c6baa811d6
								
							
						 | 
						
							
							
								
								EnsureAuthenticatedPlug module name
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8249b75761
								
							
						 | 
						
							
							
								
								SetFormatPlug module name
							
							
							
							
							
						 | 
						
							2020-10-13 16:42:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0374df1d12
								
							
						 | 
						
							
							
								
								other files consistency
							
							
							
							
							
						 | 
						
							2020-10-13 16:38:19 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								094edde7c4
								
							
						 | 
						
							
							
								
								[#3053] Unauthenticated access control for OStatus-related controllers and ActivityPubController (base actions: :user, :object, :activity). Tests adjustments.
							
							
							
							
							
						 | 
						
							2020-10-05 23:48:00 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f6024252ae
								
							
						 | 
						
							
							
								
								[#3053] No auth check in StaticFEController, even on non-federating instances. Adjusted tests.
							
							
							
							
							
						 | 
						
							2020-10-02 22:18:02 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0d575735bf
								
							
						 | 
						
							
							
								
								No auth check in UserController.feed_redirect/2, even on non-federating instances.
							
							
							
							
							
						 | 
						
							2020-10-01 21:41:22 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								2011142ed9
								
							
						 | 
						
							
							
								
								Use :restrict_unauthenticated testing for more granular control
							
							
							
							
							
						 | 
						
							2020-09-08 20:21:34 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								a85ed6defb
								
							
						 | 
						
							
							
								
								Do not serve RSS/Atom feeds when instance is private
							
							
							
							
							
						 | 
						
							2020-09-08 20:21:34 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2e27847573
								
							
						 | 
						
							
							
								
								feed/user_controller: Return 404 when the user is remote
							
							
							
							
							
						 | 
						
							2020-07-29 14:02:02 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b02df1803e
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
							
							
							
							
							
						 | 
						
							2020-06-05 23:15:10 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								54bae06b4f
								
							
						 | 
						
							
							
								
								Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})
							
							
							
							
							
							
							
							Unifies all the similar functions to one and simplify some blocks with it. 
							
						 | 
						
							2020-06-05 14:48:02 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								317e2b8d61
								
							
						 | 
						
							
							
								
								Use atoms as keys in ActivityPub.fetch_* functions options
							
							
							
							
							
						 | 
						
							2020-06-04 21:36:26 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								d7a57004ef
								
							
						 | 
						
							
							
								
								[#1501] Made user feed contain public and unlisted activities.
							
							
							
							
							
						 | 
						
							2020-05-25 23:27:47 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2c4844237f
								
							
						 | 
						
							
							
								
								Refactoring of :if_func / :unless_func plug options (general availability). Added tests for Pleroma.Web.Plug.
							
							
							
							
							
						 | 
						
							2020-04-30 18:19:51 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4d330d9df1
								
							
						 | 
						
							
							
								
								fix for use of published from different entities
							
							
							
							
							
						 | 
						
							2020-04-16 18:05:36 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								89e4b3ebbd
								
							
						 | 
						
							
							
								
								fix for content-type header for tag feed
							
							
							
							
							
						 | 
						
							2020-03-16 12:59:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								91870c8995
								
							
						 | 
						
							
							
								
								adding rss for user feed
							
							
							
							
							
						 | 
						
							2020-03-16 12:45:31 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								26e2076659
								
							
						 | 
						
							
							
								
								fix for feed page pagination
							
							
							
							
							
						 | 
						
							2020-03-16 12:33:55 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5fc92deef3
								
							
						 | 
						
							
							
								
								[#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
							
							
							
							
							
						 | 
						
							2020-03-09 20:51:44 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6da6540036
								
							
						 | 
						
							
							
								
								Bump copyright years of files changed after 2020-01-07
							
							
							
							
							
							
							
							Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>' 
							
						 | 
						
							2020-03-02 06:08:45 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								d385789a45
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
							
							
							
							
							
						 | 
						
							2020-01-28 17:06:36 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								46915207b6
								
							
						 | 
						
							
							
								
								Remove whole_db parameter everywhere, it's not used anymore
							
							
							
							
							
						 | 
						
							2020-01-28 14:40:40 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e3fae3380e
								
							
						 | 
						
							
							
								
								Apply suggestion to lib/pleroma/web/feed/tag_controller.ex
							
							
							
							
							
						 | 
						
							2020-01-28 13:38:49 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								99c0a11c58
								
							
						 | 
						
							
							
								
								added atom feed
							
							
							
							
							
						 | 
						
							2020-01-24 22:12:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b53573a837
								
							
						 | 
						
							
							
								
								add tag feeds
							
							
							
							
							
						 | 
						
							2019-12-18 09:19:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								22fc271e23
								
							
						 | 
						
							
							
								
								init tag feed
							
							
							
							
							
						 | 
						
							2019-12-06 09:33:40 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9d0b989521
								
							
						 | 
						
							
							
								
								add subject to atom feed
							
							
							
							
							
						 | 
						
							2019-11-10 11:10:20 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b3f77a99f
								
							
						 | 
						
							
							
								
								Extract RSS Feed functionality from OStatus
							
							
							
							
							
						 | 
						
							2019-10-07 12:20:41 +00:00 | 
						
						
							
							
							
								
							
							
						 |