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
*	Add german translation for option label	jasper	2019-02-06
\|
*	Add option to hide filtered statuses	jasper	2019-02-06
\|
*	Merge branch 'feature/split-hide-network-fixed' into 'develop'	Shpuld Shpludson	2019-02-06
\|\ \| \| \| \| \| \| \| \|	Split hide_network into hide_followers & hide_followings See merge request pleroma/pleroma-fe!536
\| *	Rename "hide_following" to "hide_follows"	Maxim Filippov	2019-02-06
\| \|
\| *	Split hide_network into hide_followers & hide_followings	Maxim Filippov	2019-02-06
\| \|
* \|	Merge branch 'patch-1' into 'develop'	Shpuld Shpludson	2019-02-06
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update es.json See merge request pleroma/pleroma-fe!535
\| * \|	Update es.json	tarteka	2019-02-05
\| \| \|
* \| \|	Merge branch 'fix/add-option-to-hide-features-panel' into 'develop'	Shpuld Shpludson	2019-02-06
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Add option to hide features panel See merge request pleroma/pleroma-fe!529
\| * \|	Add option to hide features panel (About page)	dev92341	2019-02-05
\| \| \|
\| * \|	Add option to hide features panel	dev92341	2019-02-05
\| \| \|
\| * \|	Add option to hide features panel	dev92341	2019-02-05
\| \| \|
* \| \|	Fix avatar link in search result	Edijs	2019-02-05
\| \|/ \|/\|
* \|	Merge branch 'issue-316-empty-username' into 'develop'	Shpuld Shpludson	2019-02-05
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	#316 - fix empty username issue See merge request pleroma/pleroma-fe!531
\| * \|	#316 - fix empty username issue	dave	2019-02-05
\| \| \|
* \| \|	Merge branch 'issue-138-html-escaping' into 'develop'	Shpuld Shpludson	2019-02-05
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	#138 - escape html entities in BIO text See merge request pleroma/pleroma-fe!522
\| * \|	#138 - fix lint error	dave	2019-02-04
\| \| \|
\| * \|	#138 - unescape user bio	dave	2019-02-04
\| \| \|
\| * \|	#138 - escape html entities in BIO text	dave	2019-02-04
\| \|/
* /	Fix mishandled @error in stillImage	shpuld	2019-02-05
\|/
*	Merge branch '309-add-logo-to-hamburger-menu' into 'develop'	Shpuld Shpludson	2019-02-04
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add logo and sitename to the side drawer area Closes #309 See merge request pleroma/pleroma-fe!517
\| *	Do not use BEM	taehoon	2019-02-04
\| \|
\| *	Improve readability using v-if and v-else	taehoon	2019-02-04
\| \|
\| *	Show logo/sitename in the side drawer only if logged out	taehoon	2019-02-04
\| \|
\| *	Add logo and sitename to the side drawer area	taehoon	2019-02-04
\| \|
* \|	merge develop and fix conflicts AGAIN	shpuld	2019-02-04
\|\\|
\| *	Merge branch 'issue-154-shorten-cw-subject' into 'develop'	Shpuld Shpludson	2019-02-04
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue #154 shorten subject Closes #154 See merge request pleroma/pleroma-fe!520
\| \| *	#154 - update long subject determine logic, meaningful variable names	dave	2019-02-04
\| \| \|
\| \| *	handle poster attachment with tall subjects	dave	2019-02-04
\| \| \|
\| \| *	shorten incredibly long content warning or subject	dave	2019-02-03
\| \| \|
\| * \|	#312 - media uploader not working with same file in adjacent order	dave	2019-02-04
\| \| \|
\| * \|	Merge branch 'fix/user-links-not-replaced-with-router-links-in-repeats' into ↵	Shpuld Shpludson	2019-02-04
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'develop' #307 - replace user links with router links in repeats See merge request pleroma/pleroma-fe!516
\| \| * \|	#307 - replace user links with router links in repeats	Xiaofeng An	2019-02-03
\| \| \|/
\| * \|	Merge branch '275-avatar-placeholder' into 'develop'	Shpuld Shpludson	2019-02-04
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Support avatar placeholder Closes #275 See merge request pleroma/pleroma-fe!511
\| \| *	Use an existing image served by backend instead	taehoon	2019-02-03
\| \| \|
\| \| *	Fix class ordering issues related to avatar	taehoon	2019-02-02
\| \| \|
\| \| *	Improve reusability of UserAvatar component	taehoon	2019-02-02
\| \| \|
\| \| *	Move avatar css into a correct place	taehoon	2019-02-02
\| \| \|
\| \| *	Migrate StillImage to UserAvatar for avatars	taehoon	2019-02-02
\| \| \|
\| \| *	Use a correct avatar placeholder image	taehoon	2019-02-02
\| \| \|
\| \| *	Show placeholder image if avatar image url is broken	taehoon	2019-02-02
\| \| \|
\| * \|	Merge branch 'fix/conversation-arrow-smushed-in-notifications-panel' into ↵	Shpuld Shpludson	2019-02-03
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'develop' #306 - fix conversation arrow smushed in notifications panel See merge request pleroma/pleroma-fe!513
\| \| * \|	#306 - fix conversation arrow smushed in notifications panel	Xiaofeng An	2019-02-03
\| \| \| \|
\| \| * \|	Revert "#306 - fix conversation arrow smushed in notifications panel"	Xiaofeng An	2019-02-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 1e40e70efc64071581adff4bce3c8bf78da82acb.
\| \| * \|	#306 - fix conversation arrow smushed in notifications panel	Xiaofeng An	2019-02-02
\| \| \| \|
\| * \| \|	Revert "Merge branch 'feature/split-hide-network' into 'develop'"	Shpuld Shpludson	2019-02-03
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !497
* \| \| \|	Combine friends/followers	shpuld	2019-02-03
\| \| \| \|
* \| \| \|	merge develop in	shpuld	2019-02-03
\|\\| \| \|
\| * \| \|	Merge branch '238-add-avatar-size-suggestion' into 'develop'	Shpuld Shpludson	2019-02-03
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add avatar size instruction notice Closes #238 See merge request pleroma/pleroma-fe!512
\| \| * \| \|	Add avatar size instruction notice	taehoon	2019-02-02
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge branch 'fix/default-inlined-videos' into 'develop'	Shpuld Shpludson	2019-02-03
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Change video playing default without bothering making it an instance configurable See merge request pleroma/pleroma-fe!505