Commit graph

446 commits

Author SHA1 Message Date
taehoon 992c8e1f77 stop fetching user relationship when user is unauthorized 2019-04-17 22:47:56 -04:00
taehoon d3cad54aa3 add bulk mute/unmute buttons and wire up to vuex 2019-04-17 11:32:49 -04:00
taehoon 13c8f10f4b wire up bulk action buttons to vuex 2019-04-17 11:32:49 -04:00
Shpuld Shpludson 55410c91fa Merge branch '489' into 'develop'
Fix Blocked status inconsistency between Blocks setting tab and Following profile tab

Closes #489

See merge request pleroma/pleroma-fe!751
2019-04-15 19:58:15 +00:00
taehoon 948baba9d3 add muted user to the mutes list in real time 2019-04-14 23:44:50 -04:00
taehoon 5c2c222252 add blocked user to the blocked list on real time 2019-04-14 23:44:49 -04:00
taehoon 69f9ea987c make blocking functional in the search results 2019-04-14 23:44:49 -04:00
taehoon e7010d73ac store friends/followers in the global user repository 2019-04-14 23:41:38 -04:00
Brenden Bice 41845389a9 display no message on empty data fetched from api 2019-04-12 23:12:22 -04:00
Brenden Bice 2ae0507575 remove error message on no more following 2019-04-12 23:09:05 -04:00
Brenden Bice 8ed4eb8a7f refactor showing favs and repeats logic 2019-04-11 23:26:13 -04:00
Brenden Bice f74a6b4b57 display favs & reblogged users on expanded post in timeline view 2019-04-11 23:26:13 -04:00
Brenden Bice 8c9bcdc6c1 rename favourite to favorite 2019-04-11 23:26:12 -04:00
Brenden Bice 4ab2ddb03c improve code quality 2019-04-11 23:26:12 -04:00
Brenden Bice 85457fc917 fetch reblogged users 2019-04-11 23:26:12 -04:00
Brenden Bice 2d339cd3b8 fetch favorited users 2019-04-11 23:26:12 -04:00
taehoon ab7a418d80 maintain conversationsObject storage 2019-04-11 12:46:06 -04:00
dave d498a26af5 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications 2019-04-09 15:42:05 -04:00
Shpuld Shpludson 1e9ddcb0da Merge branch 'fix/notification-bugs' into 'develop'
#474 Fix notification bugs

Closes #474

See merge request pleroma/pleroma-fe!728
2019-04-09 15:24:33 +00:00
dave d3218807b4 #436 - merge develop 2019-04-08 21:04:59 -04:00
Shpuld Shpludson 546ced43d9 Merge branch 'moderation-menu' into 'develop'
Moderation menu #310

See merge request pleroma/pleroma-fe!595
2019-04-08 19:01:40 +00:00
dave b0da32fea2 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications 2019-04-08 14:29:12 -04:00
Maksim 7259e02a10 remove debug message 2019-04-08 16:49:51 +00:00
jasper 1c04cd2036 Add space 2019-04-04 09:06:53 -07:00
jasper a1275be4c0 Separate timeline and notification 2019-04-04 09:03:56 -07:00
jasper 7c2b65e9a3 Remove useless codes 2019-04-03 09:08:23 -07:00
jasper ea27483f27 Fix notification bugs 2019-04-03 09:04:46 -07:00
dave fe756fe30d #436 - revert stripe html for notification 2019-04-03 11:17:23 -04:00
dave 6ed26ce65d #436 - notification html to text content 2019-04-03 10:58:39 -04:00
dave 6fa014505c #436 - revert notification silience config 2019-04-03 10:53:11 -04:00
dave c9a9b3122d #469 - DM warning text should vary based on BE setting 2019-04-02 10:26:14 -04:00
dave 8b3f037f87 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications 2019-04-02 10:07:36 -04:00
eugenijm 6b6878bde0 Added moderation menu 2019-04-01 23:30:06 +03:00
shpuld 46de457f50 Merge branch 'develop' into feature/mobile-improvements-3 2019-04-01 22:42:06 +03:00
Shpuld Shpludson df366a586d Merge branch '471-timeline-since-id' into 'develop'
#471 - fix timeline fetch with since_id

