2913 Commits (1b07c6ae4f0d06e25b124bba2f088d3a02f78ecc)

 

All Branches   

Search

Author	SHA1	Message	Date
jared	37b33fc615	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into 255-emoji-input	6 years ago
dave	578b412177	#457 - merge develop and resolve conflict	6 years ago
Henry Jameson	b3a6bec17b	Revert "Merge branch 'revert-987b5162' into 'develop'" ... This reverts commit 96753e6a5f, reversing changes made to 987b5162a7.	6 years ago
HJ	e750b2f197	Merge branch 'mastoapi/public-tl' into 'develop' ... switch public and TWKN to MastoAPI See merge request pleroma/pleroma-fe!650	6 years ago
HJ	96753e6a5f	Merge branch 'revert-987b5162' into 'develop' ... Revert "Merge branch 'mastoapi/friends-tl' into 'develop'" See merge request pleroma/pleroma-fe!710	6 years ago
HJ	95459ff0bc	Revert "Merge branch 'mastoapi/friends-tl' into 'develop'" ... This reverts merge request !647	6 years ago
jasper	2d05aef24b	Add await to login action'	6 years ago
jasper	26955af60b	Remove console log	6 years ago
jasper	ab99d5ef95	Fix warnings in user profile routing	6 years ago
shpuld	c50e64f8ee	Add tests for gesture service, fix bug with perpendicular directions	6 years ago
jared	8fe9101f0b	#255 - clean up autocomplete form	6 years ago
jared	6dc2cedab0	#255 - clean up user settings page with self-closing html tags	6 years ago
jared	2927454233	#255 - support textarea and update user settings page	6 years ago
Shpuld Shpludson	987b5162a7	Merge branch 'mastoapi/friends-tl' into 'develop' ... Switch friends TL to MastoAPI See merge request pleroma/pleroma-fe!647	6 years ago
dave	982be05873	#457 - update tag timeline endpoint to MastoAPI	6 years ago
dave	5fd589d5e7	merge develop & resolve conflict	6 years ago
jared	441deb405d	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into 255-emoji-input	6 years ago
jared	b97a033839	#255 - add emoji input component	6 years ago
HJ	2f1e690478	Merge branch 'issue-442-placeholder-fix' into 'develop' ... #442 - clean up Bio placeholder text Closes #442 See merge request pleroma/pleroma-fe!689	6 years ago
shpuld	e23c19468a	somewhat functioning gesture service	6 years ago
dave	467647d5d7	#433 - fix retweet abnormal behavior	6 years ago
HJ	04217fc660	Merge branch 'develop' into 'mastoapi/friends-tl' ... # Conflicts: # src/services/api/api.service.js	6 years ago
Henry Jameson	d766059dee	correctly update relationship on follow/unfollow	6 years ago
Henry Jameson	82f077feb9	fixup! Merge remote-tracking branch 'upstream/develop' into mastoapi/actions	6 years ago
Henry Jameson	0ffd43954e	Merge remote-tracking branch 'upstream/develop' into mastoapi/actions ... * 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 ...	6 years ago
dave	c5ec4829a7	#433 - consider page on focused	6 years ago
HJ	3025532ecf	Merge branch 'develop' into 'mastoapi/public-tl' ... # Conflicts: # src/services/api/api.service.js	6 years ago
Henry Jameson	72749834f3	Merge remote-tracking branch 'upstream/develop' into masto-api/direct ... * 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 ...	6 years ago
Henry Jameson	968e6c7fe8	correctly paginate on MastoAPI	6 years ago
dave	73dfb00be2	#433 - remove needless nesting/bloating	6 years ago
dave	1a68a9db36	#433 - Fix conversation page highlight, fetch conversation on converation page	6 years ago
dave	6143b1ce0f	Resolve merge conflict, ... Fix few issues (conversation page highlight, fetch conversation, ...)	6 years ago
Henry Jameson	50960c7cfc	Merge remote-tracking branch 'upstream/develop' into mastoapi/followers ... * 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 ...	6 years ago
shpuld	b13a751926	start creating gesture service	6 years ago
HJ	854d0e8051	Merge branch 'mastoapi/convos' into 'develop' ... Fetching convos via MastoAPI See merge request pleroma/pleroma-fe!662	6 years ago
Henry Jameson	cb122e3a99	review	6 years ago
Henry Jameson	3b5fc88989	Merge remote-tracking branch 'upstream/develop' into mastoapi/convos ... * 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 ...	6 years ago
Shpuld Shpludson	b02085f2ef	Merge branch 'issue-450-user-data-populate' into 'develop' ... #450 - dispatch login after saved state is loaded Closes #450 See merge request pleroma/pleroma-fe!701	6 years ago
Shpuld Shpludson	57b82e9236	Merge branch 'file-paste' into 'develop' ... #455 - prevent text pasting if image is pasted Closes #455 See merge request pleroma/pleroma-fe!705	6 years ago
Shpuld Shpludson	182eab051d	Merge branch 'develop' into 'develop' ... Remove border radius of suggested emojis See merge request pleroma/pleroma-fe!704	6 years ago
HJ	153ad57007	Merge branch '435-mastoapi-composing-new-post' into 'develop' ... Transition to MastoAPI: composing new status and media upload Closes #435 See merge request pleroma/pleroma-fe!686	6 years ago
taehoon	932652e335	Update attachment normalizer	6 years ago
dave	6a9159b255	#433 - fix broken conversation page	6 years ago
dave	4cec0d589d	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form	6 years ago
taehoon	6fdbc182ca	Add fallback for attachments uploaded via the other platforms	6 years ago
taehoon	909c315a44	Get correct mimetype through entity_normalizer	6 years ago
taehoon	966add1b29	Set default parameter	6 years ago
taehoon	9802344603	Switch to mastoapi for posting status and uploading media	6 years ago
HJ	01d0531699	Merge branch '227-manage-blocks-mutes' into 'develop' ... Transition to MastoAPI: Mute & Block and Add Mutes management tab See merge request pleroma/pleroma-fe!611	6 years ago
taehoon	f03747e841	Revert changes	6 years ago