Commit graph

149 commits

Author SHA1 Message Date
Absturztaube
026dc263e5 Merge branch 'develop' into fedi-absturztau-be 2020-12-16 12:00:58 +01:00
Shpuld Shpuldson
415119cda9 use title html for poll options before vote 2020-12-07 00:11:21 +02:00
Absturztaube
a6822d26bb Merge branch 'develop' into fedi-absturztau-be 2020-11-23 09:21:56 +01:00
Henry Jameson
49f7c84e3f Fix pinned statuses and perhaps some other stuff 2020-11-17 15:25:38 +02:00
Shpuld Shpuldson
41dbdc2b28 fix emoji not working in profile field names 2020-11-11 10:40:26 +02:00
Absturztaube
8065afc4d7 resolve merge conflicts 2020-11-08 14:04:17 +01:00
eugenijm
e798e9a417 Optimistic message sending for chat 2020-11-01 23:36:58 +03:00
Absturztaube
07853ed322 Merge branch 'develop' into fedi-absturztau-be 2020-08-27 21:41:14 +02:00
lain
c649f28faf EntityNormalizer: Normalize thumbnail url. 2020-08-19 14:54:00 +02:00
Absturztaube
6a77b27a42 resolve merge conflicts 2020-07-26 11:17:14 +02:00
Shpuld Shpludson
e0add7a44e Merge branch 'features/favicons' into 'develop'
status.vue: Add support for favicons

See merge request pleroma/pleroma-fe!1076
2020-07-20 14:06:16 +00:00
Absturztaube
7fa2dfecc6 Merge branch 'direct-conversations' of https://git.pleroma.social/eugenijm/pleroma-fe into direct-conversations 2020-07-08 19:16:44 +02:00
eugenijm
aa2cf51c05 Add Chats 2020-07-08 15:21:31 +03:00
Shpuld Shpludson
acc3b083aa Merge branch 'feat/parent-visible-support' into 'develop'
#874 Add strike-through to "Reply to" when parent_visible is set to false

See merge request pleroma/pleroma-fe!1162
2020-07-05 06:15:35 +00:00
Eugenij
de291e2e33 Add bookmarks
Co-authored-by: jared <jaredrmain@gmail.com>
2020-07-03 19:45:49 +00:00
Shpuld Shpuldson
6529f9fa34 add strikethrough when parent isn't visible 2020-06-30 15:04:16 +03:00
Shpuld Shpludson
95f5c7fff6 Merge branch 'iss-149/profile-fields-display' into 'develop'
Display profile fields

See merge request pleroma/pleroma-fe!1004
2020-06-19 08:04:54 +00:00
Shpuld Shpuldson
8a9654b511 Merge branch 'develop' into features/favicons 2020-06-18 16:47:37 +03:00
Shpuld Shpuldson
580fcd3ad9 restyle the fields 2020-06-17 18:26:06 +03:00
Shpuld Shpuldson
f8cf92a01f Merge branch 'develop' into kPherox/pleroma-fe-iss-149/profile-fields-display 2020-06-17 11:23:32 +03:00
lain
72ee51c85c Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js 2020-06-14 13:09:14 +00:00
lain
d41c9a717c Polls: Construct an html field during normalization. 2020-06-14 13:16:08 +02: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
eugenijm
3dbe0d1e61 WIP display updated_at in the chat list, use updated_at to keep the chat list sorted 2020-05-29 09:43:52 +03:00
eugenijm
99de78b80e WIP chat 2020-05-29 09:43:52 +03:00
eugenijm
d2456d5fea Chat message deletion 2020-05-29 09:43:52 +03:00
eugenijm
1b51b02483 WIP chat fixes 2020-05-29 09:43:52 +03:00
eugenijm
fc3d7a7565 WIP: add custom emoji 2020-05-29 09:43:52 +03:00
eugenijm
d48b7a7d58 WIP chat 2020-05-29 09:43:52 +03:00
eugenijm
86cc4ce08d WIP attachments 2020-05-29 09:43:52 +03:00
eugenijm
c273560408 WIP display the last message in the chat list 2020-05-29 09:43:52 +03:00
eugenijm
f06ec18cd7 Chat fixes 2020-05-29 09:43:52 +03:00
eugenijm
804cf3abc5 WIP: Chats 2020-05-29 09:43:52 +03: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
Haelwenn (lanodan) Monnier
88fbbb5e9b
status.vue: Add support for favicons
Put in replacement to the external icon when possible
2020-03-01 09:47:21 +01: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