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 remote-tracking branch 'upstream/develop' into masto-register-app-secret	Henry Jameson	2019-06-13
\|\ \| \| \| \| \| \| \| \|	* upstream/develop: fix user banner
\| *	fix user banner	Henry Jameson	2019-06-13
\| \|
* \|	Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret	Henry Jameson	2019-06-13
\|\\| \| \| \| \| \| \| \| \|	* upstream/develop: Revert "add TOTP/Recovery Form for mobile version"
\| *	Revert "add TOTP/Recovery Form for mobile version"	Maksim	2019-06-12
\| \| \| \| \| \| \| \|	This reverts commit a3811f944819430c278b6da6b08dc322a9b9ff65.
* \|	AMERICA	Henry Jameson	2019-06-13
\| \|
* \|	Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret	Henry Jameson	2019-06-13
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/develop: Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js i18n/Update Japanese translation render modal at the root level using portal install portal vue Small improve of the who to follow panel layout Fix/Small fix in the who to follow page remove console spam i18n wire up user.description with masto api data i18n/Add Japanese with kanji (2) move drowdown menu to popper notification controls: redesign entirely entity normalizer: collapse data.pleroma if blocks wire up notification settings do not miss statusnet_profile_url of mentions Translation to Hebrew of everything other than theme_helpers and style. Translate up to settings. mastoapi login works
\| *	Merge branch 'masto-login-fixes' into 'develop'	HJ	2019-06-12
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	MastoAPI login See merge request pleroma/pleroma-fe!805
\| \| *	mastoapi login works	Henry Jameson	2019-05-21
\| \| \|
\| * \|	wire up notification settings	William Pitcock	2019-05-25
\| \|/
* /	Proper clientId/secret/token caching, MastoAPI registration	Henry Jameson	2019-05-22
\|/
*	Merge branch 'masto-remains' into 'develop'	HJ	2019-05-20
\|\ \| \| \| \| \| \| \| \|	Interactions 2.0, removing last bits of qvitter api. Only login/register and change background remains after that See merge request pleroma/pleroma-fe!792
\| *	removed unused masto api, added initial version of interactions timeline	Henry Jameson	2019-05-14
\| \|
* \|	rename for consistency's sake	taehoon	2019-05-16
\| \|
* \|	update admin api urls in accordance with new docs	taehoon	2019-05-16
\| \|
* \|	update api service functions	taehoon	2019-05-15
\| \|
* \|	apply status normalizer	taehoon	2019-05-15
\| \|
* \|	clean up fetchPinnedStatuses api service	taehoon	2019-05-15
\| \|
* \|	refactor error handling of pinStatus	taehoon	2019-05-15
\| \|
* \|	#468 - show pinned timeline and add pinned label to the status	dave	2019-05-15
\| \|
* \|	#468 - integrate endpoints	dave	2019-05-15
\|/
*	refactor api service functions using new helper	taehoon	2019-05-07
\|
*	update api services	taehoon	2019-05-03
\|
*	update api endpoint url	taehoon	2019-05-03
\|
*	Update promisedRequest helper to support json payload	taehoon	2019-05-03
\|
*	add promisedRequest helper	taehoon	2019-05-03
\|
*	add api service function	taehoon	2019-05-03
\|
*	Merge branch 'develop' into ↵	Shpuld Shpludson	2019-04-30
\|\ \| \| \| \| \| \| \| \| \| \|	'brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users' # Conflicts: # src/services/api/api.service.js
\| *	Merge branch '437-user-profile-settings' into 'develop'	HJ	2019-04-30
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Transition to MastoAPI: user profile settings Closes #437 See merge request pleroma/pleroma-fe!682
\| \| *	use json content type	taehoon	2019-04-27
\| \| \|
\| \| *	Switch to mastoapi for updating user profile	taehoon	2019-04-27
\| \| \|
\| \| *	Switch to mastoapi for updating banner	taehoon	2019-04-27
\| \| \|
\| \| *	Switch to mastoapi for updating avatar	taehoon	2019-04-27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # src/services/api/api.service.js
\| * \|	add “block import” feature	taehoon	2019-04-27
\| \| \|
\| * \|	change api function name	taehoon	2019-04-27
\| \| \|
\| * \|	move formData generating logic to api.service	taehoon	2019-04-27
\| \|/
* \|	Merge branch 'develop' into ↵	shpuld	2019-04-22
\|\\| \| \| \| \| \| \|	brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users
\| *	fetch all friends using pagination	taehoon	2019-04-19
\| \|
* \|	rename favourite to favorite	Brenden Bice	2019-04-11
\| \|
* \|	use promisedRequest for api call	Brenden Bice	2019-04-11
\| \|
* \|	fetch reblogged users	Brenden Bice	2019-04-11
\| \|
* \|	fetch favorited users	Brenden Bice	2019-04-11
\|/
*	#436 - merge develop	dave	2019-04-08
\|\
\| *	Added moderation menu	eugenijm	2019-04-01
\| \|
* \|	merge develop & resolve conflict	dave	2019-03-29
\|\\|
\| *	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 ...