pleroma-fe.git - This is a fork of pleroma's official FE. Used by vnil.de, we meow meow the meow meow with meow meow

	Commit message (Collapse)	Author	Age
*	Merge branch 'refactor-who-to-follow' into 'develop'	kaniini	2019-09-26
\|\ \| \| \| \| \| \| \| \|	Small refactoring in who to follow page See merge request pleroma/pleroma-fe!932
\| *	Small refactoring in who to follow page	Hakaba Hitoyo	2019-09-26
\|/
*	Merge branch 'feature/add-discoverable-preference' into 'develop'	kaniini	2019-09-26
\|\ \| \| \| \| \| \| \| \|	Feature/Add _Allow user discovery services_ preference See merge request pleroma/pleroma-fe!947
\| *	Feature/Add _Allow user discovery services_ preference	Hakaba Hitoyo	2019-09-26
\|/
*	Merge branch 'hide-followers-follows-count' into 'develop'	kaniini	2019-09-26
\|\ \| \| \| \| \| \| \| \|	Added a setting to hide follow/follower count from the user profile See merge request pleroma/pleroma-fe!951
\| *	Added a setting to hide follow/follower count from the user profile	eugenijm	2019-09-23
\| \|
* \|	Merge branch 'emoji-selector-update' into 'develop'	HJ	2019-09-26
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Emoji selector update Closes #101 See merge request pleroma/pleroma-fe!895
\| * \|	fix tests	Henry Jameson	2019-09-25
\| \| \|
\| * \|	Merge remote-tracking branch 'upstream/develop' into emoji-selector-update	Henry Jameson	2019-09-25
\| \|\ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/develop: (42 commits) Fix formatting in oc.json avoid using global class fix logo moving bug when lightbox is open Reserve scrollbar gap when body scroll is locked setting display: initial makes trouble, instead, toggle display: none using classname lock body scroll add body-scroll-lock directive install body-scroll-lock wire up props with PostStatusModal rename component recover autofocusing behavior refactor MobilePostStatusModal using new PostStatusModal add new module and modal to post new status remove needless condition add mention button wire up user state with global store collapse fav/repeat notifications from muted users do not collapse thread muted posts in conversation detect thread-muted posts do not change word based muting logic ...
* \| \|	Fix formatting in oc.json	Shpuld Shpuldson	2019-09-25
\| \| \|
* \| \|	Merge branch '616' into 'develop'	Shpuld Shpludson	2019-09-25
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lock body scroll when lightbox is open Closes #616 See merge request pleroma/pleroma-fe!886
\| * \| \|	avoid using global class	taehoon	2019-09-20
\| \| \| \|
\| * \| \|	fix logo moving bug when lightbox is open	taehoon	2019-09-20
\| \| \| \|
\| * \| \|	Reserve scrollbar gap when body scroll is locked	taehoon	2019-09-20
\| \| \| \|
\| * \| \|	setting display: initial makes trouble, instead, toggle display: none using ↵	taehoon	2019-09-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	classname
\| * \| \|	lock body scroll	taehoon	2019-09-20
\| \| \| \|
\| * \| \|	add body-scroll-lock directive	taehoon	2019-09-20
\| \| \| \|
\| * \| \|	install body-scroll-lock	taehoon	2019-09-20
\| \| \| \|
* \| \| \|	Merge branch 'develop' into 'develop'	Shpuld Shpludson	2019-09-25
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[i18n] Update for the Occitan language file See merge request pleroma/pleroma-fe!901
\| * \| \| \|	Update oc.json	Exilat	2019-08-03
\| \| \| \| \|
\| * \| \| \|	Update for Interactions, new search, sticker picker, update copy.	Exilat	2019-08-03
\| \| \| \| \|
* \| \| \| \|	Merge branch 'es-translate' into 'develop'	Shpuld Shpludson	2019-09-25
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[i18n] Update es translate See merge request pleroma/pleroma-fe!944
\| * \| \| \| \|	Update es translate	tarteka	2019-09-06
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'eu-translate' into 'develop'	Shpuld Shpludson	2019-09-25
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[i18n] update eu translate See merge request pleroma/pleroma-fe!943
\| * \| \| \| \| \|	fix some translates	tarteka	2019-09-10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix some translates	tarteka	2019-09-07
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix some translates	tarteka	2019-09-07
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	update eu translate	tarteka	2019-09-06
\| \|/ / / / /
* \| \| \| \| \|	Merge branch '639-2' into 'develop'	Shpuld Shpludson	2019-09-25
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add "Mention user" button to user card Closes #639 See merge request pleroma/pleroma-fe!955
\| * \| \| \| \| \|	wire up props with PostStatusModal	taehoon	2019-09-20
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	rename component	taehoon	2019-09-20
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	recover autofocusing behavior	taehoon	2019-09-20
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	refactor MobilePostStatusModal using new PostStatusModal	taehoon	2019-09-20
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add new module and modal to post new status	taehoon	2019-09-20
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	remove needless condition	taehoon	2019-09-20
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add mention button	taehoon	2019-09-20
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '657' into 'develop'	Shpuld Shpludson	2019-09-25
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Collapse fav/repeat notifications from muted users Closes #657 See merge request pleroma/pleroma-fe!945
\| * \| \| \| \|	wire up user state with global store	taehoon	2019-09-20
\| \| \| \| \| \|
\| * \| \| \| \|	collapse fav/repeat notifications from muted users	taehoon	2019-09-20
\|/ / / / /
* \| \| \| \|	Merge branch 'muting-fixes' into 'develop'	Shpuld Shpludson	2019-09-20
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Properly detect thread-muted posts and set `with_muted` when fetching notifications See merge request pleroma/pleroma-fe!941
\| * \| \| \|	Merge branch 'develop' into 'muting-fixes'	rinpatch	2019-09-16
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \|	# Conflicts: # src/components/status/status.js
* \| \| \| \|	Merge branch '656' into 'develop'	Shpuld Shpludson	2019-09-16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not collapse thread muted posts when it's expanded/on the thread page and do not collapse muted user's posts on muted user's profile page Closes #656 See merge request pleroma/pleroma-fe!953
\| * \| \| \| \|	do not collapse thread muted posts in conversation	taehoon	2019-09-13
\| \| \| \| \| \|
\| * \| \| \| \|	detect thread-muted posts	taehoon	2019-09-13
\| \| \| \| \| \|
\| * \| \| \| \|	do not change word based muting logic	taehoon	2019-09-13
\| \| \| \| \| \|
\| * \| \| \| \|	do not collapse muted user's posts on muted user's media timeline	taehoon	2019-09-13
\| \| \| \| \| \|
\| * \| \| \| \|	do not collapse muted user's posts on muted user's profile page	taehoon	2019-09-13
\|/ / / / /
* \| \| \| \|	Merge branch 'fix/italics-not-selectable' into 'develop'	Shpuld Shpludson	2019-09-13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix italics not being selectable See merge request pleroma/pleroma-fe!952
\| * \| \| \| \|	fix italics not being selectable	Shpuld Shpuldson	2019-09-13
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix/follow-request-detection' into 'develop'	Shpuld Shpludson	2019-09-12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Utilize `user.requested` to display follow request status on user card Closes #635 See merge request pleroma/pleroma-fe!942