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 'develop' into feature/mobile-improvements-3	shpuld	2019-04-01
\|\
\| *	Merge branch '471-timeline-since-id' into 'develop'	Shpuld Shpludson	2019-04-01
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#471 - fix timeline fetch with since_id Closes #471 See merge request pleroma/pleroma-fe!722
\| \| *	#471 - fix timeline fetch with since_id	jared	2019-04-01
\| \| \|
\| * \|	Merge branch 'minimal-scopes-mode' into 'develop'	HJ	2019-04-01
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode See merge request pleroma/pleroma-fe!633
\| \| * \|	final touches	Henry Jameson	2019-03-30
\| \| \| \|
\| \| * \|	aaaaggghh	Henry Jameson	2019-03-30
\| \| \| \|
\| \| * \|	fix lint	Henry Jameson	2019-03-30
\| \| \| \|
\| \| * \|	Merge remote-tracking branch 'upstream/develop' into minimal-scopes-mode	Henry Jameson	2019-03-30
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/develop: (173 commits) Fix: Change condition fix typo update store according to retweeted status #433 - update sort by for conversation display replies_count right after reply icon expose replies_count from mastodon api Apparently, MastoAPI gives status in ancestors if you try opening a repeat... make side drawer use gesture service and fix its animations review/remove error hiding errata review #433 - sort conversation for retweets and clean up Revert "Merge branch 'revert-987b5162' into 'develop'" Revert "Merge branch 'mastoapi/friends-tl' into 'develop'" Add await to login action' Remove console log Fix warnings in user profile routing Add tests for gesture service, fix bug with perpendicular directions #255 - clean up autocomplete form #255 - clean up user settings page with self-closing html tags ...
\| \| * \| \|	Review	Henry Jameson	2019-03-30
\| \| \| \| \|
\| \| * \| \|	Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode	Henry Jameson	2019-03-03
\| \| \| \| \|
\| * \| \| \|	#470 - update button text capitalization	jared	2019-04-01
\| \| \| \| \|
\| * \| \| \|	#470 - handle cases without subject	jared	2019-04-01
\| \| \| \| \|
\| * \| \| \|	#470 - update i18n	jared	2019-04-01
\| \| \| \| \|
\| * \| \| \|	#470 - fix subject and content toggle issue	jared	2019-04-01
\| \| \|_\|/ \| \|/\| \|
\| * \| \|	Remove useless comma	jasper	2019-04-01
\| \| \| \|
\| * \| \|	Fix user card in notification	jasper	2019-04-01
\| \| \|/ \| \|/\|
\| * \|	Merge branch 'issues/#465' into 'develop'	Shpuld Shpludson	2019-03-29
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update store according to retweeted status Closes #465 See merge request pleroma/pleroma-fe!713
\| \| * \|	update store according to retweeted status	Brenden Bice	2019-03-28
\| \| \| \|
\| * \| \|	Merge branch 'fix/warnings-in-user-profile' into 'develop'	Shpuld Shpludson	2019-03-29
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#461 Fix warnings about user-profile Closes #461 See merge request pleroma/pleroma-fe!708
\| \| * \| \|	Fix: Change condition	jasper	2019-03-28
\| \| \| \| \|
\| \| * \| \|	Remove console log	jasper	2019-03-26
\| \| \| \| \|
\| \| * \| \|	Fix warnings in user profile routing	jasper	2019-03-26
\| \| \| \| \|
\| * \| \| \|	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
\| \| * \ \ \	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵	jared	2019-03-27
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	255-emoji-input
\| \| * \| \| \| \|	#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
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	remove window width copypasta	shpuld	2019-04-01
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	add gesture to close notifications drawer	shpuld	2019-03-28
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'develop' into feature/mobile-improvements-3	shpuld	2019-03-28
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	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
\| \| * \| \| \| \| \| \|	fix typo	shpuld	2019-03-28
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	make side drawer use gesture service and fix its animations	shpuld	2019-03-27
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add tests for gesture service, fix bug with perpendicular directions	shpuld	2019-03-26
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	somewhat functioning gesture service	shpuld	2019-03-25
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	start creating 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
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	expose replies_count from mastodon api	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
\| \| * \ \ \ \ \ \ \ \	Merge branch 'fix/convos-masto' into 'develop'	HJ	2019-03-27
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Apparently, MastoAPI gives status in ancestors if you try opening a repeat... Closes #460 See merge request pleroma/pleroma-fe!715
\| \| \| * \| \| \| \| \| \| \| \|	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
\| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/develop: errata review Revert "Merge branch 'revert-987b5162' into 'develop'" Revert "Merge branch 'mastoapi/friends-tl' into 'develop'" Add await to login action' correctly paginate on MastoAPI #442 - update placeholder linebreak #442 - clean up Bio placeholder text wip support for follower/following, a bit broken and with regression switch direct messages to mastoapi switch public and TWKN to MastoAPI undo this change since BE returns empty object for relationship, add in a separate MR updates normalizer for proper user handling and adds support for friends tl via mastoapi
\| \| \| \| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/develop' into mastoapi/followers	Henry Jameson	2019-03-27
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/develop: Revert "Merge branch 'revert-987b5162' into 'develop'" Revert "Merge branch 'mastoapi/friends-tl' into 'develop'" Add await to login action' switch direct messages to mastoapi switch public and TWKN to MastoAPI
\| \| \| \| \| * \| \| \| \| \| \| \| \|	Merge branch 'develop' into 'masto-api/direct'	HJ	2019-03-27
\| \| \| \| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # src/services/api/api.service.js
\| \| \| \| \| \| * \| \| \| \| \| \| \|	Merge branch 'mastoapi/friends-tl' into 'develop'	HJ	2019-03-27
\| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \|_\|_\|_\|_\|_\|/ / \| \| \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mastoapi/friends tl See merge request pleroma/pleroma-fe!711