Closes #471

See merge request pleroma/pleroma-fe!722
2019-04-01 19:33:45 +00:00
jared d856c2745c #471 - fix timeline fetch with since_id 2019-04-01 13:25:48 -04:00
dave 21ea5adc8b #436 - apply patch and clean up 2019-03-31 21:59:18 -04:00
dave b909796683 #436 - update notification 2019-03-31 15:15:16 -04:00
dave 06fd3a9c5f #436 - apply patch 2019-03-31 14:50:34 -04:00
Henry Jameson 9f4a9bff46 Merge remote-tracking branch 'upstream/develop' into minimal-scopes-mode
* upstream/develop: (173 commits)
  Fix: Change condition
  fix typo
  update store according to retweeted status
  #433 - update sort by for conversation
  display replies_count right after reply icon
  expose replies_count from mastodon api
  Apparently, MastoAPI gives status in ancestors if you try opening a repeat...
  make side drawer use gesture service and fix its animations
  review/remove error hiding
  errata
  review
  #433 - sort conversation for retweets and clean up
  Revert "Merge branch 'revert-987b5162' into 'develop'"
  Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
  Add await to login action'
  Remove console log
  Fix warnings in user profile routing
  Add tests for gesture service, fix bug with perpendicular directions
  #255 - clean up autocomplete form
  #255 - clean up user settings page with self-closing html tags
  ...
2019-03-30 12:31:50 +02:00
Shpuld Shpludson 0117f6af9f Merge branch 'issues/#465' into 'develop'
update store according to retweeted status

Closes #465

See merge request pleroma/pleroma-fe!713
2019-03-29 15:33:16 +00:00
shpuld 31010779f6 Merge branch 'develop' into feature/mobile-improvements-3 2019-03-28 22:25:40 +02:00
Brenden Bice 8e4ddcb843 update store according to retweeted status 2019-03-28 13:20:09 -04:00
Henry Jameson 66ab131bd4 Merge remote-tracking branch 'upstream/develop' into mastoapi/actions
* upstream/develop:
  errata
  review
  Revert "Merge branch 'revert-987b5162' into 'develop'"
  Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
  Add await to login action'
  correctly paginate on MastoAPI
  #442 - update placeholder linebreak
  #442 - clean up Bio placeholder text
  wip support for follower/following, a bit broken and with regression
  switch direct messages to mastoapi
  switch public and TWKN to MastoAPI
  undo this change since BE returns empty object for relationship, add in a separate MR
  updates normalizer for proper user handling and adds support for friends tl via mastoapi
2019-03-27 22:24:38 +02:00
Henry Jameson 0a031aae20 errata 2019-03-27 22:04:59 +02:00
Henry Jameson fb2aca06de review 2019-03-27 22:02:46 +02:00
Henry Jameson 0ffd43954e Merge remote-tracking branch 'upstream/develop' into mastoapi/actions
* upstream/develop: (87 commits)
  review
  Update attachment normalizer
  Add fallback for attachments uploaded via the other platforms
  Get correct mimetype through entity_normalizer
  Set default parameter
  Switch to mastoapi for posting status and uploading media
  Revert changes
  prevent text pasting if image is pasted
  remove border radius of suggested emojis
  #450 - dispatch login after saved state is loaded
  #448 - fix timeline fetch error when status text is null
  #451 - add class to username span
  No need to fetch mutes on load anymore 🙌
  switch to mastoapi
  switch to mastoapi
  masto api sends muted property now
  No need to fetch user data using old api anymore 🎉
  Switch to mastoapi
  reactivity fixes
  less hackery, more direct usage of mastoapi
  ...
