Shpuld Shpuldson
f8cf92a01f
Merge branch 'develop' into kPherox/pleroma-fe-iss-149/profile-fields-display
2020-06-17 11:23:32 +03:00
lain
f197a2aa39
EntityNormalizer: Add colons to emoji alt text.
...
This makes it possible to copy them and still have them work.
2020-06-04 15:12:03 +02: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
eugenijm
01b07f01e9
Add support for follow request notifications
2020-04-30 09:58:55 +03:00
Shpuld Shpuldson
ca00e93b60
minor fixes
2020-04-23 14:27:27 +03:00
Shpuld Shpuldson
cda298c822
remove unused mutation and test for it
2020-04-23 11:17:52 +03:00
Shpuld Shpuldson
4b7007bc7d
fix mistakes
2020-04-21 23:56:48 +03:00
Shpuld Shpuldson
6bb75a3a6d
make relationships separate from users
2020-04-21 23:27:51 +03:00
kPherox
da55b0d435
Add fields_text for tooltip
2020-02-19 20:57:58 +09:00
Shpuld Shpludson
f6b482be51
Emoji Reactions - fixes and improvements
2020-02-11 12:24:51 +00:00
Shpuld Shpludson
17b6d8ddb8
Merge branch 'move-type-notification' into 'develop'
...
Add setting for allow following move
Closes #732
See merge request pleroma/pleroma-fe!1054
2020-02-10 14:51:35 +00:00
kPherox
9bbf10b55d
Add setting for allow_following_move
2020-02-04 04:54:28 +09:00
rinpatch
746416207b
Escape HTML from display name and subject fields
...
Closes #724
2020-01-30 19:58:23 +03:00
Shpuld Shpuldson
6afff4f8c2
review changes
2020-01-28 17:09:25 +02:00
Shpuld Shpuldson
7cfe1b05e8
remove mock data
2020-01-26 15:57:40 +02:00
Shpuld Shpuldson
a018ea622c
change emoji reactions to use new format
2020-01-26 15:45:12 +02:00
kPherox
2bc63720a5
fix parse for move type notifications
2019-12-11 00:00:36 +09:00
kPherox
a55486f8d7
Normalize profile fields
2019-11-19 14:15:41 +00:00
Maksim Pechnikov
541a71c3a5
Merge branch 'develop' into feature/following_reblogs
2019-10-08 16:49:03 +03:00
Henry Jameson
a2923570c3
fix regex shortcode problem
2019-09-30 23:45:03 +03:00
Hakaba Hitoyo
194dd88118
Feature/Add _Allow user discovery services_ preference
2019-09-26 22:31:28 +00:00
eugenijm
aafb29c589
Added a setting to hide follow/follower count from the user profile
2019-09-23 16:19:21 +03:00
Maksim Pechnikov
8721fb57fc
added support hide\show reblogs from a specific user
2019-09-21 16:24:47 +03:00
taehoon
6a3f283256
detect thread-muted posts
2019-09-13 22:59:24 -04:00
rinpatch
766bcc2a72
Fix sent follow request detection
...
This fixes `requestFollow` using the relationship instead of user object,
resulting in `sent` always being false for locked users, and also removes
assumptions about follow request being sent, instead relying on
`requested` from user relationship.
2019-08-09 15:01:13 +03:00
Shpuld Shpludson
92380652fe
Merge branch 'feat/conversation-muting' into 'develop'
...
Add Conversation/Thread Muting
See merge request pleroma/pleroma-fe!876
2019-08-08 10:09:07 +00:00
taehoon
876c6de806
fix typos
2019-07-24 21:02:37 -04:00
Shpuld Shpludson
3370dd80dc
Merge branch 'develop' into 'feat/conversation-muting'
...
# Conflicts:
# src/services/api/api.service.js
2019-07-15 19:09:01 +00:00
taehoon
670cbfdd1c
change subscribing to subscribed
2019-07-10 21:01:07 -04:00
taehoon
f4a16e6541
add subscribing to user entity normalizer
2019-07-10 21:01:07 -04:00
shpuld
7ed9d17ce7
Add thread muting to context menu of status
2019-07-07 23:02:09 +03:00
Eugenij
14ec12b4f6
Set hide_follows and hide_followers settings when parsing Mastodon format
2019-07-07 10:20:55 +00:00
lain
0eed2ccca8
Feature/polls attempt 2
2019-06-18 20:28:31 +00:00
Henry Jameson
6744396f82
getting and setting user background via MastoAPI
2019-06-16 20:17:59 +03:00
HJ
9df99c5205
Merge branch 'masto-login-fixes' into 'develop'
...
MastoAPI login
See merge request pleroma/pleroma-fe!805
2019-06-12 19:42:25 +00:00
HJ
a7b0b07e6f
Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js
2019-06-12 11:44:14 +00:00
kaniini
b4796ccbf6
Merge branch 'feature/notification-controls' into 'develop'
...
wire up notification settings
See merge request pleroma/pleroma-fe!809
2019-06-01 05:16:15 +00:00
taehoon
0532995847
wire up user.description with masto api data
2019-05-29 12:32:14 -04:00
William Pitcock
ac97cd3e46
entity normalizer: collapse data.pleroma if blocks
2019-05-25 22:59:04 +00:00
William Pitcock
28ca504576
wire up notification settings
2019-05-25 07:34:59 +00:00
taehoon
2af35b8404
do not miss statusnet_profile_url of mentions
2019-05-22 23:47:20 -04:00
Henry Jameson
fc12b63fcc
mastoapi login works
2019-05-21 23:35:40 +03:00
Moonman
fc9acf8fb6
add tags to data and to status component
2019-05-20 00:03:50 -04:00
William Pitcock
00ad97fcfa
entity normalizer: add tooltip text to emojis
2019-05-17 20:10:50 +00:00
taehoon
110c9d3b26
improve performance by caching pinned status ids into user object
2019-05-15 12:04:26 -04:00
taehoon
12f8269f01
make sure to have rights property of user object
2019-05-15 12:04:26 -04:00
taehoon
a601337a20
clean up
2019-05-15 12:04:26 -04:00
taehoon
e8abe1273b
filter pinned statuses based on pinned entity instead of a separate user entity
2019-05-15 12:04:25 -04:00
taehoon
cd0a7afa06
remove pinned timeline, instead, use simple entity of user object
2019-05-15 12:04:25 -04:00
dave
1aa0e8d7e0
#468 - pin/unpin status
2019-05-15 12:04:24 -04:00