sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity
4,422 Commits 159 Branches 3 Tags 443 MiB
Commit Graph

4422 Commits

Author SHA1 Message Date
Your New SJW Waifu 9971ece384 Revert "Revert "Revert "Merge remote-tracking branch 'upstream/develop' into neckbeard""" 
This reverts commit c4e091f969.
 2020-05-08 20:03:34 -05:00
Your New SJW Waifu c4e091f969 Revert "Revert "Merge remote-tracking branch 'upstream/develop' into neckbeard"" 
This reverts commit 07e9ce3d08.
 2020-05-08 20:01:59 -05:00
Your New SJW Waifu 07e9ce3d08 Revert "Merge remote-tracking branch 'upstream/develop' into neckbeard" 
This reverts commit 4250541faf
 2020-05-09 00:58:11 +00:00
Your New SJW Waifu 571985d86d update favicons 2020-05-08 17:38:45 -05:00
Your New SJW Waifu 4250541faf Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-05-08 17:38:09 -05:00
Shpuld Shpuldson 7a0e554daf update changelog 2020-05-08 13:25:18 +03:00
Shpuld Shpludson 47c56ffa1c Merge branch 'feat/relationship-refactor' into 'develop' 
Refactor: make relationships separate from users

Closes #819

See merge request pleroma/pleroma-fe!1091
 2020-05-08 09:14:26 +00:00
Shpuld Shpludson 1186205583 Merge branch 'develop' into 'feat/relationship-refactor' 
# Conflicts:
#   src/components/notification/notification.js
 2020-05-08 08:35:30 +00:00
Shpuld Shpludson 921eedfd84 Merge branch 'feat/status-content-separation' into 'develop' 
Refactor: Separate status content from status

See merge request pleroma/pleroma-fe!1092
 2020-05-08 08:33:55 +00:00
Shpuld Shpludson ec7bee6bd6 Merge branch 'feature/copy-link' into 'develop' 
Copy status link to clipboard

See merge request pleroma/pleroma-fe!1085
 2020-05-08 08:33:20 +00:00
Shpuld Shpludson f4676e17d3 Merge branch 'develop' into 'feature/copy-link' 
# Conflicts:
#   static/fontello.json
 2020-05-08 08:20:03 +00:00
Shpuld Shpuldson ddc3b86d24 fix popover not closing on pressing the buttons 2020-05-08 10:46:00 +03:00
Mark Felder 41fc26869f Correctly resolve the URI of the server 2020-05-07 16:33:21 -05:00
Shpuld Shpuldson 93baa8b664 fix gap when not logged in 2020-05-08 00:10:49 +03:00
Shpuld Shpludson f40de85b92 Merge branch 'fix/signup-without-email' into 'develop' 
Permit signup without email

See merge request pleroma/pleroma-fe!1072
 2020-05-07 21:04:59 +00:00
Shpuld Shpludson 2893834095 Merge branch 'feat/notification-privacy' into 'develop' 
Add notification privacy option to user settings

See merge request pleroma/pleroma-fe!1100
 2020-05-07 20:34:27 +00:00
Your New SJW Waifu 1ca60da3a0 updat favicons 2020-05-07 07:48:41 -05:00
Your New SJW Waifu 9b667a888c Don't inject keywords 2020-05-07 00:21:19 +00:00
Your New SJW Waifu 8bd8b97d14 New banner URL 2020-05-06 23:20:16 +00:00
Mark Felder b3003d4e8d Add notification privacy option to user settings 2020-05-06 11:46:40 -05:00
Your New SJW Waifu 6f17bf8a45 new stickers 2020-05-06 09:58:28 -05:00
Your New SJW Waifu e9778f3c25 updated favicons 2020-05-06 09:54:18 -05:00
Your New SJW Waifu 550d75a61e commas are a fuck 2020-05-04 14:23:48 -05:00
Your New SJW Waifu 955e7ec49a new stickers 2020-05-04 14:09:23 -05:00
Your New SJW Waifu 74ac1e46b6 new sticker 2020-05-04 13:47:32 -05:00
Your New SJW Waifu e68cc2954e new sticker 2020-05-04 13:26:37 -05:00
Your New SJW Waifu a60475f3d7 Fixed stickers 2020-05-04 13:19:26 -05:00
Your New SJW Waifu 73b613dbb0 New stickers 2020-05-04 13:12:08 -05:00
Your New SJW Waifu c865bdfa4d update favicons 2020-05-04 11:00:01 -05:00
Shpuld Shpuldson f7f8a579fa make email validation conditional work 2020-05-04 12:56:39 +03:00
Shpuld Shpuldson 101eebb40b Merge branch 'develop' into fix/signup-without-email 2020-05-04 11:05:05 +03:00
Your New SJW Waifu 6ff55daabc Update mod tracker 2020-05-02 14:59:04 -05:00
Your New SJW Waifu 668e5ffc0f Update modtracker 2020-05-02 14:49:01 -05:00
Your New SJW Waifu cbfc9dfa9e update favicons 2020-05-02 11:14:41 -05:00
Your New SJW Waifu 0361a4b308 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-05-02 10:56:17 -05:00
Shpuld Shpludson 9b349b4019 Merge branch 'rc/2.0.3' into 'develop' 
update MASTER for 2.0.3

See merge request pleroma/pleroma-fe!1098
 2020-05-02 13:43:22 +00:00
Shpuld Shpludson 2618c1b702 Update CHANGELOG.md 2020-05-02 16:21:46 +03:00
Shpuld Shpuldson b095d2e17e don't dismiss a rejected follow request on server 2020-05-02 16:21:46 +03:00
Shpuld Shpuldson 20b53d58b7 mark single notifs as seen properly on server 2020-05-02 16:21:46 +03:00
Shpuld Shpuldson 36dcfa8cc1 follow request bugfixes, wrong text, notifs not being marked as read, approving from follow request view 2020-05-02 16:21:46 +03:00
eugenijm ab3c0e8512 Add support for follow request notifications 2020-05-02 16:21:46 +03:00
Shpuld Shpludson 4d1a674634 Update CHANGELOG.md 2020-05-02 16:21:46 +03:00
Shpuld Shpludson 372eb723db Update CHANGELOG.md 2020-05-02 16:21:46 +03:00
xenofem fe4282f44b Prioritize custom emoji a lot and boost exact matches to the top 2020-05-02 16:21:46 +03:00
xenofem aef03d53b2 Allow emoji suggestions based on a match anywhere in the emoji name, but improve sorting 2020-05-02 16:21:46 +03:00
xenofem eae0bce320 Refactor status showing/hiding code for better handling of edge cases and easier comprehension 2020-05-02 16:21:46 +03:00
Karol Kosek c4d1c2131c Fix user names with the RTL char in notifications 2020-05-02 16:21:46 +03:00
Egor Kislitsyn 0ba34eeca5 Fix pagination 2020-05-02 16:21:46 +03:00
Shpuld Shpludson 068abb4d26 Update CHANGELOG.md 2020-05-02 13:05:45 +00:00
Shpuld Shpludson 5f90b6a384 Merge branch 'fix/follow-request-notification-bugfixes' into 'develop' 
Fix remaining follow request notif problems

Closes #823

See merge request pleroma/pleroma-fe!1096
 2020-05-02 11:19:05 +00:00