2019-03-25 21:12:15 +02:00
Henry Jameson 968e6c7fe8 correctly paginate on MastoAPI 2019-03-25 21:04:52 +02:00
Henry Jameson 3b5fc88989 Merge remote-tracking branch 'upstream/develop' into mastoapi/convos
* upstream/develop: (34 commits)
  Update attachment normalizer
  Add fallback for attachments uploaded via the other platforms
  Get correct mimetype through entity_normalizer
  Set default parameter
  Switch to mastoapi for posting status and uploading media
  Revert changes
  prevent text pasting if image is pasted
  remove border radius of suggested emojis
  #450 - dispatch login after saved state is loaded
  #448 - fix timeline fetch error when status text is null
  #451 - add class to username span
  No need to fetch mutes on load anymore 🙌
  switch to mastoapi
  switch to mastoapi
  masto api sends muted property now
  No need to fetch user data using old api anymore 🎉
  Switch to mastoapi
  Add comment
  Reset statusnet_blocking of all fetched users first while refreshing block list
  Add hideMutedPosts setting and wire up to post-returning endpoints
  ...
2019-03-25 19:54:15 +02:00
taehoon f03747e841 Revert changes 2019-03-24 13:04:47 -04:00
shpuld fd12263cac merge develop in 2019-03-23 22:21:57 +02:00
taehoon 9fa1bc63b0 No need to fetch mutes on load anymore 🙌 2019-03-21 21:58:02 -04:00
taehoon a64e744c1b switch to mastoapi 2019-03-21 21:53:24 -04:00
taehoon 8702d23a13 switch to mastoapi 2019-03-21 21:44:59 -04:00
taehoon 379e33f6a5 masto api sends muted property now 2019-03-21 21:31:16 -04:00
taehoon 883a84b313 No need to fetch user data using old api anymore 🎉 2019-03-21 21:30:30 -04:00
Henry Jameson e617ed285e reactivity fixes 2019-03-22 00:05:20 +02:00
taehoon a0bccbce94 Add comment 2019-03-21 16:39:41 -04:00
taehoon d7919109ec Reset statusnet_blocking of all fetched users first while refreshing block list 2019-03-21 16:39:41 -04:00
taehoon 9857002bf5 Add hideMutedPosts setting and wire up to post-returning endpoints 2019-03-21 16:33:02 -04:00
taehoon 300259fd97 Add todo comment 2019-03-21 16:26:15 -04:00
taehoon 9b690209d0 Reset old mutes state after fetching new mutes data 2019-03-21 16:21:28 -04:00
taehoon 302310a653 Remove old muting logic 2019-03-21 16:19:09 -04:00
taehoon 859ed4f34f Fetct full data of muted users after fetchMutes api call 2019-03-21 16:19:05 -04:00
taehoon f04cbc8875 Add mute/unmute mutations 2019-03-21 16:19:05 -04:00
taehoon 3255950b0e Add mute/unmute featrue and mutes management tab 2019-03-21 16:19:03 -04:00
Shpuld Shpludson 57cd6f8018 Merge branch 'feature/version-info' into 'develop'
Added new tab to display versions of BE/FE

Closes #397

See merge request pleroma/pleroma-fe!671
2019-03-21 15:25:59 +00:00
HJ 9364964b01 Merge branch 'mastoapi/user-stuff' into 'develop'
Transition to MastoAPI: user data

See merge request pleroma/pleroma-fe!655
2019-03-15 13:14:41 +00:00
Henry Jameson 6420c93e98 fix flake id users not fetching correctly 2019-03-14 23:07:28 +02:00
Henry Jameson 885a3a77df fix console error 2019-03-14 18:50:51 +02:00
Edijs 3c5c09c74f Merge branch 'develop' into feature/version-info 2019-03-13 15:24:09 -07:00
shpuld 7ce8fe9214 merge develop, add mobile nav component 2019-03-12 23:50:54 +02:00
Henry Jameson 27cbe3ca65 レインせんぱいにサンキュー 2019-03-12 22:10:22 +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
lambda f52a33f711 Merge branch 'develop' into 'develop'
Only connect to chat upon authenticating

Closes #403

