flisk/akkoma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity
5741 commits 2 branches 25 tags 16 MiB
Commit graph

2950 commits

Author SHA1 Message Date
Henry Jameson
08e6e66642 fix chat badge and unify styles across all badges including follow 
request count.
 2020-11-02 20:51:38 +02:00
Shpuld Shpuldson
350eb489c2 add favicon badge for unread notifs 2020-11-02 15:46:49 +02:00
Shpuld Shpludson
5254fdba75 Merge branch 'optimistic-chat-posting' into 'develop' 
Optimistic / nonblocking message posting for chats

See merge request pleroma/pleroma-fe!1228
 2020-11-02 05:36:42 +00:00
HJ
590f8e1754 Merge branch 'various-css-fixes' into 'develop' 
Various css fixes

Closes #992

See merge request pleroma/pleroma-fe!1267
 2020-11-01 20:50:02 +00:00
eugenijm
e798e9a417 Optimistic message sending for chat 2020-11-01 23:36:58 +03:00
Shpuld Shpludson
148789767a Merge branch 'fix/chat-misc-fixes' into 'develop' 
Misc Chat fixes

See merge request pleroma/pleroma-fe!1265
 2020-11-01 17:50:43 +00:00
Shpuld Shpludson
40ce3a9bd8 Merge branch 'fix/block-misclicks-when-timeline-shifts' into 'develop' 
block clicks for a second on timeline when timeline moves

See merge request pleroma/pleroma-fe!1266
 2020-11-01 17:44:16 +00:00
Henry Jameson
64da9a8e69 fix build warnings 2020-11-01 16:47:17 +02:00
Henry Jameson
8b1213ea1e lint 2020-11-01 16:44:57 +02:00
Henry Jameson
994b49ddfe Merge remote-tracking branch 'origin/develop' into various-css-fixes 
* origin/develop:
  remove 'md' size that doesn't exist
 2020-11-01 16:44:15 +02:00
Henry Jameson
02bb015c4f fix #992 2020-11-01 16:40:23 +02:00
Shpuld Shpuldson
8c5586dda4 remove 'md' size that doesn't exist 2020-11-01 11:53:20 +02:00
Henry Jameson
fb00f8459c fix chat count 2020-10-31 13:59:58 +02:00
Henry Jameson
0653f18994 fix play-on-hover gifs issues 2020-10-29 22:54:28 +02:00
Henry Jameson
4e1f2aeabc fix preview spinner 2020-10-29 22:54:28 +02:00
Henry Jameson
633349ddff Refactor desktop navbar into a component, change layout to grid for 
better compatibility with search field and simpler CSS
 2020-10-29 22:54:28 +02:00
Henry Jameson
0f8a7037ea fix lain's issue in reaction picker 2020-10-29 20:06:13 +02:00
Henry Jameson
8225717a7c Update and fix avatar shadow in user card 2020-10-29 20:03:53 +02:00
Shpuld Shpuldson
3ead79ddb4 document thie this. check 2020-10-29 12:45:44 +02:00
Shpuld Shpuldson
6acb61f296 fix conflict, keep the touchable button big 2020-10-29 08:55:54 +02:00
Shpuld Shpuldson
93f9ab6f2b Merge branch 'fix/block-misclicks-when-timeline-shifts' of git.pleroma.social:pleroma/pleroma-fe into fix/block-misclicks-when-timeline-shifts 2020-10-29 08:37:31 +02:00
Shpuld Shpuldson
cb3578fcca fix conflicts 2020-10-29 08:36:39 +02:00
HJ
a84db4bd8f Merge branch 'fontawesome5' into 'develop' 
FontAwesome 5

Closes #982

See merge request pleroma/pleroma-fe!1260
 2020-10-28 21:21:35 +00:00
Henry Jameson
ef36ca44f6 >boxes 2020-10-28 22:52:20 +02:00
Henry Jameson
2e6c51dfd4 better icon for picker 2020-10-28 22:49:53 +02:00
Henry Jameson
0ac9d81788 fix settings tabs on mobile, update follow request badge 2020-10-28 21:55:08 +02:00
Henry Jameson
fc7dfb3b9e update & unify the navbars heights 2020-10-28 21:47:42 +02:00
Henry Jameson
7c4af4ce3f improved side-drawer alignments 2020-10-28 21:41:42 +02:00
Henry Jameson
b6cf2bcefd improved the semantics for our icon scale, fixed preview, fixed navbar desktop 2020-10-28 21:31:16 +02:00
Shpuld Shpludson
6d7ecd7d80 Apply 1 suggestion(s) to 1 file(s) 2020-10-28 10:02:51 +00:00
Shpuld Shpuldson
7007659e05 change input blocking to use css 2020-10-28 08:53:23 +02:00
Shpuld Shpuldson
1403f20f9f block clicks for a second when timeline moves 2020-10-27 12:59:50 +02:00
Shpuld Shpuldson
2c441c7922 fix back button size, fix missing chat notifications being marked as read too eagerly, fix promiseinterval erroring when not getting a promise 2020-10-27 10:03:04 +02:00
Henry Jameson
048e67f5fc make subjectline input use size=1 for compatibility with CJK fonts 2020-10-21 02:07:05 +03:00
Henry Jameson
1b50d700aa bye bye fontello 2020-10-21 00:34:42 +03:00
Henry Jameson
f561e75553 lint 2020-10-21 00:31:16 +03:00
Henry Jameson
1ec41302f7 rotate the shackle of the lock for better accessibility 2020-10-21 00:28:24 +03:00
Henry Jameson
6aa7445ea7 come on and slam 2020-10-21 00:25:59 +03:00
Henry Jameson
7495c6b698 fix attachment remove pointer 2020-10-21 00:02:58 +03:00
Henry Jameson
a50cd7e37d remaining changes... 2020-10-21 00:01:28 +03:00
Henry Jameson
3cbaa00449 more replacements + small renames 2020-10-20 22:54:43 +03:00
Henry Jameson
b19c2eb0fb More stuff. Buttons in user card's corner now have MUCH bigger hitboxes 2020-10-20 22:13:19 +03:00
Henry Jameson
046c60cb61 cancel -> times 2020-10-20 21:18:23 +03:00
Henry Jameson
e8650d3409 chevrons-downs, settings 2020-10-20 21:03:46 +03:00
Henry Jameson
8b3a7ae8c0 more FA5 stuff with small related refactoring 2020-10-20 20:28:11 +03:00
Henry Jameson
3814218277 Some initial work on replacing icons with FA5 2020-10-20 20:28:11 +03:00
Henry Jameson
e695506c51 proper modified icon + popup 2020-10-17 22:28:49 +03:00
Henry Jameson
a664fde02f Merge remote-tracking branch 'origin/develop' into settings-changed 
* origin/develop:
  fix fontello
  Translated using Weblate (Russian)
  Translated using Weblate (Italian)
  lint fix
  fixed copy-pasting leftovers
  improved algorithm, possibly speed too
  fix 8x spaces inside this paren
  feat/reorder-emojis-by-position-of-keyword
  rename to gravestone
  Apply 1 suggestion(s) to 1 file(s)
  change i18n phrasing
  separate reply button to its own component, add changelog entry
  add basic deletes support that works with masto WS
 2020-10-17 21:26:13 +03:00
