Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5a34dca8ed 
								
							 
						 
						
							
							
								
								Add emoji support in statuses in staticfe  
							
							
							
						 
						
							2020-03-23 14:03:31 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e87a32bcd7 
								
							 
						 
						
							
							
								
								rip out fetch_initial_posts  
							
							... 
							
							
							
							Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes  #1595  #1422  
							
						 
						
							2020-03-15 15:59:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2966377cb9 
								
							 
						 
						
							
							
								
								Update AdminFE  
							
							
							
						 
						
							2020-03-13 21:55:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a747eb6df9 
								
							 
						 
						
							
							
								
								static-fe.css: Restore from before  a65ee8ea 
							
							... 
							
							
							
							Related: https://git.pleroma.social/pleroma/pleroma/issues/1616  
							
						 
						
							2020-03-11 06:35:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e7c49d51d7 
								
							 
						 
						
							
							
								
								pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af  
							
							
							
						 
						
							2020-03-07 18:18:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6cf1958b02 
								
							 
						 
						
							
							
								
								moderation log: fix improperly migrated data  
							
							... 
							
							
							
							Some of the actions used to have a user map as a subject, which was then
changed to an array of user maps. However instead of migrating old data
there was just a hack to transform it every time, moreover this hack
didn't include all possible actions, which resulted in crashes. This
commit fixes the crashes by introducing a proper database migration for old data.
Closes  #1606  
							
						 
						
							2020-03-07 17:00:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e25bacabb1 
								
							 
						 
						
							
							
								
								Remove EmojiPacks from AdminFE build  
							
							... 
							
							
							
							Once more, with feeling 
							
						 
						
							2020-03-06 09:54:38 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a65ee8ead6 
								
							 
						 
						
							
							
								
								pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd  
							
							
							
						 
						
							2020-03-05 23:41:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2a850abbeb 
								
							 
						 
						
							
							
								
								MastoFE: Bundle 2020-01-20  
							
							
							
						 
						
							2020-02-29 06:41:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								bdd603e9f3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into update/pleroma-fe-20200228  
							
							
							
						 
						
							2020-02-28 16:18:09 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								c28de93912 
								
							 
						 
						
							
							
								
								Update PleromaFE bundle for the 2.0 release  
							
							
							
						 
						
							2020-02-28 16:15:12 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3d24a0917b 
								
							 
						 
						
							
							
								
								Update AdminFE build  
							
							... 
							
							
							
							- Removed Grouped Reports; API needs proper architecture/refactor
- Cannot set Tesla adapter in AdminFE as it's not safe yet
- Layout/rendering improvements 
							
						 
						
							2020-02-28 12:32:44 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								554bc88e8a 
								
							 
						 
						
							
							
								
								Update AdminFE build  
							
							
							
						 
						
							2020-02-25 11:08:35 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								7ad5c51f23 
								
							 
						 
						
							
							
								
								Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope  
							
							
							
						 
						
							2020-02-24 21:46:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2d5cf0f8cd 
								
							 
						 
						
							
							
								
								Migrations: Make them not fail for old databases  
							
							
							
						 
						
							2020-02-20 16:44:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6a97c1b9ff 
								
							 
						 
						
							
							
								
								Update adminFE build  
							
							
							
						 
						
							2020-02-17 15:50:45 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f9eb35d48e 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211  
							
							
							
						 
						
							2020-02-11 10:33:41 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								de0fea4634 
								
							 
						 
						
							
							
								
								Update AdminFE build  
							
							
							
						 
						
							2020-02-11 10:24:38 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								60de311164 
								
							 
						 
						
							
							
								
								Update frontend  
							
							
							
						 
						
							2020-02-11 13:59:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f13b7878b4 
								
							 
						 
						
							
							
								
								Merge branch 'rename_emoji_reactios' into 'develop'  
							
							... 
							
							
							
							EmojiReactions: Rename to EmojiReacts
See merge request pleroma/pleroma!2181  
							
						 
						
							2020-02-07 10:35:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								8a79f20c21 
								
							 
						 
						
							
							
								
								EmojiReactions: Rename to EmojiReacts  
							
							
							
						 
						
							2020-02-06 18:09:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								fed9b0d1e0 
								
							 
						 
						
							
							
								
								Update FE bundle  
							
							
							
						 
						
							2020-02-06 10:59:41 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f5bfb29d3b 
								
							 
						 
						
							
							
								
								Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9  
							
							
							
						 
						
							2020-01-28 18:39:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6fab5fe7f8 
								
							 
						 
						
							
							
								
								Merge branch 'translation/errors-french' into 'develop'  
							
							... 
							
							
							
							Translation/errors french
