AkkomaGang/akkoma-fe
4
13
Fork 56
Code Issues 74 Pull requests 14 Projects Releases 1 Wiki Activity
6728 commits 13 branches 29 tags 18 MiB
Commit graph

906 commits

Author SHA1 Message Date
lain 1afa0f0044 Merge branch 'notification-unification-experiments' into 'develop' 
Notification unification / WebPush i18n.

See merge request pleroma/pleroma-fe!1142
 2020-06-19 13:34:04 +00:00
sadposter 77bd79100b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2020-06-19 11:01:06 +01: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 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
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
Henry Jameson 8cd5041663 add support for defining the greentext 2020-06-13 13:25:56 +03:00
lain 33c1adbef4 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into notification-unification-experiments 2020-06-12 12:58:01 +02:00
lain 0c36486299 API: Remove fetch polyfill 
All browser except IE have supported this for longer than
Pleroma even exists.
 2020-06-11 18:49:39 +02:00
lain 8d7d4980b9 StatusParser: Remove unused removeAttachmentLinks. 
Brings down the vendor by over 200kb
 2020-06-11 18:39:19 +02:00
lain 98819ae32c NotificationUtils: Add tag to notifications. 2020-06-11 15:49:39 +02:00
lain a52a393266 NotificationUtils: Extract preparation of notification object. 2020-06-11 15:22:31 +02:00
Sergey Suprunenko 1007039478
Autocomplete domain mutes from list of known instances 2020-06-08 13:17:18 +02: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
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
sadposter f99240df69 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2020-06-06 18:30:38 +01: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
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 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
Ivan Tashkinov 5235e7ea1e Removed with_muted param usage for user favorites timeline endpoint (it only supports pagination params). 2020-05-25 08:48:44 +03:00
sadposter 78db835fe1 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop 2020-05-20 17:16:21 +01:00
Shpuld Shpuldson 9c7cb3a954 remove search1 with_relationships 2020-05-13 18:04:30 +03:00
Shpuld Shpuldson 355281081a don't send undefined 2020-05-13 17:53:43 +03:00
Shpuld Shpuldson 8e39971098 add with_relationships where necessary 2020-05-13 17:48:31 +03:00
sadposter 10153e692e ihba updates 2020-05-08 14:38:46 +01: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 Shpuldson 75519223f9 mark single notifs as seen properly on server 2020-05-02 10:52:57 +03:00
Shpuld Shpludson c67e9daf06 Merge branch 'follow-request-notification' into 'develop' 
Add support for follow request notifications

Closes #823 and #822

See merge request pleroma/pleroma-fe!1093
 2020-05-01 20:24:25 +00:00
Shpuld Shpuldson 02c8a9e314 remove with_move param 2020-05-01 17:26:07 +03: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 99d8e16e4d remove with_relationships as it doesn't help 2020-04-23 14:11:48 +03:00
Shpuld Shpuldson ce0a1e7ad1 add back missing catch 2020-04-23 14:08:33 +03:00
Shpuld Shpuldson cda298c822 remove unused mutation and test for it 2020-04-23 11:17:52 +03:00
Shpuld Shpuldson aa56147322 fix follow 2020-04-22 15:06:10 +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
Egor Kislitsyn 18fa338d43
Fix pagination 2020-04-13 15:26:55 +04:00
Mark Felder 40005240eb Send credentials for favourited_by and reblogged_by API endpoints 
This ensures the data is fetchable on private instances
 2020-03-31 14:46:38 -05:00
Henry Jameson a485386a3b fix tests 2020-03-06 21:48:40 +02:00
Henry Jameson 550080bd82 fix last issue 2020-03-06 21:39:17 +02:00
Henry Jameson 7aa5bf0896 prioritize disabled opacity over transparent keyword 2020-03-06 21:20:42 +02:00
Henry Jameson 9f2c1b4008 fix several issues related to opacity 2020-03-06 21:17:24 +02:00
Henry Jameson 0702934f4f fix trasparency problems in some cases (purple headers) 2020-03-04 00:23:14 +02: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
Henry Jameson d19c64314f stop using customTheme in user card, instead use color slots. fix for opacity 
inheritance polluting inheritors
 2020-02-20 18:13:40 +02:00
