 jared
|
3172b4e7c1
#101 - insert emoji from emoji selector
|
5 years ago |
|
jared
|
f9071dac25
#101 - show emojis in groups, clean up
|
5 years ago |
|
jared
|
2c4e80aab3
#101 - add emoji selector basic mockup
|
5 years ago |
|
Shpuld Shpludson
|
0117f6af9f
Merge branch 'issues/#465' into 'develop'
|
5 years ago |
|
Shpuld Shpludson
|
e329a362e0
Merge branch 'fix/warnings-in-user-profile' into 'develop'
|
5 years ago |
|
dave
|
783cc00dd0
merge develop & resolve conflict
|
5 years ago |
|
jasper
|
e6f9b1517b
Fix: Change condition
|
5 years ago |
|
Shpuld Shpludson
|
25370083b6
Merge branch '255-emoji-input' into 'develop'
|
5 years ago |
|
shpuld
|
c06bcf3303
add gesture to close notifications drawer
|
5 years ago |
|
shpuld
|
31010779f6
Merge branch 'develop' into feature/mobile-improvements-3
|
5 years ago |
|
Shpuld Shpludson
|
c829b1a5f4
Merge branch 'feat/gesture-service' into 'develop'
|
5 years ago |
|
shpuld
|
1e2c304f76
fix typo
|
5 years ago |
|
Shpuld Shpludson
|
ee9aa40001
Merge branch 'issues/#466' into 'develop'
|
5 years ago |
|
Shpuld Shpludson
|
7e8c2acc98
Merge branch 'issue-433-status-reply-form' into 'develop'
|
5 years ago |
|
Brenden Bice
|
8e4ddcb843
update store according to retweeted status
|
5 years ago |
|
dave
|
a39fc49e84
#433 - update sort by for conversation
|
5 years ago |
|
dave
|
e24145e233
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form
|
5 years ago |
|
Brenden Bice
|
6b5a84e2b3
display replies_count right after reply icon
|
5 years ago |
|
Brenden Bice
|
95639fbd63
expose replies_count from mastodon api
|
5 years ago |
|
HJ
|
e2e3a65c44
Merge branch 'fix/convos-masto' into 'develop'
|
5 years ago |
|
Henry Jameson
|
31a71ee3ee
Apparently, MastoAPI gives status in ancestors if you try opening a repeat...
|
5 years ago |
|
HJ
|
86696167b7
Merge branch 'issue-457-mastodon-tag-timeline' into 'develop'
|
5 years ago |
|
shpuld
|
0eff4bd0ac
make side drawer use gesture service and fix its animations
|
5 years ago |
|
dave
|
30084a1204
merge develop and resolve conflict
|
5 years ago |
|
HJ
|
aed0943678
Merge branch 'mastoapi/actions' into 'develop'
|
5 years ago |
|
Henry Jameson
|
66ab131bd4
Merge remote-tracking branch 'upstream/develop' into mastoapi/actions
|
5 years ago |
|
HJ
|
4d66b9cf45
Merge branch 'mastoapi/followers' into 'develop'
|
5 years ago |
|
Henry Jameson
|
c2c7e12aad
review/remove error hiding
|
5 years ago |
|
Henry Jameson
|
a5e71d1dd1
Merge remote-tracking branch 'upstream/develop' into mastoapi/followers
|
5 years ago |
|
Henry Jameson
|
ff18e339cf
Merge remote-tracking branch 'upstream/develop' into mastoapi/followers
|
5 years ago |
|
Henry Jameson
|
0a031aae20
errata
|
5 years ago |
|
Henry Jameson
|
fb2aca06de
review
|
5 years ago |
|
dave
|
43e97e590c
#433 - sort conversation for retweets and clean up
|
5 years ago |
|
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 |
