Commit Graph

2739 Commits (787737c80d8b815209539f159449efee677bd5d9)
 

Author SHA1 Message Date
Shpuld Shpludson 7e8c2acc98 Merge branch 'issue-433-status-reply-form' into 'develop'
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'
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'
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'
6 years ago
Henry Jameson 66ab131bd4 Merge remote-tracking branch 'upstream/develop' into mastoapi/actions
6 years ago
HJ 4d66b9cf45 Merge branch 'mastoapi/followers' into 'develop'
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
6 years ago
Henry Jameson ff18e339cf Merge remote-tracking branch 'upstream/develop' into mastoapi/followers
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'
6 years ago
HJ ea50f55148 Merge branch 'develop' into 'masto-api/direct'
6 years ago
HJ 3870adf51f Merge branch 'mastoapi/friends-tl' into 'develop'
6 years ago
Exilat e1e0b8b254 Update oc.json for !611 and !691
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'
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'"
6 years ago
HJ e750b2f197 Merge branch 'mastoapi/public-tl' into 'develop'
6 years ago
HJ 96753e6a5f Merge branch 'revert-987b5162' into 'develop'
6 years ago
HJ 95459ff0bc Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
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'
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'
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'
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