 HJ
|
84505e01f5
Merge branch 'issue-436-mastoapi-notifications' into 'develop'
|
5 years ago |
|
dave
|
76cd01e99b
#436 - remove yarn.lock
|
5 years ago |
|
dave
|
40e9eebf91
#436 - merge develop
|
5 years ago |
|
HJ
|
d94a7b6318
Merge branch 'fix-local' into 'develop'
|
5 years ago |
|
Henry Jameson
|
18cb97a2bd
Fix wrong local
|
5 years ago |
|
Shpuld Shpludson
|
ed3aceff5c
Merge branch 'mastoapi/update-extension-support' into 'develop'
|
5 years ago |
|
Shpuld Shpludson
|
25601c6873
Merge branch 'fix-emoji-picker' into 'develop'
|
5 years ago |
|
Henry Jameson
|
a25aabfa10
support new custom emoji format
|
5 years ago |
|
dave
|
d498a26af5
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
|
5 years ago |
|
Henry Jameson
|
dfd89b0bbc
revert, it's still missing
|
5 years ago |
|
Henry Jameson
|
d95fc02810
add support for pleroma-specific fields
|
5 years ago |
|
Shpuld Shpludson
|
d7cf841dfe
Merge branch '486-expand-button' into 'develop'
|
5 years ago |
|
jared
|
5df049ca31
#486 - remove expand button on conversation page
|
5 years ago |
|
Shpuld Shpludson
|
b3ace226fb
Merge branch 'fix/prevent-repeated-fetching' into 'develop'
|
5 years ago |
|
jasper
|
011f04c196
fix small bug
|
5 years ago |
|
jasper
|
b7d7c21617
Add await to login befor redirect to friends timeline
|
5 years ago |
|
jasper
|
1570e779b1
Prevent repeated fetching
|
5 years ago |
|
Shpuld Shpludson
|
1e9ddcb0da
Merge branch 'fix/notification-bugs' into 'develop'
|
5 years ago |
|
dave
|
d3218807b4
#436 - merge develop
|
5 years ago |
|
Shpuld Shpludson
|
546ced43d9
Merge branch 'moderation-menu' into 'develop'
|
5 years ago |
|
dave
|
b0da32fea2
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
|
5 years ago |
|
Shpuld Shpludson
|
2f725c570b
Merge branch 'debug_message' into 'develop'
|
5 years ago |
|
Maksim
|
7259e02a10
remove debug message
|
5 years ago |
|
Henry Jameson
|
6471bec0d9
update node
|
5 years ago |
|
Henry Jameson
|
5d2177a048
fix obvious bug
|
5 years ago |
|
Henry Jameson
|
9108737d55
Webpack 4, ESLint with Vue, Node-sass, updated dependencies overall. New linting.
|
5 years ago |
|
Shpuld Shpludson
|
8c7f765dff
Merge branch 'issue-469-safe-dm-from-BE' into 'develop'
|
5 years ago |
|
jasper
|
1c04cd2036
Add space
|
5 years ago |
|
jasper
|
a1275be4c0
Separate timeline and notification
|
5 years ago |
|
jasper
|
7c2b65e9a3
Remove useless codes
|
5 years ago |
|
jasper
|
ea27483f27
Fix notification bugs
|
5 years ago |
|
dave
|
fe756fe30d
#436 - revert stripe html for notification
|
5 years ago |
|
dave
|
6ed26ce65d
#436 - notification html to text content
|
5 years ago |
|
dave
|
6fa014505c
#436 - revert notification silience config
|
5 years ago |
|
dave
|
70071b870f
#469 - update text copy
|
5 years ago |
|
dave
|
67258571c5
#469 - update behavior of safe_dm
|
5 years ago |
|
dave
|
9d5ed04147
#469 - clean up
|
5 years ago |
|
dave
|
c9a9b3122d
#469 - DM warning text should vary based on BE setting
|
5 years ago |
|
dave
|
8b3f037f87
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
|
5 years ago |
|
eugenijm
|
6b6878bde0
Added moderation menu
|
5 years ago |
|
Shpuld Shpludson
|
ac28e8c2f9
Merge branch 'feature/mobile-improvements-3' into 'develop'
|
5 years ago |
|
Shpuld Shpludson
|
a595febcb8
Merge branch 'develop' into 'develop'
|
5 years ago |
|
shpuld
|
89c9448532
fix conflict
|
5 years ago |
|
Shpuld Shpludson
|
ae3b92ce85
Merge branch 'fix/sending-requests-when-loading' into 'develop'
|
5 years ago |
|
Shpuld Shpludson
|
3b38e1b8a7
Merge branch 'patch-2' into 'develop'
|
5 years ago |
|
shpuld
|
46de457f50
Merge branch 'develop' into feature/mobile-improvements-3
|
5 years ago |
|
shpuld
|
2879495b8a
remove window width copypasta
|
5 years ago |
|
Shpuld Shpludson
|
df366a586d
Merge branch '471-timeline-since-id' into 'develop'
|
5 years ago |
|
HJ
|
3c2931529e
Merge branch 'minimal-scopes-mode' into 'develop'
|
5 years ago |
|
jasper
|
90939f198b
Fix login handling
|
5 years ago |
