rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								8194622a72
								
							
						 | 
						
							
							
								
								Merge branch 'feature/object-hashtags-rework' into 'develop'
							
							
							
							
							
							
							
							Hashtags extraction from objects. Background migration infrastructure.
Closes #1840 and #2455
See merge request pleroma/pleroma!3213 
							
						 | 
						
							2021-03-15 09:35:46 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ben Is
								
							 
						 | 
						
							
							
							
							
								
							
							
								2408363e2a
								
							
						 | 
						
							
							
								
								Translated using Weblate (Italian)
							
							
							
							
							
							
							
							Currently translated at 100.0% (106 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/it/ 
							
						 | 
						
							2021-03-13 09:40:56 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								92526e0230
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
							
							
							
							
							
						 | 
						
							2021-03-07 11:34:39 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b8cceba09
								
							
						 | 
						
							
							
								
								Fix migration in cases where database name has a hyphen
							
							
							
							
							
						 | 
						
							2021-03-02 18:17:32 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								882dd46843
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
							
							
							
							
							
						 | 
						
							2021-03-02 08:26:30 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								5058de328e
								
							
						 | 
						
							
							
								
								Update frontend
							
							
							
							
							
						 | 
						
							2021-03-01 20:04:53 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e6a14e1cd1
								
							
						 | 
						
							
							
								
								Merge branch 'feat/client_app_details' into 'develop'
							
							
							
							
							
							
							
							Support application field
See merge request pleroma/pleroma!3311 
							
						 | 
						
							2021-02-28 16:17:34 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								0faf8dbef8
								
							
						 | 
						
							
							
								
								Simplify migration
							
							
							
							
							
						 | 
						
							2021-02-28 09:22:44 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								8f88a90ca3
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/config.ex 
							
						 | 
						
							2021-02-23 13:58:35 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								6531eddf36
								
							
						 | 
						
							
							
								
								[#3213] hashtags: altered name type to text. hashtags_objects: removed unused index. HashtagsTableMigrator: records_per_second calculation fix. ActivityPub: hashtags-related options normalization.
							
							
							
							
							
						 | 
						
							2021-02-22 23:26:07 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								83301fe61a
								
							
						 | 
						
							
							
								
								Add field to user schema for controlling disclosure of client details
							
							
							
							
							
						 | 
						
							2021-02-18 16:43:41 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Shpuld Shpuldson
								
							 
						 | 
						
							
							
							
							
								
							
							
								956bbc1ec7
								
							
						 | 
						
							
							
								
								replace avi.png
							
							
							
							
							
						 | 
						
							2021-02-15 15:44:27 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5992382cf8
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
							
							
							
							
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/mix/tasks/pleroma/database.ex
#	lib/pleroma/web/templates/feed/feed/_activity.rss.eex 
							
						 | 
						
							2021-02-11 19:31:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								d1c6dd97aa
								
							
						 | 
						
							
							
								
								[#3213] Partially addressed code review points.
							
							
							
							
							
							
							
							migration rollback task changes, hashtags-related config handling tweaks, `hashtags.data` deletion (unused). 
							
						 | 
						
							2021-02-07 22:24:12 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								6e68058b63
								
							
						 | 
						
							
							
								
								Merge branch 'feat/allow_alt_text_search_config' into 'develop'
							
							
							
							
							
							
							
							allow user defined text search config in database
See merge request pleroma/pleroma!3275 
							
						 | 
						
							2021-02-06 09:42:20 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									hyperion
								
							 
						 | 
						
							
							
							
							
								
							
							
								8d4e0342e1
								
							
						 | 
						
							
							
								
								Update priv/repo/migrations/20190501125843_add_fts_index_to_objects.exs, priv/repo/optional_migrations/rum_indexing/20190510135645_add_fts_index_to_objects_two.exs files
							
							
							
							
							
						 | 
						
							2021-02-06 09:42:17 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4e14945670
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
							
							
							
							
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/activity_pub/activity_pub.ex 
							
						 | 
						
							2021-02-03 09:31:38 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								6a2d3fb9a3
								
							
						 | 
						
							
							
								
								Merge branch 'fix/2473-purge-expired-activities-duplicates' into 'develop'
							
							
							
							
							
							
							
							fix and delete purge activities duplicates
Closes #2473
See merge request pleroma/pleroma!3285 
							
						 | 
						
							2021-02-02 17:22:23 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								69c560cfba
								
							
						 | 
						
							
							
								
								Merge branch 'active-user-count' into 'develop'
							
							
							
							
							
							
							
							Monthly Active Users
Closes #2332
See merge request pleroma/pleroma!3283 
							
						 | 
						
							2021-02-02 17:07:57 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lain Soykaf
								
							 
						 | 
						
							
							
							
							
								
							
							
								93e3b89350
								
							
						 | 
						
							
							
								
								Update frontend
							
							
							
							
							
						 | 
						
							2021-02-01 10:12:05 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								108e90b18e
								
							
						 | 
						
							
							
								
								[#3213] Explicitly defined PKs in hashtags_objects and data_migration_failed_ids. Added "pleroma.database rollback" task to revert a single migration.
							
							
							
							
							
						 | 
						
							2021-01-31 22:03:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6c987c7670
								
							
						 | 
						
							
							
								
								fix and delete purge activities duplicates
							
							
							
							
							
						 | 
						
							2021-01-28 16:57:41 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								793fc77b16
								
							
						 | 
						
							
							
								
								Add active user count
							
							
							
							
							
						 | 
						
							2021-01-27 18:20:06 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								694d98be55
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
							
							
							
							
							
						 | 
						
							2021-01-25 21:24:07 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								c3dd06b540
								
							
						 | 
						
							
							
								
								Update PleromaFE: pleroma-fe@eb2975b64d849af6bdc327dabac34b8e6d952eae
							
							
							
							
							
						 | 
						
							2021-01-25 09:50:26 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e3fcb4b29
								
							
						 | 
						
							
							
								
								Update AdminFE: admin-fe@8a390584676b27b611d3363eca2a1194d94ed71f
							
							
							
							
							
						 | 
						
							2021-01-25 09:45:58 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								537ba1c5e0
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field
							
							
							
							
							
						 | 
						
							2021-01-25 09:45:06 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2634a16b4c
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
							
							
							
							
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 | 
						
							2021-01-21 20:20:35 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								2926713fe5
								
							
						 | 
						
							
							
								
								Merge branch 'deprecate-public_endpoint' into 'develop'
							
							
							
							
							
							
							
							Deprecate Uploaders.S3, :public_endpoint
See merge request pleroma/pleroma!3251 
							
						 | 
						
							2021-01-20 22:48:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								2905df841b
								
							
						 | 
						
							
							
								
								Merge branch 'update/oban' into 'develop'
							
							
							
							
							
							
							
							Update Oban to 2.3.4
See merge request pleroma/pleroma!3256 
							
						 | 
						
							2021-01-20 20:32:23 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								87c468f009
								
							
						 | 
						
							
							
								
								use correct versions for oban migrations
							
							
							
							
							
						 | 
						
							2021-01-20 20:07:24 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									João Rodrigues
								
							 
						 | 
						
							
							
							
							
								
							
							
								8d1554f08b
								
							
						 | 
						
							
							
								
								Translated using Weblate (Portuguese (Portugal))
							
							
							
							
							
							
							
							Currently translated at 100.0% (106 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pt_PT/ 
							
						 | 
						
							2021-01-18 21:19:25 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									João Rodrigues
								
							 
						 | 
						
							
							
							
							
								
							
							
								ca114df523
								
							
						 | 
						
							
							
								
								Added translation using Weblate (Portuguese (Portugal))
							
							
							
							
							
						 | 
						
							2021-01-18 21:19:25 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								28581e03ad
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field
							
							
							
							
							
						 | 
						
							2021-01-18 14:58:21 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								d49387e9d2
								
							
						 | 
						
							
							
								
								Update AdminFE: admin-fe@27db721e3969d9d017a70b9e16dc262d4f31202f
							
							
							
							
							
						 | 
						
							2021-01-18 13:44:59 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								44a86951a3
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into refactor/approval_pending_user_field
							
							
							
							
							
						 | 
						
							2021-01-18 12:05:05 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								8a230667cc
								
							
						 | 
						
							
							
								
								Update AdminFE: pleroma/admin-fe@d4c7989f05
							
							
							
							
							
						 | 
						
							2021-01-18 11:25:13 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0e48c80d7f
								
							
						 | 
						
							
							
								
								start oban app in migrations and mix tasks
							
							
							
							
							
						 | 
						
							2021-01-17 09:58:41 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								02dbf1c51d
								
							
						 | 
						
							
							
								
								use explicitly oban migration version
							
							
							
							
							
						 | 
						
							2021-01-17 09:58:07 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								d2382ab5f4
								
							
						 | 
						
							
							
								
								Update Oban to 2.3.4
							
							
							
							
							
						 | 
						
							2021-01-15 15:01:48 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								2c0fe2ea9e
								
							
						 | 
						
							
							
								
								Remove toggle_confirmation; require explicit state change
							
							
							
							
							
							
							
							Also cosmetic changes to make the code clearer 
							
						 | 
						
							2021-01-15 13:11:51 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								d36182c088
								
							
						 | 
						
							
							
								
								Change user.confirmation_pending field to user.is_confirmed
							
							
							
							
							
						 | 
						
							2021-01-15 12:44:41 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								a59e32f1dd
								
							
						 | 
						
							
							
								
								Add copyright header
							
							
							
							
							
						 | 
						
							2021-01-15 11:24:46 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								860b5c7804
								
							
						 | 
						
							
							
								
								Change user.deactivated field to user.is_active
							
							
							
							
							
						 | 
						
							2021-01-15 11:24:46 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								f7e59c28ed
								
							
						 | 
						
							
							
								
								Change user.approval_pending field to user.is_approved
							
							
							
							
							
						 | 
						
							2021-01-15 10:42:02 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								12c8ce481c
								
							
						 | 
						
							
							
								
								Bump Copyright year
							
							
							
							
							
						 | 
						
							2021-01-14 13:58:52 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								fb47e83adc
								
							
						 | 
						
							
							
								
								Add ConfigDB migration
							
							
							
							
							
						 | 
						
							2021-01-14 13:53:55 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f5f267fa76
								
							
						 | 
						
							
							
								
								[#3213] Refactoring of HashtagsTableMigrator.
							
							
							
							
							
						 | 
						
							2021-01-14 22:41:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e350898828
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
							
							
							
							
							
						 | 
						
							2021-01-13 22:11:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3e4d84729a
								
							
						 | 
						
							
							
								
								[#3213] Prototype of data migrations functionality / HashtagsTableMigrator.
							
							
							
							
							
						 | 
						
							2021-01-13 22:07:38 +03:00 | 
						
						
							
							
							
								
							
							
						 |