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 'bugfix/in-reply-to-account-acct' into 'develop'	HJ	2019-04-27
\|\ \| \| \| \| \| \| \| \|	entity normalizer: hook up in_reply_to_account_acct See merge request pleroma/pleroma-fe!773
\| *	entity normalizer: hook up in_reply_to_account_acct	William Pitcock	2019-04-27
\|/
*	Merge branch 'strings/bbcode' into 'develop'	kaniini	2019-04-26
\|\ \| \| \| \| \| \| \| \|	add BBCode strings See merge request pleroma/pleroma-fe!772
\| *	add BBCode strings	William Pitcock	2019-04-26
\|/
*	Merge branch '492' into 'develop'	HJ	2019-04-25
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix Follow/Mute/Block not functional issue in the user search page Closes #492 See merge request pleroma/pleroma-fe!754
\| *	fix follow button not updating bug in follow-card	taehoon	2019-04-22
\| \|
\| *	refer searched user objects from the global user rep	taehoon	2019-04-22
\|/
*	Merge branch '500' into 'develop'	Shpuld Shpludson	2019-04-22
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Set max-width of textarea in settings page Closes #500 See merge request pleroma/pleroma-fe!761
\| *	set max-width of textarea in settings page	taehoon	2019-04-21
\| \|
* \|	Merge branch '487' into 'develop'	Shpuld Shpludson	2019-04-22
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken Follow Export Closes #487 See merge request pleroma/pleroma-fe!762
\| * \|	fetch all friends using pagination	taehoon	2019-04-19
\| \|/
* \|	Merge branch 'develop' into 'develop'	Shpuld Shpludson	2019-04-22
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	[i18n] Update for Occitan language See merge request pleroma/pleroma-fe!765
\| * \|	Update oc.json	Exilat	2019-04-20
\| \| \|
\| * \|	Update oc.json	Exilat	2019-04-20
\| \| \|
\| * \|	Update oc.json	Exilat	2019-04-20
\| \| \|
\| * \|	Update oc.json	Exilat	2019-04-20
\| \|/
* \|	Merge branch '501' into 'develop'	Shpuld Shpludson	2019-04-22
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove space in the timeline setting copy Closes #501 See merge request pleroma/pleroma-fe!763
\| * \|	Remove space in the timeline setting copy	taehoon	2019-04-21
\| \|/
* \|	Merge branch 'change-pencil-to-wrentch' into 'develop'	Shpuld Shpludson	2019-04-22
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Change pencil icon to wrentch See merge request pleroma/pleroma-fe!764
\| * \|	replace pencil with wrench icon	Brenden Bice	2019-04-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # src/components/user_card/user_card.vue
\| * \|	rebuild fontello with wrench icon added	Brenden Bice	2019-04-19
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # static/font/css/fontello-codes.css # static/font/css/fontello-embedded.css # static/font/css/fontello-ie7-codes.css # static/font/css/fontello-ie7.css # static/font/css/fontello.css # static/font/demo.html # static/font/font/fontello.eot # static/font/font/fontello.svg # static/font/font/fontello.ttf # static/font/font/fontello.woff # static/font/font/fontello.woff2
* \|	Merge branch 'bugfix/user-card-emojis-2' into 'develop'	Shpuld Shpludson	2019-04-22
\|\ \ \| \|/ \|/\| \| \| \| \|	user_card.vue: Fix .emoji to apply to img See merge request pleroma/pleroma-fe!766
\| *	user_card.vue: Fix .emoji to apply to img	Haelwenn (lanodan) Monnier	2019-04-20
\|/
*	Merge branch '497' into 'develop'	HJ	2019-04-18
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Stop fetching user relationship when user is unauthorized Closes #497 See merge request pleroma/pleroma-fe!759
\| *	stop fetching user relationship when user is unauthorized	taehoon	2019-04-17
\|/
*	Merge branch '227-bulk-delete' into 'develop'	Shpuld Shpludson	2019-04-17
\|\ \| \| \| \| \| \| \| \|	Add "bulk mute/unmute/block/unblock" feature See merge request pleroma/pleroma-fe!733
\| *	Revert "recover border between basic-user-card using list component"	taehoon	2019-04-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 1d56d486f1f679e793e710969ad54cce5fdb1ebc. # Conflicts: # src/components/follow_requests/follow_requests.vue # src/components/user_search/user_search.vue # src/components/who_to_follow/who_to_follow.vue
\| *	remove extra spacing	taehoon	2019-04-17
\| \|
\| *	code readability	taehoon	2019-04-17
\| \|
\| *	fix typos	taehoon	2019-04-17
\| \|
\| *	clean up	taehoon	2019-04-17
\| \|
\| *	make sure to use filtered selected keys	taehoon	2019-04-17
\| \|
\| *	support indeterminate checkbox state	taehoon	2019-04-17
\| \|
\| *	render span tag only if it has content	taehoon	2019-04-17
\| \|
\| *	update model and props properties	taehoon	2019-04-17
\| \|
\| *	import scss variables	taehoon	2019-04-17
\| \|
\| *	update checkbox importing path	taehoon	2019-04-17
\| \|
\| *	rewrite checkbox component as non-functional	taehoon	2019-04-17
\| \|
\| *	support i18n	taehoon	2019-04-17
\| \|
\| *	ui improvements	taehoon	2019-04-17
\| \|
\| *	clean up	taehoon	2019-04-17
\| \|
\| *	add bulk mute/unmute buttons and wire up to vuex	taehoon	2019-04-17
\| \|
\| *	wire up bulk action buttons to vuex	taehoon	2019-04-17
\| \|
\| *	add a comment	taehoon	2019-04-17
\| \|
\| *	show list header only if there are items	taehoon	2019-04-17
\| \|
\| *	pass down empty slot	taehoon	2019-04-17
\| \|
\| *	make border of list header thicker	taehoon	2019-04-17
\| \|
\| *	add bulk action buttons	taehoon	2019-04-17
\| \|
\| *	add reusable progress-button cmoponent	taehoon	2019-04-17
\| \|
\| *	replace scope attributes by slot-scope	taehoon	2019-04-17
\| \|