Henry Jameson
29ff0be92c Merge remote-tracking branch 'origin/develop' into settings-changed 
* origin/develop: (48 commits)
  fix/leftover-emoji-checkboxes-in-settings
  Apply 1 suggestion(s) to 1 file(s)
  Translated using Weblate (Spanish)
  Translated using Weblate (Persian)
  Translated using Weblate (Persian)
  Translated using Weblate (Polish)
  update changelog
  Stop click propagation when unhiding nsfw
  Fix Follow Requests title style
  Translated using Weblate (Persian)
  Translated using Weblate (Persian)
  Translated using Weblate (French)
  Added translation using Weblate (Persian)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Italian)
  Translated using Weblate (English)
  Translated using Weblate (English)
  Translated using Weblate (Basque)
  Translated using Weblate (Spanish)
  ...
 2020-10-17 19:24:07 +03:00
Shpuld Shpludson
0e14cd6102 Merge branch 'feat/reorder-emojis-by-position-of-keyword' into 'develop' 
feat/reorder-emojis-by-position-of-keyword

See merge request pleroma/pleroma-fe!1240
 2020-10-13 15:00:06 +00:00
Shpuld Shpludson
d86cd3e850 Merge branch 'feat/masto-ws-deletes' into 'develop' 
Support for WS deletes

See merge request pleroma/pleroma-fe!1227
 2020-10-12 06:05:21 +00:00
Dym Sohin
e5bd1c20b0 fix/leftover-emoji-checkboxes-in-settings 2020-10-11 02:03:45 +02:00
Shpuld Shpludson
069a4b0801 Merge branch 'fix/nsfw-hider-closing-preview' into 'develop' 
Stop click propagation when unhiding nsfw

See merge request pleroma/pleroma-fe!1245
 2020-10-09 16:15:30 +00:00
Shpuld Shpludson
e7a67e33ad Merge branch 'fix/follow-requests-title' into 'develop' 
Fix Follow Requests title style

See merge request pleroma/pleroma-fe!1243
 2020-10-09 16:14:43 +00:00
feld
09da102a4c Apply 1 suggestion(s) to 1 file(s) 2020-10-06 16:18:30 +00:00
Shpuld Shpuldson
a0da6c31d9 Stop click propagation when unhiding nsfw 2020-10-02 12:21:56 +03:00
Mark Felder
ff2fe5c68c Fix Follow Requests title style 2020-10-01 17:05:46 -05:00
Shpuld Shpludson
6bd38c7d6f Merge branch 'fix/wait-for-request-before-starting-interval' into 'develop' 
Fix/wait for request before starting interval - fix #937

Closes #937

See merge request pleroma/pleroma-fe!1222
 2020-10-01 13:20:14 +00:00
Shpuld Shpuldson
414558665f lint fix 2020-10-01 16:01:57 +03:00
Shpuld Shpludson
8a34ff2957 Merge branch 'develop' into 'feat/masto-ws-deletes' 
# Conflicts:
#   CHANGELOG.md
#   src/components/status/status.js
#   src/components/status/status.scss
 2020-10-01 12:54:54 +00:00
Henry Jameson
a463959a36 Initial work on highlighting changed settings. Some refactoring to 
simplify addition of new settings
 2020-10-01 01:43:07 +03:00
Shpuld Shpludson
68c2a5b18f Merge branch 'fix/excessive-underline-in-sidebar' into 'develop' 
fix excessive underline in sidebar

See merge request pleroma/pleroma-fe!1238
 2020-09-30 06:59:09 +00:00
Dym Sohin
c17012cfe1 fix appended 0.65em on wrong line 2020-09-29 13:20:16 +02:00
Dym Sohin
1675f1a133 scoped back margin-right on icons 2020-09-29 13:13:42 +02:00
Shpuld Shpludson
91778a0276 Merge branch 'feat/custom-virtual-scrolling' into 'develop' 
Timeline virtual scrolling

See merge request pleroma/pleroma-fe!1043
 2020-09-29 10:18:37 +00:00
