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 |
|
taehoon
|
a27a2f78ac
|
fix conversationId comparision bug using integer format
|
2019-05-06 13:24:11 -04:00 |
|
shpuld
|
c44c048356
|
add title and alt for avatars, fix console errors in avatarlist
|
2019-05-01 17:33:56 +03:00 |
|
William Pitcock
|
f4420cbf9f
|
entity normalizer: hook up in_reply_to_account_acct
|
2019-04-27 04:52:11 +00:00 |
|
taehoon
|
e7010d73ac
|
store friends/followers in the global user repository
|
2019-04-14 23:41:38 -04:00 |
|
dave
|
40e9eebf91
|
#436 - merge develop
|
2019-04-10 12:54:33 -04:00 |
|
Henry Jameson
|
18cb97a2bd
|
Fix wrong local
|
2019-04-10 15:02:14 +03:00 |
|
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 |
|
dave
|
d3218807b4
|
#436 - merge develop
|
2019-04-08 21:04:59 -04:00 |
|
eugenijm
|
6b6878bde0
|
Added moderation menu
|
2019-04-01 23:30:06 +03:00 |
|
dave
|
21ea5adc8b
|
#436 - apply patch and clean up
|
2019-03-31 21:59:18 -04:00 |
|
dave
|
06fd3a9c5f
|
#436 - apply patch
|
2019-03-31 14:50:34 -04:00 |
|
dave
|
0db66e2905
|
#436 - keep original naming
|
2019-03-31 13:41:22 -04:00 |
|
dave
|
783cc00dd0
|
merge develop & resolve conflict
|
2019-03-29 10:11:28 -04:00 |
|
Brenden Bice
|
95639fbd63
|
expose replies_count from mastodon api
|
2019-03-28 03:46:41 -04:00 |
|
dave
|
5fd589d5e7
|
merge develop & resolve conflict
|
2019-03-26 10:52:46 -04:00 |
|
taehoon
|
932652e335
|
Update attachment normalizer
|
2019-03-25 12:19:33 -04:00 |
|
taehoon
|
6fdbc182ca
|
Add fallback for attachments uploaded via the other platforms
|
2019-03-24 21:16:57 -04:00 |
|
taehoon
|
909c315a44
|
Get correct mimetype through entity_normalizer
|
2019-03-24 21:16:57 -04:00 |
|
dave
|
d70928792d
|
#448 - fix timeline fetch error when status text is null
|
2019-03-22 13:15:11 -04:00 |
|
dave
|
13e727b5ee
|
#436: sync notification with timeline
|
2019-03-18 14:42:09 -04:00 |
|
dave
|
060d3b0713
|
#436: implement is_seen logic
|
2019-03-18 12:30:34 -04:00 |
|
dave
|
55d7bd6d4e
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
|
2019-03-18 10:37:26 -04:00 |
|
dave
|
241503346f
|
#436: clean up based on comment
|
2019-03-17 10:08:01 -04:00 |
|
Henry Jameson
|
4cdfd5fb86
|
post-merge fixes
|
2019-03-17 14:41:05 +02:00 |
|