Shpuld Shpludson 0abc3f9b85 Merge branch 'moderation-menu-fix' into 'develop' 
Fix user deactivation, deletion, and role assignment in the moderation menu

See merge request pleroma/pleroma-fe!1063
 2020-02-19 16:30:53 +00:00
kPherox da55b0d435
Add fields_text for tooltip 2020-02-19 20:57:58 +09:00
Henry Jameson 1e95a0795a paper theme, updated todo, lol 2020-02-17 23:59:52 +02:00
Henry Jameson 3b3a31b461 improve the display of disabled buttons 2020-02-17 23:43:56 +02:00
eugenijm 695d6b6c50 Fix user activation/deactivation, deletion, and role assignment in the moderation menu 2020-02-17 16:29:39 +03:00
Henry Jameson c43325acd7 fix pressed button in top bar 2020-02-13 21:39:14 +02:00
Henry Jameson 73dd7209dd fixed transparent + semi-transparent inheritance case 2020-02-12 01:12:36 +02:00
HJ 84ebae8ed3 Merge branch 'develop' into 'themes-accent' 
# Conflicts:
#   src/components/emoji_reactions/emoji_reactions.vue
 2020-02-11 23:09:15 +00:00
Henry Jameson 60446c56a5 fix v2 breezy themes having messed up pressed buttons. updated v2.1 breezy 
themes to have derived colors instead of fixed ones.
 2020-02-12 00:46:48 +02:00
Shpuld Shpludson f6b482be51 Emoji Reactions - fixes and improvements 2020-02-11 12:24:51 +00:00
Henry Jameson 29133fb008 don't use cache for theme data 2020-02-11 10:42:15 +02:00
Henry Jameson 786a695eb6 Merge remote-tracking branch 'upstream/develop' into themes-accent 
* upstream/develop:
  Fix one click nsfw unhide on videos
  Escape HTML from display name and subject fields
 2020-02-11 10:03:34 +02:00
Henry Jameson 43bddc79e0 fix/remove contrast ratios 2020-02-11 01:13:59 +02:00
Henry Jameson e6f148b8a3 removed base16-related code 2020-02-11 00:59:07 +02:00
Henry Jameson 38c34b8b51 fixed eslint, made mod work properly depending on context including in shadows 2020-02-11 00:34:30 +02: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
Henry Jameson 611da13a4b Better Disabled buttons support. Mammal theme fixes. Implemented proper 
context-aware `mod` argument - now checks lightness of "variant" color. needs
retesting tho
 2020-02-07 01:25:26 +02:00
kPherox a06f3a7fbc
Add with_move param for fetching notification 2020-02-04 04:54:36 +09: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
Henry Jameson f0c4bb1193 Merge remote-tracking branch 'upstream/develop' into themes-accent 
* upstream/develop: (33 commits)
  add emoji reactions to changelog
  fix emoji reaction classes broken in develop
  review changes
  Fix password and email update
  remove unnecessary anonymous function
  Apply suggestion to src/services/api/api.service.js
  remove logs/commented code
  remove favs count from react button
  remove mock data
  change emoji reactions to use new format
  Added polyfills for EventTarget (needed for Safari) and CustomEvent (needed for IE)
  Fix missing TWKN when logged in, but server is set to private mode.
  Fix follower request fetching
  Add domain mutes to changelog
  Implement domain mutes v2
  change changelog to reflect actual release history of frontend
  Fix #750 , fix error messages and captcha resetting
  Optimize Notifications Rendering
  update CHANGELOG
  Use last seen notif instead of first unseen notif for sinceId
  ...
 2020-01-28 20:44:13 +02:00