Shpuld Shpludson
f174f289a9 Timeline virtual scrolling 2020-09-29 10:18:37 +00:00
Shpuld Shpludson
3781e521e6 Merge branch 'feature/import_export_mutes' into 'develop' 
[#2099] Added import/export mutes [FE]

See merge request pleroma/pleroma-fe!1229
 2020-09-29 08:18:02 +00:00
Dym Sohin
3dacef944c remove bio-table's max-width 2020-09-24 12:05:51 +02:00
Dym Sohin
bb59b8ee56 fixed copy-pasting leftovers 2020-09-21 18:13:31 +02:00
Dym Sohin
cff202241b improved algorithm, possibly speed too 2020-09-21 18:10:55 +02:00
Dym Sohin
f1e1f20a8d fix 8x spaces inside this paren 2020-09-21 17:42:17 +02:00
Dym Sohin
fee654f1ee feat/reorder-emojis-by-position-of-keyword 2020-09-21 17:29:36 +02:00
Dym Sohin
f9977dbb3c fix excessive underline in sidebar 2020-09-19 21:28:03 +02:00
Maksim Pechnikov
3dbc1bedbf Merge branch 'develop' into feature/import_export_mutes 2020-09-18 22:04:01 +03:00
Dym Sohin
70a5619496 [fix] case in/sensitive emoji search 2020-09-18 11:07:38 +02:00
Shpuld Shpuldson
20d33c2fbc change icon to a megaphone 2020-09-16 11:53:54 +03:00
Shpuld Shpuldson
1b811d8b93 change side drawer to use shoutbox name 2020-09-16 11:29:10 +03:00
eugenijm
8c4514013d Fix chat messages being missed when the streaming is disabled and the messages are sent by both participants simultaneously 2020-09-16 09:21:24 +03:00
Shpuld Shpuldson
afb2241a5b change a eslint disable to nextline only 2020-09-08 16:29:10 +03:00
Shpuld Shpuldson
8975589bca fix vue warnings and errors 2020-09-08 10:44:08 +03:00
Maksim Pechnikov
947d7cd6f2 added import/export mutes 2020-09-08 09:41:42 +03:00
Shpuld Shpuldson
fa91766519 rename to gravestone 2020-09-08 09:32:43 +03:00
Shpuld Shpludson
1ec9cde963 Apply 1 suggestion(s) to 1 file(s) 2020-09-08 06:31:02 +00:00
Shpuld Shpuldson
f9ac23b9a9 separate reply button to its own component, add changelog entry 2020-09-07 10:35:49 +03:00
Shpuld Shpuldson
40ca0b394e add basic deletes support that works with masto WS 2020-09-06 15:28:09 +03:00
Shpuld Shpludson
e331db79e5 Merge branch 'develop' into 'fix/wait-for-request-before-starting-interval' 
# Conflicts:
#   CHANGELOG.md
 2020-09-04 08:38:13 +00:00
Shpuld Shpuldson
3fb35e8123 rename to promiseInterval 2020-09-04 11:19:53 +03:00
Shpuld Shpludson
a73b09c732 Merge branch 'fix/locked-account-link-fix' into 'develop' 
Open profile tab from 'locked' link in FO-post warning - Fix #945

Closes #945

See merge request pleroma/pleroma-fe!1223
 2020-09-04 08:11:31 +00:00
Shpuld Shpuldson
f281663b49 Add hacky functionality to open specific settings tabs 2020-09-03 15:45:13 +03:00
Shpuld Shpuldson
1b6eee0497 change chats to use custom makeFetcher 2020-09-02 21:01:31 +03:00
Mark Felder
5809f33c86 Password reset no longer informs user of errors or account existence 2020-09-01 16:48:51 -05:00
Shpuld Shpuldson
b5d15eddcf hide poll when subject collapsed, but show poll icon 2020-08-31 11:50:26 +03:00
Shpuld Shpuldson
c9ea2db69d fix long poll labels overflowing 2020-08-25 12:17:42 +03:00
Shpuld Shpuldson
f0ac40a428 change more animated gif avatars to work properly 2020-08-25 11:40:02 +03:00
Shpuld Shpuldson
06159101cf fix avatar overwrite classes in usercard 2020-08-25 11:33:38 +03:00
lain
54b7e986a7 Merge branch 'fix/tag-timeline-title' into 'develop' 
Fix #928 show tag name in title for tag timelines

Closes #928

See merge request pleroma/pleroma-fe!1212
 2020-08-19 12:00:12 +00:00
Shpuld Shpuldson
54b619dfec show tag name in title for tag timelines 2020-08-19 13:06:46 +03:00
Henry Jameson
800047b81f fixed 2020-08-19 12:14:00 +03:00
Henry Jameson
d7c42f1469 lint 2020-08-19 00:38:54 +03:00
Henry Jameson
61966d290a fix lain's bug 2020-08-19 00:22:08 +03:00
Henry Jameson
36c9368ae5 fix reply popovers being too slim 2020-08-19 00:18:52 +03:00
Henry Jameson
815f230ac7 fixed some issues related to user avatar 2020-08-18 23:57:42 +03:00
Henry Jameson
7de78b1401 revert change to form resize logic 2020-08-18 23:50:23 +03:00
Henry Jameson
a6223cec0c Fix last line having slightly cut-off low-hanging parts of characters 2020-08-18 00:52:51 +03:00
Henry Jameson
ecbbec7b97 work around incorrect styles ordering in status popover 2020-08-18 00:26:44 +03:00
Henry Jameson
30219098a6 fix issues with reply-link 2020-08-18 00:26:31 +03:00
Henry Jameson
2fa050b163 Fix muted notifications 2020-08-18 00:26:02 +03:00
Shpuld Shpuldson
ae4dc3e439 treat field name as text 2020-08-13 16:29:12 +03:00
HJ
b9d1ecec44 Merge branch 'stylelint-rscss-1' into 'develop' 
Stylelint + RSCSS initial approach

See merge request pleroma/pleroma-fe!1205
 2020-08-06 13:38:07 +00:00
lain
3e6e6096bf Merge branch 'feat/separate-timeline-navigation-from-navpanel' into 'develop' 
Separate timeline navigation from navpanel

See merge request pleroma/pleroma-fe!1172
 2020-08-06 10:17:44 +00:00
Shpuld Shpludson
9a10ad3826 Merge branch 'mobile-setting-modal-fix' into 'develop' 
Mobile setting modal behavior fixes

Closes #908

See merge request pleroma/pleroma-fe!1200
 2020-08-06 09:53:24 +00:00
Shpuld Shpludson
7bd6846703 Merge branch 'chat-list-single-line-fix' into 'develop' 
Fix single line status content mode in the chat list

See merge request pleroma/pleroma-fe!1202
 2020-08-06 09:46:19 +00:00
Henry Jameson
0feab1d97c more broken reply improvements 2020-08-04 19:41:03 +03:00
Henry Jameson
a962ca6065 lint 2020-08-04 19:34:18 +03:00
Henry Jameson
0d02b04726 bring back red stripe 2020-08-04 19:32:47 +03:00
Henry Jameson
10bb2b288d remove unnecessary border-radius 2020-08-04 19:26:07 +03:00
Henry Jameson
dce057f24e lint 2020-08-04 19:16:55 +03:00
Henry Jameson
2a1c9e094c more fixes 2020-08-04 19:08:49 +03:00
Shpuld Shpuldson
e57562959f fix oops 2020-07-28 09:41:00 +03:00
Shpuld Shpuldson
e86c5ea1fa fix non-timeline routes breaking current/previous timeline 2020-07-28 09:40:04 +03:00
Henry Jameson
7870b3f7ec neater way to do hover thing with still image 2020-07-28 01:54:40 +03:00
Henry Jameson
65b6e23c00 refactor status 2020-07-28 01:27:11 +03:00
Henry Jameson
61d78ff11b separate status scss into another file 2020-07-27 22:49:57 +03:00
HJ
f293dc39dc Merge branch 'fix/preview-styles-polish' into 'develop' 
polish preview styles a bit

See merge request pleroma/pleroma-fe!1186
 2020-07-27 18:42:43 +00:00
Shpuld Shpuldson
f9e4afa3e9 update poll to post status form on deleting option 2020-07-24 17:24:34 +03:00
Lain Soykaf
96929d9930 ChatPanel: Rename chat to shoutbox. 
To remove confusion with the new ChatMessages.
 2020-07-23 17:31:35 +02:00
eugenijm
222ad2dd50 Make the single line mode is consistent with status-content line height 2020-07-23 16:39:01 +03:00
eugenijm
77d65d6cec Ensures the minimized modal is always 50px above the mobile browser bottom bar regardless of whether or not it is visible. 2020-07-23 16:36:21 +03:00
lain
0ea23a03ce Merge branch 'feat/idempotency' into 'develop' 
Status posting Idempotency

See merge request pleroma/pleroma-fe!1194
 2020-07-23 13:17:44 +00:00
Shpuld Shpuldson
fdbacba36a resume last lasttime instead of always friends/public 2020-07-23 15:09:32 +03:00
eugenijm
2298ad0011 Use bock-scroll-lock directive for the settings modal 2020-07-23 12:15:44 +03:00
eugenijm
61dd1a3b49 Add body 100% width for the preview, refactor the modalActivated watcher, use body scroll lock for the setting tab content 2020-07-23 09:53:51 +03:00
eugenijm
dac075c61a Fix mobile setting modal behavior: ensure the mobile browser address bar doesn't overlap the modal top panel. 2020-07-23 09:53:51 +03:00
Shpuld Shpuldson
0546326b22 update icon to hopefully look fine on both browsers 2020-07-22 09:43:22 +03:00
Shpuld Shpludson
f0e296296c Merge branch 'feat/show-fav-rt-lists-on-hover' into 'develop' 
Feat/show fav rt lists on hover

See merge request pleroma/pleroma-fe!1196
 2020-07-21 09:11:11 +00:00
Shpuld Shpludson
4528c5c982 Merge branch 'feat/more-title-attributes-in-status-header' into 'develop' 
Add title attributes to more things in status header

See merge request pleroma/pleroma-fe!1195
 2020-07-20 14:37:21 +00: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
Shpuld Shpuldson
caae2668ce add 16 users cap to user list popover 2020-07-16 18:08:00 +03:00
Shpuld Shpuldson
8e0414dc7c change class names to not have reacts in them 2020-07-16 17:45:07 +03:00
Shpuld Shpuldson
6079301ec4 Move user list from reactions to its own component, make favs and rts use it 2020-07-16 17:42:16 +03:00
Shpuld Shpuldson
717adf22cc add title to user card account name too 2020-07-16 11:10:45 +03:00
Shpuld Shpuldson
476954295e add title attributes to more things in status header 2020-07-16 11:00:18 +03:00
Shpuld Shpuldson
0c7c24d3d1 make idempotency watch entire status 2020-07-16 10:18:18 +03:00
Shpuld Shpludson
950ae6d89a Merge branch 'reactions-search' into 'develop' 
make reactions-search case-insensitive

See merge request pleroma/pleroma-fe!1189
 2020-07-16 06:04:49 +00:00
Mark Felder
149941828f Improve layout of the Notifications Filters section 2020-07-15 09:56:46 -05:00
Mark Felder
49aaf9dc57 Merge branch 'develop' into refactor/notification_settings 2020-07-15 09:01:40 -05:00
Shpuld Shpuldson
d85904f42f add extra sanity stuff to make input boxes more stable 2020-07-15 16:36:06 +03:00
Shpuld Shpuldson
89a677f5e8 add basic idempotency support 2020-07-15 16:19:57 +03:00
Shpuld Shpuldson
51b235f7aa adjust icon use 2020-07-15 12:26:14 +03:00
Shpuld Shpuldson
3cac26a2ac Merge branch 'develop' into fix/preview-styles-polish 2020-07-15 08:30:32 +03:00
Dym Sohin
00d662c4a0 make reactions-search case-insensitive 2020-07-14 19:47:02 +00:00
Shpuld Shpuldson
b8c1b25397 remove most of reply preview and autoload related stuff 2020-07-14 15:08:04 +03:00
Shpuld Shpuldson
7859c5fe4b polish preview styles a bit 2020-07-14 14:43:26 +03:00
Shpuld Shpuldson
3598360ce5 fix missed conflict 2020-07-14 11:54:03 +03:00
Shpuld Shpuldson
cac1418aff fix merge conflicts 2020-07-14 11:44:06 +03:00
Mark Felder
da94935aaa Merge branch 'develop' into refactor/notification_settings 2020-07-13 13:25:23 -05:00
Shpuld Shpuldson
4a6300bbee add simple You: to chat list last message 2020-07-12 11:11:12 +03:00
Dym Sohin
a754e89eed fixed checkbox using emoji instead of dingbat 2020-07-11 06:39:44 +00:00
lain
4c59a17499 Merge branch 'fix/ctrl-enter-before-chat-loading-breaks' into 'develop' 
fix #891 Fix early send killing the chat

Closes #891

See merge request pleroma/pleroma-fe!1178
 2020-07-10 10:56:39 +00:00
Shpuld Shpuldson
5734dd05a0 change misnamed member field check to actually disable sending 2020-07-10 13:48:37 +03:00
Shpuld Shpuldson
0038a9794b add simple red dot for chat notifs 2020-07-10 13:21:42 +03:00
HJ
c1a20079be Merge branch 'direct-conversations' into 'develop' 
Chats

Closes #201

See merge request pleroma/pleroma-fe!1019
 2020-07-10 09:04:45 +00:00
Shpuld Shpuldson
78ec84477e fix pixel offset hack in panel heading 2020-07-09 12:49:16 +03:00
Eugenij
b756c83e8d Apply suggestion to src/components/chat_list/chat_list.vue 2020-07-08 15:21:31 +03:00
eugenijm
3b2dfcaf5c Add the single-line prop to StatusContent and use it for chat list items 2020-07-08 15:21:31 +03:00
eugenijm
fc865d3a12 Remove direct style manipulations in favor of classes 2020-07-08 15:21:31 +03:00
eugenijm
18a1f5d62a Add the empty chat list placeholder. 
Do not use full height when displaying the chat list.
Remove an unsued chat action.
 2020-07-08 15:21:31 +03:00
eugenijm
45901c8da6 Disable status preview in the chat posting form 2020-07-08 15:21:31 +03:00
eugenijm
f05f832bff Address feedback 
Use more specific css rules for the emoji dimensions in the chat list status preview.

Use more round em value for chat list item height.
Add global html overflow and height for smoother chat navigation in
the desktop Safari.

Use offsetHeight instad of a computed style when setting the window height on resize.

Remove margin-bottom from the last message to avoid occasional layout shift in the desktop Safari

Use break-word to prevent chat message text overflow

Resize and scroll the textarea when inserting a new line on ctrl+enter

Remove fade transition on route change

Ensure proper border radius at the bottom of the chat, remove unused border-radius

Prevent the chat header "jumping" on the avatar load.
 2020-07-08 15:21:31 +03:00
eugenijm
aa2cf51c05 Add Chats 2020-07-08 15:21:31 +03:00
Shpuld Shpuldson
60921be5a0 give notification timeago a min width 2020-07-08 14:11:42 +03:00
Shpuld Shpludson
eea002e6f5 streamline profile image api, update reset ui for all profile images to match avatar, remove unnecessary stuff 2020-07-08 10:11:17 +00:00
Shpuld Shpuldson
5186929efa add hack to not overlap menu with timeline header 2020-07-08 10:42:40 +03:00
Shpuld Shpuldson
cde6acdbbd update navigation, rename timeline link in nav panel to timelines 2020-07-07 18:20:37 +03:00
Shpuld Shpuldson
ddde05771f update with bookmarks, clean up some code 2020-07-07 17:34:35 +03:00
Shpuld Shpludson
8f87a36a5a Merge branch '884-about-panel-optimizations' into 'develop' 
StaffPanel: Move staff loading to panel creation.

Closes #884

See merge request pleroma/pleroma-fe!1171
 2020-07-07 12:53:49 +00:00
Shpuld Shpludson
7d881d97fe Apply suggestion to src/components/staff_panel/staff_panel.js 2020-07-07 12:44:29 +00:00
lain
431b3f527d StaffPanel: Move staff loading to panel creation. 2020-07-07 14:39:43 +02:00
Shpuld Shpuldson
f7f8181dcf fix preview opening automatically 2020-07-07 14:46:53 +03:00
Shpuld Shpuldson
97c62587d0 remove console log 2020-07-07 11:34:40 +03:00
Shpuld Shpuldson
84d728b970 fix issue on posting another status 2020-07-07 11:31:24 +03:00
Shpuld Shpuldson
e3991db5c4 fix conflicts and add error handling to media descriptions 2020-07-07 10:01:37 +03:00
Shpuld Shpuldson
f4bdbf7691 remove unnecessary code 2020-07-07 09:08:50 +03:00
Shpuld Shpuldson
b4709f93d4 add more ways to set description 2020-07-07 09:07:20 +03:00
Shpuld Shpuldson
d55c09df18 fix edge case of videos and unknown files together 2020-07-06 15:06:13 +03:00
Shpuld Shpuldson
87b5f828d7 fix conflicts, use file icon instead of link, add support for audio and file icon in cw'd posts 2020-07-06 14:01:03 +03:00
Shpuld Shpuldson
4d25be7cb3 fix modal types check being broken 2020-07-06 13:42:33 +03:00
Shpuld Shpuldson
ada5a3806b don't close preview on post, move visibility notices above the preview where they belong 2020-07-06 11:36:35 +03:00
Shpuld Shpuldson
7bdc3d6ce9 remove contenttype check from content type watcher 2020-07-06 11:12:33 +03:00
Shpuld Shpuldson
f254a847d2 move translation strings to correct place, translate error message 2020-07-06 10:53:03 +03:00
Shpuld Shpuldson
afdc3f96f0 fix conflicts, make subject update the preview 2020-07-06 10:45:47 +03:00
Shpuld Shpludson
b761bcf333 Merge branch 'fix/remove-extra-notifications-fetch' into 'develop' 
Fix: notifications fetcher double fetching on every tick

See merge request pleroma/pleroma-fe!1164
 2020-07-05 07:03:27 +00:00
Shpuld Shpludson
9178908c1e Apply suggestion to src/components/notifications/notifications.js 2020-07-05 06:54:12 +00:00
Shpuld Shpludson
af4a26b588 Merge branch 'feat/allow-use-without-cookies' into 'develop' 
Fix #815: Allow use without cookies, Add a global notice popup system

Closes #815

See merge request pleroma/pleroma-fe!1166
 2020-07-05 06:53:29 +00: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
kPherox
9b40cf43d8
fix height for emoji panel of settings modal 2020-07-04 18:42:15 +09:00
Eugenij
de291e2e33 Add bookmarks 
Co-authored-by: jared <jaredrmain@gmail.com>
 2020-07-03 19:45:49 +00:00
Shpuld Shpuldson
77bb31b474 remove extra computed from nav panel 2020-07-03 13:26:11 +03:00
Shpuld Shpuldson
21d1f557f6 change styles for the dropdown, make things work nicely on mobile 2020-07-03 12:56:31 +03:00
Shpuld Shpuldson
961099d34a basic version done, needs cleanup from nav panel styles 2020-07-02 18:03:02 +03:00
Shpuld Shpuldson
150516df4e Merge branch 'xenofem/pleroma-fe-rebased-image-description-authoring' of git.pleroma.social:pleroma/pleroma-fe into xenofem/pleroma-fe-rebased-image-description-authoring 2020-07-02 14:31:07 +03:00
Shpuld Shpuldson
b8ed904c0c change px to em 2020-07-02 14:28:35 +03:00
Shpuld Shpuldson
1293bec77e change storage error one-off into a global notice system 2020-07-02 10:40:41 +03:00
Shpuld Shpludson
c0fb35b106 Merge branch 'develop' into 'xenofem/pleroma-fe-rebased-image-description-authoring' 
# Conflicts:
#   CHANGELOG.md
 2020-07-02 04:50:03 +00:00
Shpuld Shpuldson
a3e370e9f8 add initial fetching back in a more streamlined way 2020-07-01 15:19:45 +03:00
Shpuld Shpuldson
62d0bc47b3 remove unnecessary fetchAndUpdate, change notifications fetcher to not double fetch 2020-07-01 14:15:04 +03:00
Shpuld Shpuldson
38d8526660 change Show New text to Reload when flushing 2020-06-30 17:37:36 +03:00
Shpuld Shpuldson
ea09bbecf8 Make use of backend reply filtering 2020-06-30 17:02:38 +03:00
Shpuld Shpuldson
ee1364a167 add no-statusId support for status popover 2020-06-30 15:15:27 +03:00
Shpuld Shpuldson
6529f9fa34 add strikethrough when parent isn't visible 2020-06-30 15:04:16 +03:00
Shpuld Shpuldson
0ca3a6e63d fix gallery-videos being weirdly offset 2020-06-30 11:02:10 +03:00
Shpuld Shpuldson
79011e02ef Merge branch 'develop' into xenofem/pleroma-fe-rebased-image-description-authoring 2020-06-29 15:19:41 +03:00
Shpuld Shpuldson
8c2335f84f conflict whem merging xenofem changes 2020-06-29 15:03:51 +03:00
Shpuld Shpuldson
96d2c86d3b change placeholders to use descriptions, use icons with placeholders, change uploads to use attachment component 2020-06-29 14:48:22 +03:00
lain
82944f862d Merge branch '812-subject-separation' into 'develop' 
StatusContent: Better separate subject from status content.

Closes #812

See merge request pleroma/pleroma-fe!1150
 2020-06-29 07:53:12 +00:00
xenofem
529d72c297 suppress enter key on media description input field 2020-06-28 16:05:22 -04:00
Shpuld Shpuldson
61f34ff361 remove panel-footer in userpanel, simplify preview header, fix word-wrap in preview 2020-06-28 16:40:39 +03:00
Shpuld Shpuldson
ed5b36f751 make line sizes match for errors/loading and statuses, make X hitbox bigger, remove attachments, add shorter custom message for empty status preview. fix auto update triggering 2020-06-28 15:43:08 +03:00
Shpuld Shpuldson
3c47036101 add automatic updating 2020-06-28 15:14:01 +03:00
Shpuld Shpuldson
6e2de20367 show preview with plaintext too 2020-06-28 13:17:04 +03:00
Shpuld Shpuldson
cecf3d4f89 remove unnecessary type=button 2020-06-28 13:03:25 +03:00
Shpuld Shpuldson
9d6f233202 fix preview attachments getting wrong styles 2020-06-28 12:48:17 +03:00
Shpuld Shpuldson
3d5da3caf9 update styles in preview heading 2020-06-28 12:35:05 +03:00
Shpuld Shpuldson
223fabfe90 add rich text preview 2020-06-28 12:16:41 +03:00
xenofem
03aa1f3154 fix vue style warnings 2020-06-28 02:31:57 -04:00
xenofem
1ff55e17b1 fix invalid end tag on input element 2020-06-28 02:16:58 -04:00
William Pitcock
2c6ec37e6a media description support 2020-06-28 02:10:06 -04:00
Shpuld Shpludson
ea0a12f604 Merge branch 'develop' into 'iss-149/profile-fields-setting' 
# Conflicts:
#   src/components/settings_modal/tabs/profile_tab.vue
 2020-06-27 07:19:49 +00:00
Mark Felder
2eda3d687e Sync up key names properly 2020-06-26 17:02:17 -05:00
Mark Felder
5321415641 Update notification filters to reflect new settings 2020-06-26 16:56:31 -05:00
Shpuld Shpuldson
8c3106c588 Change the show/hide strings about, remove subjected status toggle when 'collapse' option not used 2020-06-26 18:20:32 +03:00
Shpuld Shpuldson
44edb730c1 rip restyle subject, fix some issues with long subject 2020-06-26 14:07:39 +03:00
Mark Felder
199fc9351d Merge branch 'develop' into refactor/notification_settings 2020-06-25 15:28:17 -05:00
Sergey Suprunenko
2b6d16900b
Use more correct class name for user badges 2020-06-21 15:36:20 +02:00
Sergey Suprunenko
c04f8b2ccb
Show a 'bot' badge on the service account page 2020-06-21 15:06:07 +02:00
Sergey Suprunenko
2451956d83
Add 'bot' flag to Profile settings 2020-06-21 14:59:05 +02:00
Henry Jameson
5aa65e32ef fix huge emoji in usernames 2020-06-19 16:09:44 +03:00
kPherox
bad3dacfac
implement user suggestor for profile fields 2020-06-19 21:18:36 +09:00
kPherox
fd2157efe4
Fix emoji input error 2020-06-19 20:51:53 +09:00
lain
4da0a0c0bf StatusContent: Fix greentext. 2020-06-19 12:49:42 +02:00
lain
a79bad5cdb StatusContent: Better separate subject from status content. 2020-06-19 12:46:48 +02: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
c4340ad467 move favicon 2020-06-18 17:09:30 +03:00
Shpuld Shpuldson
8a9654b511 Merge branch 'develop' into features/favicons 2020-06-18 16:47:37 +03:00
Shpuld Shpuldson
6d2befa452 move favicon to name 2020-06-18 16:47:32 +03:00
Shpuld Shpludson
6343ee929c Merge branch '589-poll-options' into 'develop' 
Polls: Construct an html field during normalization.

Closes #589

See merge request pleroma/pleroma-fe!1146
 2020-06-18 13:33:00 +00:00
lain
b0b33be9dd Poll, StatusContent: Move emoji css to status body. 2020-06-18 14:41:40 +02:00
kPherox
eed58a7b97
fix width of long field value 2020-06-18 20:13:44 +09:00
kPherox
bb513dd961
change key-value to look like one 2020-06-18 20:08:00 +09:00
Shpuld Shpuldson
f1175b4e9b revert import style 2020-06-18 13:41:04 +03:00
Shpuld Shpuldson
9c884fef11 remove search blocker, fix debounce params 2020-06-18 12:29:13 +03:00
Shpuld Shpuldson
632f62ee0f resume the previous emoji size for now 2020-06-17 18:34:24 +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
Shpuld Shpludson
24e47eb604 Update popover.js 2020-06-16 15:12:44 +00:00
Shpuld Shpludson
84a69f9502 Merge branch 'develop' into 'fix/popovers-cutting-off-in-notifications' 
# Conflicts:
#   CHANGELOG.md
 2020-06-16 14:51:12 +00:00
Shpuld Shpuldson
fc6ca20a42 disable subject field when posting 2020-06-16 17:34:22 +03:00
Shpuld Shpuldson
5a8a428c15 remove log whoops 2020-06-16 17:30:56 +03:00
Shpuld Shpuldson
5cf1574fdb fix popovers cutting off in notifications, port popover changes from chats mr 2020-06-16 17:20:36 +03:00
lain
d41c9a717c Polls: Construct an html field during normalization. 2020-06-14 13:16:08 +02:00
Henry Jameson
ac270d7060 fix #866 2020-06-13 14:42:53 +03:00
Henry Jameson
8cd5041663 add support for defining the greentext 2020-06-13 13:25:56 +03:00
Henry Jameson
c13d5b4f1b Fix faint links in notifications 2020-06-13 13:09:55 +03:00
Shpuld Shpuldson
14348d8ddf fix the contain option 2020-06-11 14:27:36 +03:00
Shpuld Shpuldson
2b6a6fe7ea make object-fit cover work like it should 2020-06-11 13:44:32 +03:00
Shpuld Shpludson
4e3ce18703 Merge branch 'feature/autocomplete-domain-mutes' into 'develop' 
Autocomplete domain mutes from list of known instances

Closes #824

See merge request pleroma/pleroma-fe!1103
 2020-06-10 11:18:30 +00:00
Shpuld Shpuldson
ea2b2a35bb add fade-in fade-out 2020-06-10 12:41:02 +03:00
Shpuld Shpuldson
855b8d4dad fix conflict 2020-06-10 11:52:46 +03:00
Shpuld Shpuldson
d3187720c5 remove useless captures 2020-06-10 11:49:04 +03:00
Henry Jameson
3cfdfec72d attempt to fix that one bug with submitting on copy-pasting 2020-06-10 11:18:07 +03:00
Shpuld Shpuldson
cd9d732afa add better visual indication for dropping files, make dropzone bigger 2020-06-10 11:01:38 +03:00
kPherox
54fdc22001
Add profile fields form 2020-06-10 03:37:58 +09:00
HJ
aa125072b3 Merge branch 'async-language-loading' into 'develop' 
Messages: Load languages asynchronously.

See merge request pleroma/pleroma-fe!1136
 2020-06-09 09:31:33 +00:00
lain
fbc4889ece Linting. 2020-06-08 18:26:16 +02:00
lain
e45f7fe877 MediaUpload: Correctly handle multiple uploads. 2020-06-08 18:22:17 +02:00
lain
99eaec8547 Messages: Load languages asynchronously. 
Reduces the size of the initial app bundle by about half.
 2020-06-08 17:22:07 +02:00
lain
e6a27bcaca MediaUpload: Allow drag-and-drop of multiple files at once 2020-06-08 13:30:16 +02:00
Sergey Suprunenko
1007039478
Autocomplete domain mutes from list of known instances 2020-06-08 13:17:18 +02:00
HJ
66b4121dad Merge branch 'fix-cropped-button-shadow' into 'develop' 
Fix the cropped button shadow in 2FA settings

See merge request pleroma/pleroma-fe!1133
 2020-06-07 13:52:52 +00:00
Henry Jameson
68482fd3a6 move helpers out of tabs directory 2020-06-07 00:15:10 +03:00
Henry Jameson
9e3e6b0c69 Merge remote-tracking branch 'origin/develop' into settings-modal 
* origin/develop: (22 commits)
  changelog
  alignment fixes
  Update CHANGELOG.md
  StillImage: Make it work properly in both firefox and chrome.
  ReactButton: Change the combined emoji (heart) to a simple one.
  Linting fixes.
  Settings: Keep a local version of the mutedWordsString
  MediaModal: Close on browser navigation events.
  StatusContent: Try to get hashtag from dataset first.
  Docs: Change wrong documentation.
  EntityNormalizerSpec: More fixes.
  EntityNormalizerSpec: Test new behavior.
  EntityNormalizer: Add colons to emoji alt text.
  fixed case in class name
  The sidebarRight option wasn't being read
  Use consistent naming for Pleroma-FE in README
  Remove mention of GNU Social
  lint
  multiple fixes
  fix non-mention notifs
  ...
 2020-06-07 00:10:21 +03:00
Karol Kosek
03952832b4
Fix the cropped button shadow in 2FA settings 2020-06-06 22:43:56 +02:00
HJ
e47d0f2103 Merge branch 'fix-reprooted-muted-posts' into 'develop' 
Fixed some issues with muting

See merge request pleroma/pleroma-fe!1120
 2020-06-06 20:31:43 +00:00
Henry Jameson
ebf2ce84fd alignment fixes 2020-06-06 23:08:52 +03:00
lain
2aabd8ed1a StillImage: Make it work properly in both firefox and chrome. 2020-06-05 17:55:19 +02:00
Shpuld Shpludson
63f237d736 Merge branch '848-change-emoji-reaction-defaults' into 'develop' 
ReactButton: Change the combined emoji (heart) to a simple one.

Closes #848

See merge request pleroma/pleroma-fe!1131
 2020-06-05 15:36:15 +00:00
lain
ba4c189c53 ReactButton: Change the combined emoji (heart) to a simple one. 2020-06-05 17:26:13 +02:00
lain
c4c5568b98 Linting fixes. 2020-06-05 13:51:47 +02:00
lain
282e10e3be Settings: Keep a local version of the mutedWordsString 
Without this it was impossible to use newlines
 2020-06-05 13:42:39 +02:00
HJ
c678756eba Merge branch '748-hashtag-link-fixes' into 'develop' 
StatusContent: Try to get hashtag from dataset first.

Closes #748

See merge request pleroma/pleroma-fe!1128
 2020-06-04 16:06:33 +00:00
lain
cb99dc2b27 MediaModal: Close on browser navigation events. 2020-06-04 16:30:28 +02:00
lain
d872d55832 StatusContent: Try to get hashtag from dataset first. 2020-06-04 15:50:44 +02:00
Henry Jameson
de3a376beb fixed case in class name 2020-06-02 01:16:10 +03:00
Henry Jameson
4fae2f8ea8 track if settings modal has been opened once 2020-06-02 01:10:52 +03:00
Henry Jameson
94436c1f85 fixed tab not hiding 2020-05-29 13:39:30 +03:00
Henry Jameson
9a20a90932 fixed the remaining issues 2020-05-28 21:28:01 +03:00
Mark Felder
b8350423d9 Updated Notification Settings API use 2020-05-28 10:57:02 -05:00
Henry Jameson
5ffcddd3b9 fixes. sorry for bad commit message i'm tired 2020-05-27 03:32:57 +03:00
Henry Jameson
3938ccb8e7 lint 2020-05-27 00:02:36 +03:00
Henry Jameson
a8e013bd65 Move modal frame parts away from modal-content into modal, improve error handling 2020-05-26 23:58:55 +03:00
Henry Jameson
5187b37aca moved multiChoiceProperties where it fits better 2020-05-26 22:50:37 +03:00
Henry Jameson
1f205b87ac lint 2020-05-26 01:06:34 +03:00
Henry Jameson
9d09e4090f multiple fixes 2020-05-26 01:01:25 +03:00
Henry Jameson
b5c1d074f8 fix reprööted posts not being muted properly. fix muted posts making 
desktop notifications
 2020-05-25 23:38:31 +03:00
Henry Jameson
a14635f4f2 oops 2020-05-25 19:57:32 +03:00
Henry Jameson
dc8f78e84d fix for a previous fix 2020-05-25 17:22:57 +03:00
Henry Jameson
101f657d36 improve big spinner visibility 2020-05-25 17:21:05 +03:00
Henry Jameson
ccdbba2348 Change flex for tab switcher lines to always have some small space reserved 2020-05-25 17:18:57 +03:00
Henry Jameson
0eea5c6b80 fix icon changing color 2020-05-25 17:11:30 +03:00
Henry Jameson
500511b415 fix sidebar not closing in mobile 2020-05-25 17:05:30 +03:00
Henry Jameson
534e1fef88 lint 2020-05-25 16:56:32 +03:00
Henry Jameson
5d1b539da2 lint 2020-05-25 16:48:23 +03:00
Henry Jameson
097216c49e remove timeout, was meant for testing 2020-05-25 16:32:32 +03:00
Henry Jameson
bb418bf155 fix tests. user-profile didn't have tab-switcher compnent imported!! 2020-05-25 16:23:14 +03:00
Henry Jameson
0286e1024c fix cursor on desktop, add modal link on mobile 2020-05-25 16:16:30 +03:00
Henry Jameson
7951192cd9 Improve settings-modal async loading, update vue to 2.6.11 to be able 
to use Vue.observable, to implmement resettable async component
 2020-05-25 16:11:05 +03:00
Henry Jameson
a6ca923a76 icons update 2020-05-25 16:10:43 +03:00
Henry Jameson
79c03984bc scroll to top when switching tabs 2020-05-25 14:16:03 +03:00
Henry Jameson
6a4ad1fe62 added "settings saved" notice back 2020-05-25 14:04:36 +03:00
Henry Jameson
e7ba4255bb eslint --fix + small fix 2020-05-25 03:43:55 +03:00
Henry Jameson
bcea2e4d12 cleanup 2020-05-25 03:30:14 +03:00
Henry Jameson
138ec85003 Merge remote-tracking branch 'origin/develop' into settings-modal 
* origin/develop: (95 commits)
  Translated using Weblate (Italian)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Russian)
  Translated using Weblate (Polish)
  Translated using Weblate (Dutch)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  ...
 2020-05-25 03:29:48 +03:00
