Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e1b89fe3aa 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into live-dashboard  
							
							
							
						 
						
							2021-12-15 19:05:36 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								29d80b39f2 
								
							 
						 
						
							
							
								
								Add Phoenix LiveDashboard  
							
							... 
							
							
							
							Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com> 
							
						 
						
							2021-12-15 19:05:27 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a17910a6c6 
								
							 
						 
						
							
							
								
								CI: Bump lint stage to elixir-1.12  
							
							... 
							
							
							
							Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format` 
							
						 
						
							2021-10-06 08:11:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									someone 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cc4f20b130 
								
							 
						 
						
							
							
								
								mix pleroma.database set_text_search_config now runs concurrently and infinitely  
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3514  
							
						 
						
							2021-08-28 18:29:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									someone 
								
							 
						 
						
							
							
							
							
								
							
							
								4b940e441a 
								
							 
						 
						
							
							
								
								mix pleroma.database set_text_search_config now runs concurrently and infinitely  
							
							
							
						 
						
							2021-08-15 13:49:12 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								bc51dea425 
								
							 
						 
						
							
							
								
								Update lib/mix/tasks/pleroma/database.ex  
							
							
							
						 
						
							2021-06-07 20:02:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									faried nawaz 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5be9d13981 
								
							 
						 
						
							
							
								
								a better query to delete from hashtags  
							
							... 
							
							
							
							old query:
Delete on hashtags  (cost=5089.81..5521.63 rows=6160 width=18)
   ->  Hash Semi Join  (cost=5089.81..5521.63 rows=6160 width=18)
         Hash Cond: (hashtags.id = ht.id)
         ->  Seq Scan on hashtags  (cost=0.00..317.28 rows=17528 width=14)
         ->  Hash  (cost=5012.81..5012.81 rows=6160 width=20)
               ->  Merge Anti Join  (cost=0.70..5012.81 rows=6160 width=20)
                     Merge Cond: (ht.id = hto.hashtag_id)
                     ->  Index Scan using hashtags_pkey on hashtags ht  (cost=0.29..610.53 rows=17528 width=14)
                     ->  Index Scan using hashtags_objects_pkey on hashtags_objects hto  (cost=0.42..3506.48 rows=68158 width=14)
new query:
Delete on hashtags ht  (cost=0.70..5012.81 rows=6160 width=12)
   ->  Merge Anti Join  (cost=0.70..5012.81 rows=6160 width=12)
         Merge Cond: (ht.id = hto.hashtag_id)
         ->  Index Scan using hashtags_pkey on hashtags ht  (cost=0.29..610.53 rows=17528 width=14)
         ->  Index Scan using hashtags_objects_pkey on hashtags_objects hto  (cost=0.42..3506.48 rows=68158 width=14) 
							
						 
						
							2021-05-08 02:00:43 +05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									faried nawaz 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a0c9a2b4cc 
								
							 
						 
						
							
							
								
								mix prune_objects: remove unused hashtags after pruning remote objects  
							
							
							
						 
						
							2021-05-08 02:00:42 +05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4cd34d0197 
								
							 
						 
						
							
							
								
								suggestion  
							
							
							
						 
						
							2021-03-23 17:27:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								03843a5386 
								
							 
						 
						
							
							
								
								migrating config to tmp folder  
							
							
							
						 
						
							2021-03-23 14:29:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								882dd46843 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							
							
						 
						
							2021-03-02 08:26:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								2217b35bd4 
								
							 
						 
						
							
							
								
								Merge branch 'ecto-rollback-in-test-env' into 'develop'  
							
							... 
							
							
							
							Possibility to run rollback in test env
See merge request pleroma/pleroma!3212  
							
						 
						
							2021-02-26 16:47:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								40d4362261 
								
							 
						 
						
							
							
								
								[ #3213 ] mix pleroma.database rollback tweaks.  
							
							
							
						 
						
							2021-02-23 18:11:25 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f13f5d9303 
								
							 
						 
						
							
							
								
								OpenAPI spec task: Load pleroma application to get version info  
							
							... 
							
							
							
							For whatever reason it seems to pick up the version without loading the
app on my machine, but not on the CI. 
							
						 
						
							2021-02-09 22:10:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								593c0851d9 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'new-user-emails'  
							
							
							
						 
						
							2021-02-08 16:01:50 -06: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								af37a5c51a 
								
							 
						 
						
							
							
								
								Also make this maybe_ for consistency  
							
							
							
						 
						
							2021-02-04 14:33:49 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e2d7c4fd57 
								
							 
						 
						
							
							
								
								Merge branch 'feat/openapi-spec-export' into 'develop'  
							
							... 
							
							
							
							Improve OpenAPI spec and deploy it to api.pleroma.social
See merge request pleroma/pleroma!3296  
							
						 
						
							2021-02-03 13:21:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9fcff7851f 
								
							 
						 
						
							
							
								
								Improve OpenAPI spec and deploy it to api.pleroma.social  
							
							... 
							
							
							
							Too many changes in OpenAPI spec to describe each one, but
basically it is tag fixes, bringing consitency to operation summaries
and fixing some incorrect information. 
							
						 
						
							2021-02-03 16:07:44 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								aaceb042c5 
								
							 
						 
						
							
							
								
								fix format  
							
							
							
						 
						
							2021-01-28 10:20:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								1547a2fda4 
								
							 
						 
						
							
							
								
								mix: instance: ensure all needed folders are created before generating config  
							
							
							
						 
						
							2021-01-28 09:39:53 +00: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 
								
							 
						 
						
							
							
							
							
								
							
							
								f868dcf3ac 
								
							 
						 
						
							
							
								
								Ensure consistent behavior between pleroma.user activate/deactivate mix tasks  
							
							
							
						 
						
							2021-01-25 10:48:28 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								5e8da27e14 
								
							 
						 
						
							
							
								
								Provide pleroma.user mix task for both activate and deactivate  
							
							
							
						 
						
							2021-01-25 10:36:51 -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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								28581e03ad 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field  
							
							
							
						 
						
							2021-01-18 14:58:21 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0e48c80d7f 
								
							 
						 
						
							
							
								
								start oban app in migrations and mix tasks  
							
							
							
						 
						
							2021-01-17 09:58:41 +03: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 
								
							 
						 
						
							
							
							
							
								
							
							
								ebd7d1365b 
								
							 
						 
						
							
							
								
								Make setting user activation status explicit  
							
							
							
						 
						
							2021-01-15 11:37:17 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								7516660753 
								
							 
						 
						
							
							
								
								Remove toggle_activation  
							
							
							
						 
						
							2021-01-15 11:25:32 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								860b5c7804 
								
							 
						 
						
							
							
								
								Change user.deactivated field to user.is_active  
							
							
							
						 
						
							2021-01-15 11:24:46 -06: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								8c972de045 
								
							 
						 
						
							
							
								
								[ #3213 ] transfer_hashtags mix task refactoring.  
							
							
							
						 
						
							2021-01-10 11:44:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								0d521022fe 
								
							 
						 
						
							
							
								
								[ #3213 ] Removed PK from hashtags_objects table. Improved hashtags_transfer mix task (logging of failed ids).  
							
							
							
						 
						
							2021-01-07 12:20:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								367f0c31c3 
								
							 
						 
						
							
							
								
								[ #3213 ] Added query options support for Repo.chunk_stream/4.  
							
							... 
							
							
							
							Used infinite timeout in transfer_hashtags select query. 
							
						 
						
							2020-12-31 09:36:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a25c1e8ec0 
								
							 
						 
						
							
							
								
								[ #3213 ] Improved database.transfer_hashtags mix task: proper rollback, speedup.  
							
							
							
						 
						
							2020-12-30 14:35:19 +03: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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d0c2479710 
								
							 
						 
						
							
							
								
								pleroma.database fill_old_hashtags: Add month_limit argument  
							
							
							
						 
						
							2020-12-28 11:05:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								cbb19d0e18 
								
							 
						 
						
							
							
								
								[ #3213 ] Hashtag-filtering functions in ActivityPub. Mix task for migrating hashtags to hashtags table.  
							
							
							
						 
						
							2020-12-26 22:20:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								538af14d52 
								
							 
						 
						
							
							
								
								possibility to run rollback in test env  
							
							
							
						 
						
							2020-12-22 17:55:30 +03:00