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		2019-03-27 22:24:38 +02:00
..
assets	Use an existing image served by backend instead	2019-02-03 13:30:54 -05:00
boot	Add await to login action'	2019-03-26 14:26:26 -07:00
components	Merge branch 'issue-442-placeholder-fix' into 'develop'	2019-03-25 22:29:17 +00:00
hocs	Use native filter function	2019-02-28 12:41:20 -05:00
i18n	Merge branch 'issue-442-placeholder-fix' into 'develop'	2019-03-25 22:29:17 +00:00
lib	Add await to login action'	2019-03-26 14:26:26 -07:00
modules	Merge remote-tracking branch 'upstream/develop' into mastoapi/actions	2019-03-27 22:24:38 +02:00
services	Merge remote-tracking branch 'upstream/develop' into mastoapi/actions	2019-03-27 22:24:38 +02:00
_variables.scss	Make role badge visible only on user profile page	2019-02-06 18:07:37 +03:00
App.js	Add floating post-status button on mobile	2019-03-11 16:51:37 +00:00
App.scss	Make select tag use --inputText as text color	2019-03-20 11:52:58 +00:00
App.vue	Add floating post-status button on mobile	2019-03-11 16:51:37 +00:00
main.js	Load persistedStated with async/await.	2019-03-13 11:29:45 +01:00
sw.js	add checkbox to disable web push	2018-12-13 00:03:50 +07:00