Commit Graph

2913 Commits (1b07c6ae4f0d06e25b124bba2f088d3a02f78ecc)
 

Author SHA1 Message Date
dave 21ea5adc8b #436 - apply patch and clean up
6 years ago
dave b909796683 #436 - update notification
6 years ago
dave 06fd3a9c5f #436 - apply patch
6 years ago
dave ecacc933e7 #436 - keep original naming
6 years ago
dave 0db66e2905 #436 - keep original naming
6 years ago
dave 8efcfc69e8 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
6 years ago
Marcin Mikołajczak 6828c7d74c Update Polish translation
6 years ago
Henry Jameson 0792732822 final touches
6 years ago
Henry Jameson 4dc64438e9 aaaaggghh
6 years ago
Henry Jameson 995daf70b7 fix lint
6 years ago
Henry Jameson 9f4a9bff46 Merge remote-tracking branch 'upstream/develop' into minimal-scopes-mode
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'
6 years ago
Shpuld Shpludson e329a362e0 Merge branch 'fix/warnings-in-user-profile' into 'develop'
6 years ago
dave 783cc00dd0 merge develop & resolve conflict
6 years ago
jasper e6f9b1517b Fix: Change condition
6 years ago
Shpuld Shpludson 25370083b6 Merge branch '255-emoji-input' into 'develop'
6 years ago
shpuld c06bcf3303 add gesture to close notifications drawer
6 years ago
shpuld 31010779f6 Merge branch 'develop' into feature/mobile-improvements-3
6 years ago
Shpuld Shpludson c829b1a5f4 Merge branch 'feat/gesture-service' into 'develop'
6 years ago
shpuld 1e2c304f76 fix typo
6 years ago
Shpuld Shpludson ee9aa40001 Merge branch 'issues/#466' into 'develop'
6 years ago
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