See merge request pleroma/pleroma-fe!666
2019-03-11 14:43:40 +00:00
Henry Jameson 06d39b62a8 fixed tests, review fixes, now storing local users with downcase screen name for
better compatibility
2019-03-11 02:17:58 +02:00
Edijs 068c9724e4 Added new tab to display versions of BE/FE 2019-03-10 16:58:12 -07:00
shpuld 70d7ed3607 Make minId reset with minVisibleId to prevent gaps when showing new 2019-03-10 22:40:48 +02:00
slice e618c6ffb0
Only connect to chat when authenticating in the first place
To avoid duplication of the connection, the chat socket is destroyed
upon logging out.
2019-03-10 11:25:36 -07:00
Henry Jameson 4a5aef8883 basic user and status actions implemented 2019-03-10 19:15:07 +02:00
slice a67881b096
Check for websocket token before connecting to chat
Closes #403. Previously, a socket to the chat channel would be opened if
chat is enabled, regardless if the user is logged in or not. This patch
only allows a connection to be opened if a wsToken (websocket token) is
present, which prevents websocket errors from unauthenticated users.
2019-03-10 01:54:26 -08:00
Henry Jameson fe624f6114 fix reply-to marker, also whoops console log 2019-03-09 01:34:15 +02:00
Henry Jameson 690c1dcd7a revert some stuff, turns out it's actually breaking. Fixed some local user things 2019-03-09 01:19:56 +02:00
Henry Jameson 4f3a220487 Since BE doesn't support fetching user by screen name over MastoAPI we'll gonna
just fetching it over QvitterAPI real quick :DDDDDDDDD
2019-03-08 22:40:57 +02:00
Henry Jameson ee49409049 Partially transitioned user data to MastoAPI. Added support for fetching
relationship data. Upgraded code to be more resilient to nulls caused by missing
data in either APIs
2019-03-08 00:35:30 +02:00
Shpuld Shpludson 09b0f6dd87 Merge branch 'issue-392-other-user-stale-data' into 'develop'
#392: stale data served to new user account

Closes #392

See merge request pleroma/pleroma-fe!625
2019-03-07 16:33:22 +00:00
Shpuld Shpludson e3b3ef156b Merge branch 'fix/remove-posts-immediately-by-blocking-someone' into 'develop'
#330 Remove posts immediately by blocking someone

See merge request pleroma/pleroma-fe!589
2019-03-07 16:07:01 +00:00
Shpuld Shpludson bf1fa52e5e Merge branch 'fix/post-content-type' into 'develop'
#327: Load post status content type from instance config

Closes #327

See merge request pleroma/pleroma-fe!641
2019-03-07 16:03:06 +00:00
Shpuld Shpludson c44f0a9bde Merge branch 'fix/fetch-activities-by-last-id' into 'develop'
#406 Fetch activities by last id

See merge request pleroma/pleroma-fe!621
2019-03-07 05:06:43 +00:00
Edijs f91e4a5801 Load post status content type from instance config 2019-03-04 21:29:56 -08:00
shpuld c7e180080a more work with notifications drawer 2019-03-03 16:33:40 +02:00
Henry Jameson 6184c88ac7 Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode 2019-03-03 15:45:17 +02:00
jasper 81e89fed3d Fetch activites by last id 2019-03-01 12:53:24 -08:00
dave f3f9fbe302 #392: clean up notification stopping section 2019-03-01 11:59:50 -05:00
dave bbe1821be7 #392: update object.entries 2019-02-28 14:44:43 -05:00
dave f5adb62e2e #392: update defaultState into a function 2019-02-28 14:27:47 -05:00
dave ba2e05bc63 #392: stale data served to new user account 2019-02-28 14:03:44 -05:00
taehoon 080786c945 Rewrite FollowList using hocs 2019-02-28 12:41:20 -05:00
taehoon 5c43374588 Clean up addFollowers action 2019-02-28 12:40:22 -05:00
Shpuld Shpludson dc01f90dde Merge branch '386-display-invalid-user-profile' into 'develop'
Show error message when visit profile page of invalid user

Closes #386

See merge request pleroma/pleroma-fe!606
2019-02-28 17:19:14 +00:00