Shpuld Shpuldson 6afff4f8c2 review changes 2020-01-28 17:09:25 +02:00
Henry Jameson b63e679a31 removed one color TODO 2020-01-28 02:03:21 +02:00
Henry Jameson 526b43eba6 Kenomo (see: #624) theme. Ability to define link color for post contents. Fixes 2020-01-28 01:29:20 +02:00
Henry Jameson 18ca2a035b fix rgba function, whoops 2020-01-28 00:26:10 +02:00
Shpuld Shpuldson e6291e4ee1 remove unnecessary anonymous function 2020-01-27 18:43:26 +02:00
Henry Jameson 7c074b8741 fix rgba css generation, add some tests to automatically verify that themes are 
generated properly
 2020-01-27 04:20:13 +02:00
Shpuld Shpuldson c4beac5f89 Merge branch 'develop' into feat/emoji-reactions 2020-01-26 15:59:59 +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
Henry Jameson d7e7f47b66 fix transparent color not affecting downstream slots 2020-01-24 00:56:47 +02:00
Henry Jameson b96993e4dd improved selectedMenu again 2020-01-24 00:36:32 +02:00
Henry Jameson 53576df72a popover/selected menu improvements 2020-01-24 00:02:16 +02:00
Henry Jameson f7ea12c905 separate actual theme data from theme framework 2020-01-23 23:37:58 +02:00
Henry Jameson c1f2457112 revert fgText -> text after some consideration. case was fixed already in other way 2020-01-23 22:48:32 +02:00
Henry Jameson c752f56d0b v l1 compatibility 2020-01-23 22:26:49 +02:00
Henry Jameson 64fc07f080 removed unused constant, using getOpacitySlot now 2020-01-23 00:36:38 +02:00
Henry Jameson 7354b6f706 fixed get(Layer|Opacity)Slot not working properly which broke Mojave theme 2020-01-23 00:35:56 +02:00
Henry Jameson 8de7eabd8f v2 compatibility fixes 2020-01-22 23:26:24 +02:00
Henry Jameson 644ce497a0 lightBg -> highlight because it causes issues with v2 2020-01-22 01:28:46 +02:00
Henry Jameson 9336140486 massively improved initial theme loading code, added checks and warnings when 
loading theme files (import/localStorage/defaults)
 2020-01-22 00:37:19 +02:00
lain 8080981fcd Fix follower request fetching 2020-01-21 16:51:49 +01:00
Henry Jameson 2b36a62c56 fix tests, integrate depenentless sorting into toposort for easier testing and 
better guarantees
 2020-01-20 01:44:11 +02:00
Henry Jameson 6e1c538e41 multiple fixes to make style switcher not die. Made shadows work, incuding compatibility 2020-01-20 01:31:54 +02:00
Henry Jameson e4033c85e2 removed console logs 2020-01-20 00:34:49 +02:00
Henry Jameson 62343f6099 documentation 2020-01-19 20:59:54 +02:00
Henry Jameson f77d675434 optimized theme loading so that it wouldn't wait until ALL themes are loaded to 
select one by default
 2020-01-17 00:27:46 +02:00
Henry Jameson c351e5124c fix selectedPost/selectedMenu 2020-01-16 23:28:42 +02:00
Henry Jameson 552d13a060 better fallback for transparent colors 2020-01-16 23:09:46 +02:00
Henry Jameson e070ec4b66 more opacity handling 2020-01-16 21:34:33 +02:00
Henry Jameson f16ec75c70 opacity handling 2020-01-16 20:53:05 +02:00
Shpuld Shpludson 7a013ac393 Implement domain mutes v2 2020-01-15 20:22:54 +00:00
Shpuld Shpludson 662afe973a Fix #750 , fix error messages and captcha resetting 2020-01-14 13:45:00 +00:00
Shpuld Shpludson 86380f0429 Optimize Notifications Rendering 2020-01-14 13:28:57 +00:00
Shpuld Shpuldson 910b82e231 Use last seen notif instead of first unseen notif for sinceId 2020-01-14 11:13:59 +02:00
Shpuld Shpuldson b32888194c fix merge conflicts 2020-01-13 23:47:32 +02:00
Shpuld Shpuldson 33abbed5a1 usable-but-buggy: picker, adding/removing reaction on click, search, styles 2020-01-13 23:34:39 +02:00
Henry Jameson 9f7af191e8 tabs & toggled (ex pressed) buttons 2020-01-13 22:19:19 +02:00
Henry Jameson 4b8e0f0afa buttonPressed & buttonDisabled slots 2020-01-13 21:30:55 +02:00
Henry Jameson 8a7f3fc16a selectedPost and selectedMenu support 2020-01-13 20:40:16 +02:00
Henry Jameson 29a0b4a593 fix shadow and opacity 2020-01-13 02:08:39 +02:00
Henry Jameson 8d2f2866f6 computed colors support 2020-01-13 01:56:29 +02:00
Henry Jameson 8f63bbb64f poll slot renamed, lightBg customization implemented 2020-01-13 00:33:04 +02:00
Henry Jameson 40ba3e2252 added more slots to UI 2020-01-12 23:41:11 +02:00
Henry Jameson 39dd08e694 replace hsl's l with relative luminance for better lightness detection 2020-01-12 17:58:26 +02:00
Henry Jameson 88f83fc9fa overhaul how style-switcher makes state, removed tons of copy-paste 2020-01-12 17:46:07 +02:00
Henry Jameson d52d181227 more fixes 2020-01-12 15:04:05 +02:00
Henry Jameson d342f32a94 fix 2020-01-12 04:05:26 +02:00
Henry Jameson 1aea1f217e remove debug 2020-01-12 04:01:31 +02:00
Henry Jameson a9a1fc37f5 fixes, cleanup 2020-01-12 04:00:41 +02:00
Henry Jameson 622c9d388e Refactoring, forgotten files 2020-01-12 03:44:06 +02:00
Henry Jameson 38f2b969e4 simplified definition for text color by accounting for layers automatically, 
fixed badge notification text color by adding 'bw' option for textColor
 2020-01-11 23:07:41 +02:00
Henry Jameson cce64077b5 Refactored style_setter to be more declarative instead of walls of copypasted code 2020-01-06 22:55:14 +02:00
HJ 215662afde Merge branch 'develop' into 'fix-move-type-notification' 
# Conflicts:
#   static/fontello.json
 2020-01-03 09:05:48 +00:00
Henry Jameson 4bb1c98e0f Replaced v3compat with source to reduce code complexity. Made more slots 
customizable. `theme` now contains a snapshot of theme generated for better
compatiblity and future-proofing
 2020-01-02 20:36:10 +02:00
Henry Jameson 332d31dc02 support for "transparent" color keyword 2019-12-30 00:45:48 +02:00
Henry Jameson 6e11924c27 underlay customization, updated contrast calculations to account for alpha blending 2019-12-28 18:49:35 +02:00
Henry Jameson 1a78461443 fixed import-export 2019-12-28 17:02:34 +02:00
Henry Jameson e5a34870f0 Accent works 2019-12-28 15:55:42 +02:00
Henry Jameson b619477573 Merge remote-tracking branch 'upstream/develop' into streaming 
* upstream/develop: (51 commits)
  toggle_activation api is also deprecated
  use vuex action
  refactor toggleActivationStatus
  replace setActivationStatus api with new one
  use flex for stickers
  i18n/update-ja_easy
  Use a centralized fallback for missing values and use instance.federating instead of instance.federation.enabled
  Add fallback in case BE does not report federating status in nodeinfo
  The value we are looking for is federationPolicy.enabled, not federationPolicy.federating
  Logic should be to hide TWKN if not federating OR if instance is not public
  Finally trust eslint
  More lint
  More lint
  Lint
  mfa: removed unused code
  increase icon width a little bit in the nav panel
  add icons to nav panel
  Revert "Merge branch 'revert-96cab6d8' into 'develop'"
  Support "native" captcha
  Revert "Merge branch 'oauth-extra-scopes' into 'develop'"
  ...
 2019-12-26 12:47:51 +02:00
taehoon 4e4c4af422 toggle_activation api is also deprecated 2019-12-15 14:32:04 -05:00
taehoon 45e7f93c49 refactor toggleActivationStatus 2019-12-15 14:32:04 -05:00
taehoon 506822bed0 replace setActivationStatus api with new one 2019-12-15 14:32:04 -05:00
HJ c1a0e23947 Merge branch 'revert-c2c48ec2' into 'develop' 
Reinstate `push` and `admin` scopes

See merge request pleroma/pleroma-fe!1034
 2019-12-14 14:12:41 +00:00
feld 749a399944 Merge branch 'issue_124' into 'develop' 
Change 403 messaging

See merge request pleroma/pleroma-fe!1020
 2019-12-13 17:02:09 +00:00
HJ 9789123b1c Merge branch 'mfa/login_form' into 'develop' 
mfa: fix login and recovery form

See merge request pleroma/pleroma-fe!1031
 2019-12-13 10:18:50 +00:00
Ivan Tashkinov 341416b0e0 Revert "Merge branch 'revert-96cab6d8' into 'develop'" 
This reverts merge request !1032
 2019-12-12 14:43:48 +00:00
lain b399235848 Revert "Merge branch 'oauth-extra-scopes' into 'develop'" 
This reverts merge request !1024
 2019-12-12 09:38:24 +00:00
Maksim Pechnikov f70fe28f64 mfa: fix login and recovery form 2019-12-12 08:42:21 +03:00
Henry Jameson 63a5f50e7c fix deletes causing errors 2019-12-11 18:20:43 +02:00
Maksim Pechnikov d6dc2bad1f fixed typo 2019-12-11 15:59:29 +03:00
Henry Jameson 6acd889589 Option to enable streaming 2019-12-10 21:30:27 +02:00
kPherox 6af870cd90
Add view for moves notifications 2019-12-11 00:00:45 +09:00
kPherox 2bc63720a5
fix parse for move type notifications 2019-12-11 00:00:36 +09:00
Wyatt Benno 8ee8033955 Set error data 2019-12-09 10:31:57 +09:00
Wyatt Benno 1a043d4350 remove console 2019-12-09 09:11:31 +09:00
Wyatt Benno e86af0c965 Change naming, make more general 2019-12-09 09:02:34 +09:00
Henry Jameson 505fb26061 better wrapper for websocket 2019-12-08 19:18:38 +02:00
Henry Jameson ff95d865d2 Updated streaming and improved error-handling, some more refactoring to api 2019-12-08 16:05:41 +02:00
Ivan Tashkinov a06705d939 Added OAuth 'push' and 'admin' scopes. 2019-12-08 13:52:26 +03:00
Wyatt Benno 01855f315c Wording updates 2019-12-06 09:38:55 +09:00
Wyatt Benno 13fc2612ae Change 403 messaging 2019-12-05 11:48:37 +09:00
Henry Jameson 172ebaf4e6 improved initial notifications fetching 2019-11-24 22:01:12 +02:00
Henry Jameson 319bb4ac28 initial streaming work 2019-11-24 18:50:28 +02:00
Henry Jameson ddb6fb9217 Backend Interactor service overhaul, removed the need for copypasting 2019-11-24 13:57:46 +02:00
HJ 0eda60eeb4 Merge branch 'greentext-strikes-back' into 'develop' 
⑨ Added greentext support ⑨

Closes #9

See merge request pleroma/pleroma-fe!994
 2019-11-19 14:22:17 +00:00
kPherox a55486f8d7 Normalize profile fields 2019-11-19 14:15:41 +00:00
kPherox 0995658757 backend interactor service: implement startFetchingFollowRequest 
backend interactor service: remove unused fetchFollowRequests
 2019-11-19 14:07:15 +00:00
Shpuld Shpuldson d007502629 add fetching for emoji reactions, draft design 2019-11-15 08:39:21 +02:00
Henry Jameson bd2a682b83 tests + updates 2019-11-14 22:40:20 +02:00
Henry Jameson 692ee0e95a Fix regex, tag detector condition 2019-11-14 00:41:14 +02:00
Henry Jameson 50dc9df8a4 adds greentext, also small fixes 2019-11-14 00:18:14 +02:00
Henry Jameson 0dcb696e26 Merge remote-tracking branch 'upstream/develop' into emoji-optimizations 
* upstream/develop: (95 commits)
  Lightbox/modal multi image improvements - #381
  '/api/pleroma/profile/mfa' -> '/api/pleroma/accounts/mfa'
  Add ability to change user's email
  translations-de-batch-1
  eu-translate update
  profile-banner rounding css, fixes #690
  fix indentation
  remove needless ref
  show preview popover when hover numbered replies
  refactor conditions
  do not make too many nested div
  add fetchStatus action
  refactor status loading logic
  split status preview popover into a separate component
  uninstall mobile-detect library
  listen both events
  minor css fix
  restrict distance at top side only
  set different trigger event in desktop and mobile by default
  fix eslint warnings
  ...
 2019-11-08 19:48:31 +02:00
Maksim ded022a1d2 '/api/pleroma/profile/mfa' -> '/api/pleroma/accounts/mfa' 2019-11-08 02:42:32 +00:00
Sergey Suprunenko e3381cdef1 Add ability to change user's email 2019-11-08 02:21:19 +00:00
Henry Jameson b66564a30d Merge remote-tracking branch 'upstream/develop' into settings-refactor 
* upstream/develop: (89 commits)
  remove needless ref
  show preview popover when hover numbered replies
  refactor conditions
  do not make too many nested div
  add fetchStatus action
  refactor status loading logic
  split status preview popover into a separate component
  uninstall mobile-detect library
  listen both events
  minor css fix
  restrict distance at top side only
  set different trigger event in desktop and mobile by default
  fix eslint warnings
  fix popper go behind the top bar
  migrate Popper to v-popover
  fix popper go behind the top bar
  fix eslint warnings
  reset font-size to normal text size using rem
  use top placement by default
  hide status preview popper when hover popper content
  ...
 2019-10-29 09:36:16 +02:00
Henry Jameson 6511a744a2 arbitrary limit with option to overcome it 2019-10-08 21:38:27 +03:00
Maksim Pechnikov 541a71c3a5 Merge branch 'develop' into feature/following_reblogs 2019-10-08 16:49:03 +03:00
Maksim Pechnikov a26d550137 updated user_card 2019-10-08 16:46:54 +03:00
Henry Jameson 0be86304d2 Fix tests, more replacing with mergedConfig 2019-10-06 23:28:30 +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
kaniini 4369ce6f1b Merge branch 'hide-followers-follows-count' into 'develop' 
Added a setting to hide follow/follower count from the user profile

See merge request pleroma/pleroma-fe!951
 2019-09-26 22:20:01 +00:00
Maksim Pechnikov 19cb98b85f Merge branch 'develop' into feature/following_reblogs 2019-09-26 21:14:31 +03:00
Henry Jameson a3305799c7 Merge remote-tracking branch 'upstream/develop' into emoji-selector-update 
* upstream/develop: (42 commits)
  Fix formatting in oc.json
  avoid using global class
  fix logo moving bug when lightbox is open
  Reserve scrollbar gap when body scroll is locked
  setting display: initial makes trouble, instead, toggle display: none using classname
  lock body scroll
  add body-scroll-lock directive
  install body-scroll-lock
  wire up props with PostStatusModal
  rename component
  recover autofocusing behavior
  refactor MobilePostStatusModal using new PostStatusModal
  add new module and modal to post new status
  remove needless condition
  add mention button
  wire up user state with global store
  collapse fav/repeat notifications from muted users
  do not collapse thread muted posts in conversation
  detect thread-muted posts
  do not change word based muting logic
  ...
 2019-09-25 20:26:49 +03:00
Henry Jameson 0d6a9f5a62 comment, cleanup and improve autoresize/autoscroll 2019-09-25 19:30:55 +03:00
Henry Jameson 0f55359b49 fix 2019-09-25 08:43:02 +03:00
Henry Jameson 4f563e6efb account for parent padding, too 2019-09-25 08:36:30 +03:00
Henry Jameson daa0e284c3 forgotten file 2019-09-25 00:21:55 +03: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
rinpatch 1306fac38f Merge branch 'develop' into 'muting-fixes' 
# Conflicts:
#   src/components/status/status.js
 2019-09-16 11:38:37 +00:00
taehoon 6a3f283256 detect thread-muted posts 2019-09-13 22:59:24 -04:00
Henry Jameson 0d8b68632b Remove emoji zoom 2019-09-12 20:25:11 +03:00
Shpuld Shpludson 4a469d7fe3 Merge branch 'fix/follow-request-detection' into 'develop' 
Utilize `user.requested` to display follow request status on user card

Closes #635

See merge request pleroma/pleroma-fe!942
 2019-09-12 07:02:11 +00:00
Henry Jameson 9146bee7aa better hitbox for status emoji 2019-09-08 21:18:52 +03:00
taehoon ea5b36a597 refactor toggling body visibility using class 2019-09-06 11:17:29 -04:00
Shpuld Shpludson e75ac9ddbc Merge branch 'mastoapi-externalprofile' into 'develop' 
Replace `/api/externalprofile/show.json` with a MastoAPI equialent

See merge request pleroma/pleroma-fe!938
 2019-09-06 04:13:21 +00:00
Eugenij 8ee5abb1a5 Password reset page 2019-09-05 11:23:28 +00:00
rinpatch 424d4ab57e Utilize user.requested to display follow request status on user card 
Closes #635
 2019-09-05 11:17:53 +03:00
rinpatch 1a5a7bbebf Set thread_muted for all statuses with the same conversation id on 
status mute/unmute
 2019-09-04 21:11:13 +03:00
rinpatch 66a34b7ecf Properly detect thread-muted posts and set with_muted when fetching 
notifications
 2019-09-04 12:20:33 +03:00
rinpatch 457290e81e Replace /api/externalprofile/show.json with a MastoAPI equialent 
`/api/v1/accounts/:id` supports remote nicknames since pleroma!1622
 2019-09-03 19:59:28 +03:00
rinpatch 8e3d6f5c28 Use mastodon api in follow requests 2019-09-03 13:50:26 +03:00
rinpatch 114b5f6eff Apply suggestion to src/services/follow_manipulate/follow_manipulate.js 2019-08-09 12:26:58 +00:00
rinpatch 5f3ac6625f Apply suggestion to src/services/follow_manipulate/follow_manipulate.js 2019-08-09 12:25:58 +00:00
rinpatch e83b321ff2 Apply suggestion to src/services/follow_manipulate/follow_manipulate.js 2019-08-09 12:01:57 +00: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
Lee Starnes 4fc27414d2 Handle JSONified errors while registering 
Closes #617
 2019-08-06 18:03:31 +00:00
Shpuld Shpludson d3f6b581d1 Merge branch 'develop' into 'feat/conversation-muting' 
# Conflicts:
#   src/components/extra_buttons/extra_buttons.js
#   src/components/extra_buttons/extra_buttons.vue
 2019-07-26 12:44:32 +00:00
taehoon 876c6de806 fix typos 2019-07-24 21:02:37 -04:00
shpuld 619608ea7a fix issues caused by merges in usersearch on @ 2019-07-18 17:22:51 +03: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
Eugenij 69a4bcb238 New search 2019-07-15 16:42:27 +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
jared f2c95f9d0b #482 - add new endpoints to subscribe to the user 2019-07-10 21:01:07 -04:00
Tae Hoon 532b76eb64 Refactor user search api, better api error response handling 2019-07-10 16:58:49 +00:00
shpuld 7ed9d17ce7 Add thread muting to context menu of status 2019-07-07 23:02:09 +03:00
Shpuld Shpludson 54b0f90133 Merge branch 'eslint-fix' into 'develop' 
Fix shitton warning eslint gives

See merge request pleroma/pleroma-fe!871
 2019-07-07 19:12:33 +00:00
Shpuld Shpludson 171673113f Merge branch 'revoke-token' into 'develop' 
Revoke oAuth token on logout

Closes pleroma#952

See merge request pleroma/pleroma-fe!864
 2019-07-07 18:29:36 +00:00
Shpuld Shpludson c8794b2b84 Merge branch '580' into 'develop' 
Fix backend version string parsing

Closes #580

See merge request pleroma/pleroma-fe!868
 2019-07-07 10:30:45 +00:00
Eugenij 14ec12b4f6 Set hide_follows and hide_followers settings when parsing Mastodon format 2019-07-07 10:20:55 +00:00
Henry Jameson 020c6d1bcf all the manual fixes 2019-07-07 00:54:17 +03:00
taehoon 66842efd81 update regex for commit hash 2019-07-05 11:11:31 -04:00
Henry Jameson 2c2b84d31d npm eslint --fix . 2019-07-05 10:02:14 +03:00
Egor Kislitsyn 52319acf58 Revoke oAuth token 2019-07-02 15:33:40 +07:00
taehoon 1c03bd0ebc add resolve param to user search api request 2019-06-24 07:49:22 -04:00
lain 0eed2ccca8 Feature/polls attempt 2 2019-06-18 20:28:31 +00:00
HJ 22a3351208 Apply suggestion to src/services/backend_interactor_service/backend_interactor_service.js 2019-06-17 20:12:11 +00:00
HJ 8caf13bbce Apply suggestion to src/services/api/api.service.js 2019-06-17 08:20:02 +00:00
Henry Jameson 6744396f82 getting and setting user background via MastoAPI 2019-06-16 20:17:59 +03:00
Henry Jameson f9c3aabea4 Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret 
* upstream/develop:
  fix user banner
 2019-06-13 10:05:53 +03:00
Henry Jameson d1fd3e3a1c fix user banner 2019-06-13 01:48:41 +03:00
Henry Jameson c8a57ad32e Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret 
* upstream/develop:
  Revert "add TOTP/Recovery Form for mobile version"
 2019-06-13 00:51:14 +03:00
Henry Jameson 1e94aecbc9 AMERICA 2019-06-13 00:47:06 +03:00
Henry Jameson 77511a5338 Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret 
* upstream/develop:
  Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js
  i18n/Update Japanese translation
  render modal at the root level using portal
  install portal vue
  Small improve of the who to follow panel layout
  Fix/Small fix in the who to follow page
  remove console spam
  i18n
  wire up user.description with masto api data
  i18n/Add Japanese with kanji (2)
  move drowdown menu to popper
  notification controls: redesign entirely
  entity normalizer: collapse data.pleroma if blocks
  wire up notification settings
  do not miss statusnet_profile_url of mentions
  Translation to Hebrew of everything other than theme_helpers and style.
  Translate up to settings.
  mastoapi login works
 2019-06-13 00:07:28 +03:00
Maksim 77eceedbf7 Revert "add TOTP/Recovery Form for mobile version" 
This reverts commit a3811f944819430c278b6da6b08dc322a9b9ff65.
 2019-06-12 20:16:55 +00: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 e7a2a7267d Proper clientId/secret/token caching, MastoAPI registration 2019-05-22 19:13:41 +03:00
Henry Jameson fc12b63fcc mastoapi login works 2019-05-21 23:35:40 +03:00
HJ 0fc7cbfa24 Merge branch 'fetags' into 'develop' 
add tags to data and to status component

See merge request pleroma/pleroma-fe!801
 2019-05-20 21:02:29 +00:00
HJ b78ad8998d Merge branch 'masto-remains' into 'develop' 
Interactions 2.0, removing last bits of qvitter api. Only login/register and change background remains after that

See merge request pleroma/pleroma-fe!792
 2019-05-20 20:54:05 +00: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 2457dd9b91 rename for consistency's sake 2019-05-16 14:02:37 -04:00
taehoon b6731bd9af update admin api urls in accordance with new docs 2019-05-16 13:21:14 -04:00
taehoon 2ce0186327 update api service functions 2019-05-15 12:04:26 -04:00
taehoon 110c9d3b26 improve performance by caching pinned status ids into user object 2019-05-15 12:04:26 -04:00
taehoon 87de130ee5 apply status normalizer 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 93e9bc019e clean up fetchPinnedStatuses api service 2019-05-15 12:04:26 -04:00
taehoon 1229622fed refactor error handling of pinStatus 2019-05-15 12:04:25 -04:00