2626 Commits (995daf70b731f33c95ca654ee9daccb399d6c92d)

 

All Branches   

Search

Author	SHA1	Message	Date
Henry Jameson	995daf70b7	fix lint	6 years ago
Henry Jameson	9f4a9bff46	Merge remote-tracking branch 'upstream/develop' into minimal-scopes-mode ... * 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 ...	6 years ago
Henry Jameson	e89a622005	fix formatting	6 years ago
Henry Jameson	beaf4fcf8a	fix formatting	6 years ago
Henry Jameson	bf927122df	Review	6 years ago
Shpuld Shpludson	0117f6af9f	Merge branch 'issues/#465' into 'develop' ... update store according to retweeted status Closes #465 See merge request pleroma/pleroma-fe!713	6 years ago
Shpuld Shpludson	e329a362e0	Merge branch 'fix/warnings-in-user-profile' into 'develop' ... #461 Fix warnings about user-profile Closes #461 See merge request pleroma/pleroma-fe!708	6 years ago
jasper	e6f9b1517b	Fix: Change condition	6 years ago
Shpuld Shpludson	25370083b6	Merge branch '255-emoji-input' into 'develop' ... #255 - add emoji input component Closes #255 See merge request pleroma/pleroma-fe!706	6 years ago
Shpuld Shpludson	c829b1a5f4	Merge branch 'feat/gesture-service' into 'develop' ... Add a gesture service for easier touch gestures See merge request pleroma/pleroma-fe!714	6 years ago
shpuld	1e2c304f76	fix typo	6 years ago
Shpuld Shpludson	ee9aa40001	Merge branch 'issues/#466' into 'develop' ... show replies count right after reply icon Closes #466 See merge request pleroma/pleroma-fe!716	6 years ago
Shpuld Shpludson	7e8c2acc98	Merge branch 'issue-433-status-reply-form' into 'develop' ... Issue 433 status reply form Closes #433 See merge request pleroma/pleroma-fe!674	6 years ago
Brenden Bice	8e4ddcb843	update store according to retweeted status	6 years ago
dave	a39fc49e84	#433 - update sort by for conversation	6 years ago
dave	e24145e233	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form	6 years ago
Brenden Bice	6b5a84e2b3	display replies_count right after reply icon	6 years ago
Brenden Bice	95639fbd63	expose replies_count from mastodon api	6 years ago
HJ	e2e3a65c44	Merge branch 'fix/convos-masto' into 'develop' ... Apparently, MastoAPI gives status in ancestors if you try opening a repeat... Closes #460 See merge request pleroma/pleroma-fe!715	6 years ago
Henry Jameson	31a71ee3ee	Apparently, MastoAPI gives status in ancestors if you try opening a repeat...	6 years ago
HJ	86696167b7	Merge branch 'issue-457-mastodon-tag-timeline' into 'develop' ... #457 - update tag timeline endpoint to MastoAPI Closes #457 See merge request pleroma/pleroma-fe!707	6 years ago
shpuld	0eff4bd0ac	make side drawer use gesture service and fix its animations	6 years ago
dave	30084a1204	merge develop and resolve conflict	6 years ago
HJ	aed0943678	Merge branch 'mastoapi/actions' into 'develop' ... transition to MastoAPI: Basic user/statuses manipulation See merge request pleroma/pleroma-fe!669	6 years ago
Henry Jameson	66ab131bd4	Merge remote-tracking branch 'upstream/develop' into mastoapi/actions ... * 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	6 years ago
HJ	4d66b9cf45	Merge branch 'mastoapi/followers' into 'develop' ... MastoAPI support for followers/friends(following) See merge request pleroma/pleroma-fe!667	6 years ago
Henry Jameson	c2c7e12aad	review/remove error hiding	6 years ago
Henry Jameson	a5e71d1dd1	Merge remote-tracking branch 'upstream/develop' into mastoapi/followers ... * 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	6 years ago
Henry Jameson	ff18e339cf	Merge remote-tracking branch 'upstream/develop' into mastoapi/followers ... * 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	6 years ago
Henry Jameson	0a031aae20	errata	6 years ago
Henry Jameson	fb2aca06de	review	6 years ago
dave	43e97e590c	#433 - sort conversation for retweets and clean up	6 years ago
HJ	f6e779a084	Merge branch 'masto-api/direct' into 'develop' ... switch direct messages to mastoapi See merge request pleroma/pleroma-fe!649	6 years ago
HJ	ea50f55148	Merge branch 'develop' into 'masto-api/direct' ... # Conflicts: # src/services/api/api.service.js	6 years ago
HJ	3870adf51f	Merge branch 'mastoapi/friends-tl' into 'develop' ... Mastoapi/friends tl See merge request pleroma/pleroma-fe!711	6 years ago
dave	0e2931e7de	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form	6 years ago
Shpuld Shpludson	85e9e52090	Merge branch 'fix/add-await-to-login-request' into 'develop' ... !701 Add await to login action in after_store See merge request pleroma/pleroma-fe!709	6 years ago
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