Commit Graph

2952 Commits (9a9d66dca18fa270a28905fcb0a89ad8a649f925)
 

Author SHA1 Message Date
dave b0da32fea2 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
6 years ago
Shpuld Shpludson 2f725c570b Merge branch 'debug_message' into 'develop'
6 years ago
Maksim 7259e02a10 remove debug message
6 years ago
Shpuld Shpludson 8c7f765dff Merge branch 'issue-469-safe-dm-from-BE' into 'develop'
6 years ago
jasper 1c04cd2036 Add space
6 years ago
jasper a1275be4c0 Separate timeline and notification
6 years ago
jasper 7c2b65e9a3 Remove useless codes
6 years ago
jasper ea27483f27 Fix notification bugs
6 years ago
dave fe756fe30d #436 - revert stripe html for notification
6 years ago
dave 6ed26ce65d #436 - notification html to text content
6 years ago
dave 6fa014505c #436 - revert notification silience config
6 years ago
dave 70071b870f #469 - update text copy
6 years ago
dave 67258571c5 #469 - update behavior of safe_dm
6 years ago
dave 9d5ed04147 #469 - clean up
6 years ago
dave c9a9b3122d #469 - DM warning text should vary based on BE setting
6 years ago
dave 8b3f037f87 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
6 years ago
eugenijm 6b6878bde0 Added moderation menu
6 years ago
Shpuld Shpludson ac28e8c2f9 Merge branch 'feature/mobile-improvements-3' into 'develop'
6 years ago
Shpuld Shpludson a595febcb8 Merge branch 'develop' into 'develop'
6 years ago
shpuld 89c9448532 fix conflict
6 years ago
Shpuld Shpludson ae3b92ce85 Merge branch 'fix/sending-requests-when-loading' into 'develop'
6 years ago
Shpuld Shpludson 3b38e1b8a7 Merge branch 'patch-2' into 'develop'
6 years ago
shpuld 46de457f50 Merge branch 'develop' into feature/mobile-improvements-3
6 years ago
shpuld 2879495b8a remove window width copypasta
6 years ago
Shpuld Shpludson df366a586d Merge branch '471-timeline-since-id' into 'develop'
6 years ago
HJ 3c2931529e Merge branch 'minimal-scopes-mode' into 'develop'
6 years ago
jasper 90939f198b Fix login handling
6 years ago
HJ c17de4b638 Merge branch '470-toggle-subject-content' into 'develop'
6 years ago
jasper 8fc10dc177 Add Promise.all to send requests when loading
6 years ago
jared d856c2745c #471 - fix timeline fetch with since_id
6 years ago
jared dee9ab7bda #470 - update button text capitalization
6 years ago
jared 487a194f6d #470 - handle cases without subject
6 years ago
jared 6847e70a49 #470 - update i18n
6 years ago
jared 748b1ed167 #470 - fix subject and content toggle issue
6 years ago
dave 6482201dc9 #436 - sync notification & timeline users
6 years ago
dave 0af2f8e4fd #436 - merge develop & resolve conflict
6 years ago
Shpuld Shpludson 6c24ae9b0b Merge branch 'fix/user-card-buttons' into 'develop'
6 years ago
jasper 80277e5571 Remove useless comma
6 years ago
jasper 4a2f676f2e Fix user card in notification
6 years ago
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