 HJ
|
f6e779a084
Merge branch 'masto-api/direct' into 'develop'
|
5 years ago |
|
HJ
|
ea50f55148
Merge branch 'develop' into 'masto-api/direct'
|
5 years ago |
|
HJ
|
3870adf51f
Merge branch 'mastoapi/friends-tl' into 'develop'
|
5 years ago |
|
Exilat
|
e1e0b8b254
Update oc.json for !611 and !691
|
5 years ago |
|
dave
|
0e2931e7de
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form
|
5 years ago |
|
Shpuld Shpludson
|
85e9e52090
Merge branch 'fix/add-await-to-login-request' into 'develop'
|
5 years ago |
|
jared
|
37b33fc615
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into 255-emoji-input
|
5 years ago |
|
dave
|
578b412177
#457 - merge develop and resolve conflict
|
5 years ago |
|
Henry Jameson
|
b3a6bec17b
Revert "Merge branch 'revert-987b5162' into 'develop'"
|
5 years ago |
|
HJ
|
e750b2f197
Merge branch 'mastoapi/public-tl' into 'develop'
|
5 years ago |
|
HJ
|
96753e6a5f
Merge branch 'revert-987b5162' into 'develop'
|
5 years ago |
|
HJ
|
95459ff0bc
Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
|
5 years ago |
|
jasper
|
2d05aef24b
Add await to login action'
|
5 years ago |
|
jasper
|
26955af60b
Remove console log
|
5 years ago |
|
jasper
|
ab99d5ef95
Fix warnings in user profile routing
|
5 years ago |
|
shpuld
|
c50e64f8ee
Add tests for gesture service, fix bug with perpendicular directions
|
5 years ago |
|
jared
|
8fe9101f0b
#255 - clean up autocomplete form
|
5 years ago |
|
jared
|
6dc2cedab0
#255 - clean up user settings page with self-closing html tags
|
5 years ago |
|
jared
|
2927454233
#255 - support textarea and update user settings page
|
5 years ago |
|
Shpuld Shpludson
|
987b5162a7
Merge branch 'mastoapi/friends-tl' into 'develop'
|
5 years ago |
|
dave
|
982be05873
#457 - update tag timeline endpoint to MastoAPI
|
5 years ago |
|
dave
|
5fd589d5e7
merge develop & resolve conflict
|
5 years ago |
|
jared
|
441deb405d
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into 255-emoji-input
|
5 years ago |
|
jared
|
b97a033839
#255 - add emoji input component
|
5 years ago |
|
HJ
|
2f1e690478
Merge branch 'issue-442-placeholder-fix' into 'develop'
|
5 years ago |
|
shpuld
|
e23c19468a
somewhat functioning gesture service
|
5 years ago |
|
dave
|
467647d5d7
#433 - fix retweet abnormal behavior
|
5 years ago |
|
HJ
|
04217fc660
Merge branch 'develop' into 'mastoapi/friends-tl'
|
5 years ago |
|
Henry Jameson
|
d766059dee
correctly update relationship on follow/unfollow
|
5 years ago |
|
Henry Jameson
|
82f077feb9
fixup! Merge remote-tracking branch 'upstream/develop' into mastoapi/actions
|
5 years ago |
|
Henry Jameson
|
0ffd43954e
Merge remote-tracking branch 'upstream/develop' into mastoapi/actions
|
5 years ago |
|
dave
|
c5ec4829a7
#433 - consider page on focused
|
5 years ago |
|
HJ
|
3025532ecf
Merge branch 'develop' into 'mastoapi/public-tl'
|
5 years ago |
|
Henry Jameson
|
72749834f3
Merge remote-tracking branch 'upstream/develop' into masto-api/direct
|
5 years ago |
|
Henry Jameson
|
968e6c7fe8
correctly paginate on MastoAPI
|
5 years ago |
|
dave
|
73dfb00be2
#433 - remove needless nesting/bloating
|
5 years ago |
|
dave
|
1a68a9db36
#433 - Fix conversation page highlight, fetch conversation on converation page
|
5 years ago |
|
dave
|
6143b1ce0f
Resolve merge conflict,
|
5 years ago |
|
Henry Jameson
|
50960c7cfc
Merge remote-tracking branch 'upstream/develop' into mastoapi/followers
|
5 years ago |
|
shpuld
|
b13a751926
start creating gesture service
|
5 years ago |
|
HJ
|
854d0e8051
Merge branch 'mastoapi/convos' into 'develop'
|
5 years ago |
|
Henry Jameson
|
cb122e3a99
review
|
5 years ago |
|
Henry Jameson
|
3b5fc88989
Merge remote-tracking branch 'upstream/develop' into mastoapi/convos
|
5 years ago |
|
Shpuld Shpludson
|
b02085f2ef
Merge branch 'issue-450-user-data-populate' into 'develop'
|
5 years ago |
|
Shpuld Shpludson
|
57b82e9236
Merge branch 'file-paste' into 'develop'
|
5 years ago |
|
Shpuld Shpludson
|
182eab051d
Merge branch 'develop' into 'develop'
|
5 years ago |
|
HJ
|
153ad57007
Merge branch '435-mastoapi-composing-new-post' into 'develop'
|
5 years ago |
|
taehoon
|
932652e335
Update attachment normalizer
|
5 years ago |
|
dave
|
6a9159b255
#433 - fix broken conversation page
|
5 years ago |
|
dave
|
4cec0d589d
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form
|
5 years ago |
