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 '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
\| \|
\| *	Fix warnings in user profile routing	jasper	2019-03-26
\| \|
* \|	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
\| \| \|
\| * \|	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
\| * \| \|	expose replies_count from mastodon api	Brenden Bice	2019-03-28
\| \| \| \|
* \| \| \|	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
\| \| \| \| * \| \|	Revert "Merge branch 'revert-987b5162' into 'develop'"	Henry Jameson	2019-03-27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 96753e6a5febff60e0c2cb6fac13d5e7865f0a94, reversing changes made to 987b5162a7530979e9fa887a24311eb1cd480fc5.
\| \| \| * \| \| \|	Merge remote-tracking branch 'upstream/develop' into masto-api/direct	Henry Jameson	2019-03-25
\| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/develop: (40 commits) review 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 reactivity fixes less hackery, more direct usage of mastoapi ...
\| \| \| * \ \ \ \	Merge remote-tracking branch 'upstream/develop' into masto-api/direct	Henry Jameson	2019-03-21
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/develop: (47 commits) #449 - fix auth token fetch issue Make select tag use --inputText as text color #444 - remote follow clean up #444 - show `remote follow` button when logged out Add button to save without cropping post-merge fixes [i18n] Update oc.json after store: fix setting postFormats field fix user-card avatar falling into permament failed state fix flake id users not fetching correctly fix console error afterStoreSetup: Move log in and theme load to afterStoreSetup. afterStoreSetup: Handle 404 cases. afterStoreSetup: Emoji and nodeinfo refactor. afterStoreSetup: refactor TOS and panel fetching, handle 404s. afterStoreSetup: refactor. Load persistedStated with async/await. whoops レインせんぱいにサンキュー fix embedded relationship card parsing ...
\| \| \| * \| \| \| \| \|	switch direct messages to mastoapi	Henry Jameson	2019-03-07
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into mastoapi/followers	Henry Jameson	2019-03-27
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/develop: #442 - update placeholder linebreak #442 - clean up Bio placeholder text 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 branch 'develop' into 'mastoapi/friends-tl'	HJ	2019-03-25
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \|_\|/ / / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # src/services/api/api.service.js
\| \| \| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into mastoapi/friends-tl	Henry Jameson	2019-03-21
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \|_\|/ / / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/develop: (47 commits) #449 - fix auth token fetch issue Make select tag use --inputText as text color #444 - remote follow clean up #444 - show `remote follow` button when logged out Add button to save without cropping post-merge fixes [i18n] Update oc.json after store: fix setting postFormats field fix user-card avatar falling into permament failed state fix flake id users not fetching correctly fix console error afterStoreSetup: Move log in and theme load to afterStoreSetup. afterStoreSetup: Handle 404 cases. afterStoreSetup: Emoji and nodeinfo refactor. afterStoreSetup: refactor TOS and panel fetching, handle 404s. afterStoreSetup: refactor. Load persistedStated with async/await. whoops レインせんぱいにサンキュー fix embedded relationship card parsing ...
\| \| \| * \| \| \| \| \|	undo this change since BE returns empty object for relationship, add in a	Henry Jameson	2019-03-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	separate MR
\| \| \| * \| \| \| \| \|	updates normalizer for proper user handling and adds support for friends tl ↵	Henry Jameson	2019-03-07
\| \| \| \| \|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	via mastoapi
\| \| * \| \| \| \| \|	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
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/develop: (87 commits) review 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 reactivity fixes less hackery, more direct usage of mastoapi ...
\| \| * \| \| \| \| \|	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
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/develop: (87 commits) review 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 reactivity fixes less hackery, more direct usage of mastoapi ...
\| * \| \| \| \| \|	basic user and status actions implemented	Henry Jameson	2019-03-10
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	#457 - merge develop and resolve conflict	dave	2019-03-27
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'develop' into 'mastoapi/public-tl'	HJ	2019-03-25
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \|	# Conflicts: # src/services/api/api.service.js
\| * \| \| \| \|	switch public and TWKN to MastoAPI	Henry Jameson	2019-03-07
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	#457 - update tag timeline endpoint to MastoAPI	dave	2019-03-26
\| \|/ / / \|/\| \| \|
* \| \| \|	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 ...
\| * \| \|	Update attachment normalizer	taehoon	2019-03-25
\| \| \| \|
\| * \| \|	Add fallback for attachments uploaded via the other platforms	taehoon	2019-03-24
\| \| \| \|
\| * \| \|	Get correct mimetype through entity_normalizer	taehoon	2019-03-24
\| \| \| \|
\| * \| \|	Set default parameter	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
\| \| * \| \|	switch to mastoapi	taehoon	2019-03-21
\| \| \| \| \|
\| \| * \| \|	switch to mastoapi	taehoon	2019-03-21
\| \| \| \| \|
\| \| * \| \|	Switch to mastoapi	taehoon	2019-03-21
\| \| \| \| \|
\| \| * \| \|	Add hideMutedPosts setting and wire up to post-returning endpoints	taehoon	2019-03-21
\| \| \| \| \|
\| \| * \| \|	Minor code refactoring	taehoon	2019-03-21
\| \| \| \| \|
\| \| * \| \|	Improve fetch error handling using a util	taehoon	2019-03-21
\| \| \| \| \|
\| \| * \| \|	Remove old muting logic	taehoon	2019-03-21
\| \| \| \| \|