Henry Jameson
1e606d2f26 split modal's content into another component, add lazy loading 2020-05-25 03:14:41 +03:00
Henry Jameson
a872c53472 misc fixes 2020-05-24 02:29:09 +03:00
Henry Jameson
ab74cd4972 Multiple fixes for CSS, added proper auth checking 2020-05-24 02:06:55 +03:00
Shpuld Shpludson
0b44a5b601 Merge branch 'fix/its-me-elements' into 'develop' 
Show "it's you" label and hide follow btn for current user

Closes #839 and #827

See merge request pleroma/pleroma-fe!1111
 2020-05-20 14:48:52 +00:00
Sergey Suprunenko
db8dd1223c
Make a condition clear and unambiguous 2020-05-14 09:27:58 +02:00
Sergey Suprunenko
e50857d0ff
Show "it's you" label and hide follow btn for current user 2020-05-14 09:25:07 +02:00
Shpuld Shpuldson
8e39971098 add with_relationships where necessary 2020-05-13 17:48:31 +03:00
Henry Jameson
bcebec478e moved stuff from settings, cleaned up naming for tabs, added close and peek 2020-05-10 06:46:06 +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
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
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
Mark Felder
b3003d4e8d Add notification privacy option to user settings 2020-05-06 11:46:40 -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
Henry Jameson
2e35289c33 initial work on settings modal 2020-05-03 17:36:12 +03:00
Shpuld Shpuldson
92ccaa97bb don't dismiss a rejected follow request on server 2020-05-02 11:51:39 +03:00
Shpuld Shpuldson
75519223f9 mark single notifs as seen properly on server 2020-05-02 10:52:57 +03:00
Shpuld Shpuldson
406fdd8ede follow request bugfixes, wrong text, notifs not being marked as read, approving from follow request view 2020-05-02 10:19:47 +03:00
eugenijm
01b07f01e9 Add support for follow request notifications 2020-04-30 09:58:55 +03:00
Shpuld Shpuldson
7a25160ddc Separate status content from status like in direct conversations mr 2020-04-27 12:53:04 +03:00
Shpuld Shpludson
fe16b6259e Merge branch 'feature-emoji-length-sorting' into 'develop' 
Allow emoji suggestions based on a match anywhere in the emoji name, but improve sorting

Closes #135

See merge request pleroma/pleroma-fe!1061
 2020-04-27 08:01:57 +00:00
Shpuld Shpludson
d32159d69d Merge branch 'fix/status-showing-hiding' into 'develop' 
Refactor status showing/hiding code for better handling of edge cases and easier comprehension

Closes #779

See merge request pleroma/pleroma-fe!1073
 2020-04-27 07:47:02 +00:00
Shpuld Shpuldson
8b1aa593a4 fix status mutes 2020-04-27 10:06:17 +03:00
Shpuld Shpuldson
af9492977a add back mute prediction, add getter for relationships 2020-04-24 18:53:17 +03:00