moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,913 Commits 70 Branches 19 Tags 22 MiB
Commit Graph

2913 Commits

Author SHA1 Message Date
Henry Jameson dfd89b0bbc revert, it's still missing 2019-04-09 22:28:36 +03:00
Henry Jameson d95fc02810 add support for pleroma-specific fields 2019-04-09 22:26:57 +03:00
Shpuld Shpludson d7cf841dfe Merge branch '486-expand-button' into 'develop' 
#486 - remove expand button on conversation page

Closes #486

See merge request pleroma/pleroma-fe!742
 2019-04-09 18:52:18 +00:00
jared 5df049ca31 #486 - remove expand button on conversation page 2019-04-09 14:10:51 -04:00
Shpuld Shpludson b3ace226fb Merge branch 'fix/prevent-repeated-fetching' into 'develop' 
#485 Prevent repeated fetching

Closes #485

See merge request pleroma/pleroma-fe!738
 2019-04-09 18:05:46 +00:00
jasper 011f04c196 fix small bug 2019-04-09 09:19:48 -07:00
jasper b7d7c21617 Add await to login befor redirect to friends timeline 2019-04-09 08:57:41 -07:00
jasper 1570e779b1 Prevent repeated fetching 2019-04-09 08:38:13 -07:00
Shpuld Shpludson 1e9ddcb0da Merge branch 'fix/notification-bugs' into 'develop' 
#474 Fix notification bugs

Closes #474

See merge request pleroma/pleroma-fe!728
 2019-04-09 15:24:33 +00:00
dave d3218807b4 #436 - merge develop 2019-04-08 21:04:59 -04:00
Shpuld Shpludson 546ced43d9 Merge branch 'moderation-menu' into 'develop' 
Moderation menu #310

See merge request pleroma/pleroma-fe!595
 2019-04-08 19:01:40 +00:00
dave b0da32fea2 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications 2019-04-08 14:29:12 -04:00
Shpuld Shpludson 2f725c570b Merge branch 'debug_message' into 'develop' 
remove debug message

See merge request pleroma/pleroma-fe!735
 2019-04-08 16:49:52 +00:00
Maksim 7259e02a10 remove debug message 2019-04-08 16:49:51 +00:00
Shpuld Shpludson 8c7f765dff Merge branch 'issue-469-safe-dm-from-BE' into 'develop' 
Issue 469 safe dm from be

Closes #469

See merge request pleroma/pleroma-fe!726
 2019-04-04 19:38:03 +00:00
jasper 1c04cd2036 Add space 2019-04-04 09:06:53 -07:00
jasper a1275be4c0 Separate timeline and notification 2019-04-04 09:03:56 -07:00
jasper 7c2b65e9a3 Remove useless codes 2019-04-03 09:08:23 -07:00
jasper ea27483f27 Fix notification bugs 2019-04-03 09:04:46 -07:00
dave fe756fe30d #436 - revert stripe html for notification 2019-04-03 11:17:23 -04:00
dave 6ed26ce65d #436 - notification html to text content 2019-04-03 10:58:39 -04:00
dave 6fa014505c #436 - revert notification silience config 2019-04-03 10:53:11 -04:00
dave 70071b870f #469 - update text copy 2019-04-02 12:46:22 -04:00
dave 67258571c5 #469 - update behavior of safe_dm 2019-04-02 11:19:45 -04:00
dave 9d5ed04147 #469 - clean up 2019-04-02 10:28:38 -04:00
dave c9a9b3122d #469 - DM warning text should vary based on BE setting 2019-04-02 10:26:14 -04:00
dave 8b3f037f87 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications 2019-04-02 10:07:36 -04:00
eugenijm 6b6878bde0 Added moderation menu 2019-04-01 23:30:06 +03:00
Shpuld Shpludson ac28e8c2f9 Merge branch 'feature/mobile-improvements-3' into 'develop' 
Mobile notifications in nav bar, separate mobile navbar to its own component

See merge request pleroma/pleroma-fe!703
 2019-04-01 19:57:31 +00:00
Shpuld Shpludson a595febcb8 Merge branch 'develop' into 'develop' 
[i18n] Update oc.json for !611 and !691

See merge request pleroma/pleroma-fe!712
 2019-04-01 19:49:16 +00:00
shpuld 89c9448532 fix conflict 2019-04-01 22:47:37 +03:00
Shpuld Shpludson ae3b92ce85 Merge branch 'fix/sending-requests-when-loading' into 'develop' 
#463 Add Promise.all to send requests when loading

Closes #463

See merge request pleroma/pleroma-fe!723
 2019-04-01 19:45:08 +00:00
Shpuld Shpludson 3b38e1b8a7 Merge branch 'patch-2' into 'develop' 
Update Polish translation

See merge request pleroma/pleroma-fe!719
 2019-04-01 19:44:11 +00:00
shpuld 46de457f50 Merge branch 'develop' into feature/mobile-improvements-3 2019-04-01 22:42:06 +03:00
shpuld 2879495b8a remove window width copypasta 2019-04-01 22:41:34 +03:00
Shpuld Shpludson df366a586d Merge branch '471-timeline-since-id' into 'develop' 
#471 - fix timeline fetch with since_id

Closes #471

See merge request pleroma/pleroma-fe!722
 2019-04-01 19:33:45 +00:00
HJ 3c2931529e Merge branch 'minimal-scopes-mode' into 'develop' 
Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode

See merge request pleroma/pleroma-fe!633
 2019-04-01 19:32:37 +00:00
jasper 90939f198b Fix login handling 2019-04-01 12:32:13 -07:00
HJ c17de4b638 Merge branch '470-toggle-subject-content' into 'develop' 
Resolve "Handling subjects/spoiler_text/cw not working properly"

Closes #470

See merge request pleroma/pleroma-fe!721
 2019-04-01 18:45:24 +00:00
jasper 8fc10dc177 Add Promise.all to send requests when loading 2019-04-01 10:46:30 -07:00
jared d856c2745c #471 - fix timeline fetch with since_id 2019-04-01 13:25:48 -04:00
jared dee9ab7bda #470 - update button text capitalization 2019-04-01 13:04:40 -04:00
jared 487a194f6d #470 - handle cases without subject 2019-04-01 13:01:28 -04:00
jared 6847e70a49 #470 - update i18n 2019-04-01 12:58:23 -04:00
jared 748b1ed167 #470 - fix subject and content toggle issue 2019-04-01 12:54:34 -04:00
dave 6482201dc9 #436 - sync notification & timeline users 2019-04-01 12:22:49 -04:00
dave 0af2f8e4fd #436 - merge develop & resolve conflict 2019-04-01 12:13:11 -04:00
Shpuld Shpludson 6c24ae9b0b Merge branch 'fix/user-card-buttons' into 'develop' 
#467 Fix/Muted and Blocked not "pressed" on User Card

Closes #467

See merge request pleroma/pleroma-fe!720
 2019-04-01 15:38:14 +00:00
jasper 80277e5571 Remove useless comma 2019-04-01 07:27:12 -07:00
jasper 4a2f676f2e Fix user card in notification 2019-04-01 07:26:13 -07:00