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
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
Henry Jameson
30c0cafff1
Merge remote-tracking branch 'upstream/develop' into mastoapi/emojis
...
* upstream/develop: (34 commits)
after store: fix setting postFormats field
fix user-card avatar falling into permament failed state
fix flake id users not fetching correctly
fix console error
afterStoreSetup: Move log in and theme load to afterStoreSetup.
afterStoreSetup: Handle 404 cases.
afterStoreSetup: Emoji and nodeinfo refactor.
afterStoreSetup: refactor TOS and panel fetching, handle 404s.
afterStoreSetup: refactor.
Load persistedStated with async/await.
whoops
レインせんぱいにサンキュー
fix embedded relationship card parsing
actually use embedded relationship if it's present
instead of filtering nulls, let's just not have them in the first place
#434 - fix plain text issue
Add floating post-status button on mobile
Update user settings icon to pencil
I18n: Update Czech translation
user_card.vue: Copy over .status-content img styling
...
2019-03-17 13:32:56 +02:00
dave
e5786f32a7
#436 : merge develop
2019-03-15 11:28:33 -04:00
dave
935aae054f
#436 : add is_local for statuses
2019-03-14 22:07:42 -04:00
dave
e5e1d4c643
#436 : fix notification order, follow type link issue, duplicate key
2019-03-14 07:55:39 -04:00
dave
93a2510ede
#436 : update is_local
2019-03-13 15:43:48 -04:00
dave
78951964fb
#436 : update entity_normalizer
2019-03-13 15:34:45 -04:00
dave
2f7d890ad2
#436 : add dismiss button, disable is_seen part
2019-03-13 14:08:03 -04:00
dave
cd9a7dd488
#436 : integrate mastoAPI notifications
2019-03-12 17:16:57 -04:00
Henry Jameson
ce8b5fcd11
fix embedded relationship card parsing
2019-03-12 21:49:03 +02:00
Henry Jameson
b9877a4323
actually use embedded relationship if it's present
2019-03-11 23:45:24 +02:00
Henry Jameson
a6a162177b
instead of filtering nulls, let's just not have them in the first place
2019-03-11 23:08:09 +02:00
Henry Jameson
4efcda1b41
Added some tests
2019-03-11 22:41:08 +02:00
Henry Jameson
47211fb32c
emoji adder
2019-03-09 02:23:50 +02:00
eugenijm
d831b81912
Added follow requests counter to nav bar to make it visible behorehand
2019-02-15 12:49:00 +03:00
eugenijm
648f635429
Allow to configure visibility for admin and moderator badges
2019-02-06 18:07:10 +03:00
eugenijm
c714eb2600
Add admin and moderator indicators to the user card
2019-02-06 18:04:21 +03:00
Maxim Filippov
0c5c889850
Rename "hide_following" to "hide_follows"
2019-02-06 14:21:13 +03:00
Maxim Filippov
18594569bd
Split hide_network into hide_followers & hide_followings
2019-02-06 02:59:59 +03:00
shpuld
54e7e0e31b
merge develop and fix conflicts AGAIN
2019-02-04 19:49:23 +02:00
Shpuld Shpludson
d4991d0162
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !497
2019-02-03 14:32:23 +00:00
shpuld
b614cb94e5
merge develop in
2019-02-03 10:13:09 +02:00
eugenijm
b62d2c76e5
Use integer type of notitication ids (avoid redundant casting for getting maxId in addNewNotifications)
2019-02-02 18:40:47 +03:00
shpuld
8ce513ed09
initial draft for follows/following pagination
2019-01-31 21:11:28 +02:00
Maxim Filippov
298cea8f6d
Split hide_network into hide_followers & hide_followings
2019-01-30 01:11:40 +03:00
William Pitcock
b27ec058ca
entity normalizer: add support for opengraph cards
2019-01-28 05:50:12 +00:00
lain
e4303da372
Properly handle websocket token (fixes chat).
2019-01-27 21:38:33 +01:00
shpuld
b9142e6fac
Move following to qvitter only space
2019-01-27 16:10:55 +02:00
shpuld
4c9f3b946d
Add forgotten prop to entity normalizer
2019-01-27 08:42:34 +02:00
William Pitcock
5e68161d91
entity normalizer: provide summary_html property
...
Mastodon API returns HTML always in spoiler_text, while TwitterAPI sends both a
text version as well as an HTML version of the message subject, which we started
to use when we allowed custom emoji in message subjects.
2019-01-25 10:05:19 +00:00
Henry Jameson
61c9ecd855
fix reply-to tooltip being somewhat unreliable
2019-01-23 00:10:26 +03:00
HJ
c8caa477d7
Revert "fix reply-to tooltip being somewhat unreliable"
...
This reverts commit 66dc72deb2
2019-01-22 21:08:28 +00:00
Henry Jameson
66dc72deb2
fix reply-to tooltip being somewhat unreliable
2019-01-23 00:03:33 +03:00
Henry Jameson
42f8d01b66
confusion
2019-01-21 21:41:17 +03:00
Henry Jameson
031c044297
better handling of attachments
2019-01-21 16:28:36 +03:00
Henry Jameson
d231a45644
support for extended fields (for future, doesn't work yet), fix reply bug
2019-01-19 04:10:16 +03:00
Henry Jameson
bac7154bc6
more fields for users
2019-01-17 23:57:24 +03:00
Henry Jameson
6c70e9950c
some more post fields
2019-01-17 23:57:24 +03:00
Henry Jameson
af36f4915a
support for CW/Subject. fix replies.
2019-01-17 23:57:24 +03:00
Henry Jameson
93cbb58212
fix login and favorites tab...
2019-01-17 22:11:51 +03:00
Henry Jameson
1e61c8140b
tests for the tests god! bugfixes for bugfixes throne!
2019-01-17 20:44:37 +03:00
Henry Jameson
9682ee66ce
added conversions to ids for consistency from the get-go
2019-01-17 19:23:14 +03:00
Henry Jameson
d7bd294666
migrated some tests to normalizer, fixed some potential bug, fixed tests to use
...
normalized naming instead of raw qvitter api objects. needs more tests tho.
2019-01-15 18:39:24 +03:00