See merge request pleroma/pleroma!1457  
							
						 
						
							2020-01-28 13:26:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								be27777156 
								
							 
						 
						
							
							
								
								Merge branch 'admin-be' into 'develop'  
							
							... 
							
							
							
							Config api for admin-fe
Closes  #1406 
See merge request pleroma/pleroma!1976  
							
						 
						
							2020-01-22 17:13:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bd3f3756fb 
								
							 
						 
						
							
							
								
								Update MastoFE bundle to 2020-01-22  
							
							
							
						 
						
							2020-01-22 16:00:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								32a643a159 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into admin-be  
							
							
							
						 
						
							2020-01-22 11:22:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								7ee2f86d76 
								
							 
						 
						
							
							
								
								Revert "Update AdminFE build"  
							
							... 
							
							
							
							This reverts commit 6395ad942c 
							
						 
						
							2020-01-22 08:21:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2860bee604 
								
							 
						 
						
							
							
								
								Last AdminFE update was accidentally built from master, not develop  
							
							
							
						 
						
							2020-01-21 15:09:16 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								bc2ebdcfd6 
								
							 
						 
						
							
							
								
								Update AdminFE build  
							
							
							
						 
						
							2020-01-21 13:41:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								503d966e9f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into admin-be  
							
							
							
						 
						
							2020-01-21 10:32:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								d1e9768e10 
								
							 
						 
						
							
							
								
								[ #1478 ] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.  
							
							
							
						 
						
							2020-01-15 18:38:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7d128ca208 
								
							 
						 
						
							
							
								
								dynamic_configuration renaming  
							
							... 
							
							
							
							and moving it from instance settings 
							
						 
						
							2020-01-10 19:34:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6395ad942c 
								
							 
						 
						
							
							
								
								Update AdminFE build  
							
							
							
						 
						
							2020-01-10 15:52:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6c94b7498b 
								
							 
						 
						
							
							
								
								[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.  
							
							
							
						 
						
							2020-01-10 10:52:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								fd3c23af63 
								
							 
						 
						
							
							
								
								Update AdminFE build  
							
							
							
						 
						
							2020-01-09 10:00:15 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2f31cef71f 
								
							 
						 
						
							
							
								
								Merge branch 'feature/native-captcha' into 'develop'  
							
							... 
							
							
							
							Add native captcha and enable it by default.
Closes  #1017  and #1405 
See merge request pleroma/pleroma!2060  
							
						 
						
							2019-12-12 18:43:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								756a029edf 
								
							 
						 
						
							
							
								
								Update frontend  
							
							
							
						 
						
							2019-12-12 17:05:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2792672793 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'admin-scope-support-code' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2055  
							
						 
						
							2019-12-12 09:37:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								3ecf131511 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/report-notes  
							
							
							
						 
						
							2019-12-12 02:16:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								84f0aec9aa 
								
							 
						 
						
							
							
								
								Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.  
							
							
							
						 
						
							2019-12-11 19:48:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								701815e64c 
								
							 
						 
						
							
							
								
								[ActivityPub] Configurable ActivityPub actor type  
							
							
							
						 
						
							2019-12-10 13:19:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d6c89068f3 
								
							 
						 
						
							
							
								
								HTML: Compile Scrubbers on boot  
							
							... 
							
							
							
							This makes it possible to configure their behavior on OTP releases. 
							
						 
						
							2019-12-08 20:35:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								30caf3e51e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/user.ex 
							
						 
						
							2019-12-04 18:56:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								4b60d41db9 
								
							 
						 
						
							
							
								
								Add report notes  
							
							
							
						 
						
							2019-12-04 00:26:37 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7722e5a67a 
								
							 
						 
						
							
							
								
								Merge branch 'feature/move-activity' into 'develop'  
							
							... 
							
							
							
							Support "Move" activity
Closes  #1316 
See merge request pleroma/pleroma!1883  
							
						 
						
							2019-12-02 16:26:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								0d24ab04c5 
								
							 
						 
						
							
							
								
								Merge branch 'remove-info-from-users' into 'develop'  
							
							... 
							
							
							
							Removed users.info field
See merge request pleroma/pleroma!2006  
							
						 
						
							2019-11-30 10:42:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								52cc7de82c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations  
							
							... 
							
							
							
							# Conflicts:
#	mix.lock 
							
						 
						
							2019-11-29 10:17:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f0bdbe3f61 
								
							 
						 
						
							
							
								
								Migrations: Set users.following_count to NOT NULL  
							
							... 
							
							
							
							Also set following_count for local users to the correct value and for remote
users to 0. 
							
						 
						
							2019-11-28 17:01:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								1636cc5b7e 
								
							 
						 
						
							
							
								
								Removed users.info and remaining usages.  
							
							
							
						 
						
							2019-11-23 14:06:19 +03:00