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
*	#436 - merge develop & resolve conflict	dave	2019-04-01
\|\
\| *	Remove useless comma	jasper	2019-04-01
\| \|
\| *	Fix user card in notification	jasper	2019-04-01
\| \|
* \|	#436 - apply patch and clean up	dave	2019-03-31
\| \|
* \|	#436 - apply patch	dave	2019-03-31
\| \|
* \|	#436 - keep original naming	dave	2019-03-31
\| \|
* \|	#436 - keep original naming	dave	2019-03-31
\| \|
* \|	merge develop & resolve conflict	dave	2019-03-29
\|\\|
\| *	Merge branch '255-emoji-input' into 'develop'	Shpuld Shpludson	2019-03-28
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#255 - add emoji input component Closes #255 See merge request pleroma/pleroma-fe!706
\| \| *	#255 - clean up autocomplete form	jared	2019-03-26
\| \| \|
\| \| *	#255 - clean up user settings page with self-closing html tags	jared	2019-03-26
\| \| \|
\| \| *	#255 - support textarea and update user settings page	jared	2019-03-26
\| \| \|
\| \| *	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵	jared	2019-03-26
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	255-emoji-input
\| \| * \|	#255 - add emoji input component	jared	2019-03-25
\| \| \| \|
\| * \| \|	Merge branch 'feat/gesture-service' into 'develop'	Shpuld Shpludson	2019-03-28
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a gesture service for easier touch gestures See merge request pleroma/pleroma-fe!714
\| \| * \| \|	make side drawer use gesture service and fix its animations	shpuld	2019-03-27
\| \| \| \| \|
\| \| * \| \|	somewhat functioning gesture service	shpuld	2019-03-25
\| \| \| \| \|
\| * \| \| \|	Merge branch 'issues/#466' into 'develop'	Shpuld Shpludson	2019-03-28
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	show replies count right after reply icon Closes #466 See merge request pleroma/pleroma-fe!716
\| \| * \| \| \|	display replies_count right after reply icon	Brenden Bice	2019-03-28
\| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	#433 - update sort by for conversation	dave	2019-03-28
\| \| \| \| \|
\| * \| \| \|	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵	dave	2019-03-28
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issue-433-status-reply-form
\| \| * \| \| \|	Apparently, MastoAPI gives status in ancestors if you try opening a repeat...	Henry Jameson	2019-03-27
\| \| \|/ / /
\| * \| \| \|	#433 - sort conversation for retweets and clean up	dave	2019-03-27
\| \| \| \| \|
\| * \| \| \|	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵	dave	2019-03-27
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issue-433-status-reply-form
\| * \| \| \|	#433 - fix retweet abnormal behavior	dave	2019-03-25
\| \| \| \| \|
\| * \| \| \|	#433 - consider page on focused	dave	2019-03-25
\| \| \| \| \|
\| * \| \| \|	#433 - remove needless nesting/bloating	dave	2019-03-25
\| \| \| \| \|
\| * \| \| \|	#433 - Fix conversation page highlight, fetch conversation on converation page	dave	2019-03-25
\| \| \| \| \|
\| * \| \| \|	Resolve merge conflict,	dave	2019-03-25
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \|	Fix few issues (conversation page highlight, fetch conversation, ...)
\| * \| \| \|	#433 - fix broken conversation page	dave	2019-03-25
\| \| \| \| \|
\| * \| \| \|	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵	dave	2019-03-25
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issue-433-status-reply-form
\| * \| \| \| \|	#433: persistency of status form	dave	2019-03-11
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵	dave	2019-03-11
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issue-433-status-reply-form
\| * \| \| \| \| \|	#433: do not remove the reply dialog	dave	2019-03-11
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	merge develop & resolve conflict	dave	2019-03-26
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'issue-442-placeholder-fix' into 'develop'	HJ	2019-03-25
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#442 - clean up Bio placeholder text Closes #442 See merge request pleroma/pleroma-fe!689
\| \| * \| \| \| \|	#442 - update placeholder linebreak	dave	2019-03-18
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	review	Henry Jameson	2019-03-25
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into mastoapi/convos	Henry Jameson	2019-03-25
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/develop: (34 commits) Update attachment normalizer Add fallback for attachments uploaded via the other platforms Get correct mimetype through entity_normalizer Set default parameter Switch to mastoapi for posting status and uploading media Revert changes prevent text pasting if image is pasted remove border radius of suggested emojis #450 - dispatch login after saved state is loaded #448 - fix timeline fetch error when status text is null #451 - add class to username span No need to fetch mutes on load anymore 🙌 switch to mastoapi switch to mastoapi masto api sends muted property now No need to fetch user data using old api anymore 🎉 Switch to mastoapi Add comment Reset statusnet_blocking of all fetched users first while refreshing block list Add hideMutedPosts setting and wire up to post-returning endpoints ...
\| \| * \| \| \| \|	Merge branch 'file-paste' into 'develop'	Shpuld Shpludson	2019-03-25
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#455 - prevent text pasting if image is pasted Closes #455 See merge request pleroma/pleroma-fe!705
\| \| \| * \| \| \| \|	prevent text pasting if image is pasted	nik	2019-03-23
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'develop' into 'develop'	Shpuld Shpludson	2019-03-25
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove border radius of suggested emojis See merge request pleroma/pleroma-fe!704
\| \| \| * \| \| \| \| \|	remove border radius of suggested emojis	nik	2019-03-23
\| \| \| \|/ / / / /
\| \| * \| \| \| \| \|	Get correct mimetype through entity_normalizer	taehoon	2019-03-24
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Switch to mastoapi for posting status and uploading media	taehoon	2019-03-24
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Merge branch '227-manage-blocks-mutes' into 'develop'	HJ	2019-03-24
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Transition to MastoAPI: Mute & Block and Add Mutes management tab See merge request pleroma/pleroma-fe!611
\| \| \| * \| \| \|	Add hideMutedPosts setting and wire up to post-returning endpoints	taehoon	2019-03-21
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Remove old muting logic	taehoon	2019-03-21
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Update MuteCard ui	taehoon	2019-03-21
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Add mute/unmute featrue and mutes management tab	taehoon	2019-03-21
\| \| \| \| \| \| \|