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 (Expand)	Author	Age
*	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ...	dave	2019-03-28
\|\
\| *	Merge branch 'fix/convos-masto' into 'develop'	HJ	2019-03-27
\| \|\
\| \| *	Apparently, MastoAPI gives status in ancestors if you try opening a repeat...	Henry Jameson	2019-03-27
\| * \|	merge develop and resolve conflict	dave	2019-03-27
\| \|\\|
\| \| *	Merge remote-tracking branch 'upstream/develop' into mastoapi/actions	Henry Jameson	2019-03-27
\| \| \|\
\| \| \| *	Merge remote-tracking branch 'upstream/develop' into mastoapi/followers	Henry Jameson	2019-03-27
\| \| \| \|\
\| \| \| \| *	Merge branch 'develop' into 'masto-api/direct'	HJ	2019-03-27
\| \| \| \| \|\
\| \| \| \| \| *	Merge branch 'mastoapi/friends-tl' into 'develop'	HJ	2019-03-27
\| \| \| \| \| \|\
\| \| \| \| \| \| *	Revert "Merge branch 'revert-987b5162' into 'develop'"	Henry Jameson	2019-03-27
\| \| \| \| * \| \|	Merge remote-tracking branch 'upstream/develop' into masto-api/direct	Henry Jameson	2019-03-25
\| \| \| \| \|\ \ \
\| \| \| \| * \ \ \	Merge remote-tracking branch 'upstream/develop' into masto-api/direct	Henry Jameson	2019-03-21
\| \| \| \| \|\ \ \ \
\| \| \| \| * \| \| \| \|	switch direct messages to mastoapi	Henry Jameson	2019-03-07
\| \| \| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into mastoapi/followers	Henry Jameson	2019-03-27
\| \| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	errata	Henry Jameson	2019-03-27
\| \| \| * \| \| \| \| \| \|	review	Henry Jameson	2019-03-27
\| \| \| * \| \| \| \| \| \|	correctly paginate on MastoAPI	Henry Jameson	2019-03-25
\| \| \| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into mastoapi/followers	Henry Jameson	2019-03-25
\| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \|_\|_\|/ / / \| \| \| \| \|/\| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	wip support for follower/following, a bit broken and with regression	Henry Jameson	2019-03-10
\| \| \| \| \|_\|/ / / / \| \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \| \|	review/remove error hiding	Henry Jameson	2019-03-27
\| \| * \| \| \| \| \| \|	correctly update relationship on follow/unfollow	Henry Jameson	2019-03-25
\| \| * \| \| \| \| \| \|	fixup! Merge remote-tracking branch 'upstream/develop' into mastoapi/actions	Henry Jameson	2019-03-25
\| \| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into mastoapi/actions	Henry Jameson	2019-03-25
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|/ / / / / \| \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \| \|	basic user and status actions implemented	Henry Jameson	2019-03-10
\| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	#457 - merge develop and resolve conflict	dave	2019-03-27
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	#457 - update tag timeline endpoint to MastoAPI	dave	2019-03-26
* \| \| \| \| \| \| \|	#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
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'fix/add-await-to-login-request' into 'develop'	Shpuld Shpludson	2019-03-27
\| \|\ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add await to login action'	jasper	2019-03-26
\| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge branch 'mastoapi/public-tl' into 'develop'	HJ	2019-03-27
\| \|\ \ \ \ \ \
\| \| * \ \ \ \ \	Merge branch 'develop' into 'mastoapi/public-tl'	HJ	2019-03-25
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|_\|/ / \| \| \| \|/\| \| \| \|
\| \| * \| \| \| \| \|	switch public and TWKN to MastoAPI	Henry Jameson	2019-03-07
\| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"	HJ	2019-03-27
\| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'mastoapi/friends-tl' into 'develop'	Shpuld Shpludson	2019-03-26
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| \| * \| \| \|	Merge branch 'develop' into 'mastoapi/friends-tl'	HJ	2019-03-25
\| \| \|\ \ \ \ \| \| \| \| \|/ / \| \| \| \|/\| \|
\| \| * \| \| \|	Merge remote-tracking branch 'upstream/develop' into mastoapi/friends-tl	Henry Jameson	2019-03-21
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| \| * \| \| \|	undo this change since BE returns empty object for relationship, add in a	Henry Jameson	2019-03-07
\| \| * \| \| \|	updates normalizer for proper user handling and adds support for friends tl v...	Henry Jameson	2019-03-07
\| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Merge branch 'issue-442-placeholder-fix' into 'develop'	HJ	2019-03-25
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| \| * \| \|	#442 - update placeholder linebreak	dave	2019-03-18
\| \| * \| \|	#442 - clean up Bio placeholder text	dave	2019-03-17
* \| \| \| \|	#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
\|\\| \| \| \|
\| * \| \| \|	review	Henry Jameson	2019-03-25
\| * \| \| \|	Merge remote-tracking branch 'upstream/develop' into mastoapi/convos	Henry Jameson	2019-03-25
\| \|\ \ \ \
\| \| * \ \ \	Merge branch 'issue-450-user-data-populate' into 'develop'	Shpuld Shpludson	2019-03-25
\| \| \|\ \ \ \
\| \| \| * \| \| \|	#450 - dispatch login after saved state is loaded	dave	2019-03-22
\| \| \| \| \|_\|/ \| \| \| \|/\| \|