Commit Graph

422 Commits

Author SHA1 Message Date
Henry Jameson 853e0bc26f switch to mastoapi for user timeline 2019-03-08 00:50:58 +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
Henry Jameson 6e2946f352 switch direct messages to mastoapi 2019-03-07 20:21:07 +02:00
Henry Jameson 8522063b2c switch public and TWKN to MastoAPI 2019-03-07 20:16:35 +02:00
Henry Jameson c038d0c12a undo this change since BE returns empty object for relationship, add in a
separate MR
2019-03-07 20:04:29 +02:00
Henry Jameson 2e59ab738b updates normalizer for proper user handling and adds support for friends tl via mastoapi 2019-03-07 19:49:41 +02: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
Shpuld Shpludson 6f903016a4 Merge branch 'fix/fetching-error-by-tag' into 'develop'
#402 Fix fetching error by tag

See merge request pleroma/pleroma-fe!622
2019-03-02 15:48:54 +00:00
jasper c26f32ed92 Fix fetching error by tag 2019-03-01 10:20:25 -08:00
Shpuld Shpludson 53e104dc32 Merge branch 'issue-388-request-count-broken' into 'develop'
#388: get follow request on a real-time basis

Closes #388

See merge request pleroma/pleroma-fe!619
2019-03-01 18:03:30 +00:00
dave cccf33d6dd #388: update naming properly 2019-02-28 12:53:37 -05:00
taehoon cb383df517 Fix bug to get wrapped component prop name list 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
jasper 4d026baf17 Fix fetching error by tag 2019-02-27 18:14:42 -08:00
jasper 9aec49bacb Fetch activites by last id 2019-02-27 17:45:08 -08:00
Maxim Filippov 2c7406d9a8 Add OAuth Tokens management to settings 2019-02-28 04:04:26 +03:00
dave 7c6446a9de #388: get follow request on a real-time basis 2019-02-27 14:38:10 -05:00
taehoon b78227456e Better error handling 2019-02-26 12:26:04 -05:00
taehoon e687b58091 Show error message when visit profile page of invalid user 2019-02-26 11:08:13 -05:00
dave 4e8b696797 #380: fix false alarm for unread notifications 2019-02-25 12:12:49 -05:00
taehoon 32c112bc96 Remove pagination logic in fetchBlocks api 2019-02-20 13:30:31 -05:00
taehoon 1fd9a1c7c0 Set blockIds and muteIds to the currentUser state only 2019-02-20 13:30:30 -05:00
taehoon e91a94ff9c Add mutes tab 2019-02-20 13:30:30 -05:00
taehoon 8c8a6edc78 Remove pagination support from block-list 2019-02-20 13:30:30 -05:00
taehoon a817cc7cb4 Wire up ui to real blocks api data 2019-02-20 13:30:30 -05:00
Shpuld Shpludson 0e1295edea Merge branch 'follow-requests-for-locked-accounts' into 'develop'
Follow Request notification count for restricted accounts

See merge request pleroma/pleroma-fe!561
2019-02-19 16:38:05 +00:00
lambda a842cadd15 Parameter name changed. 2019-02-16 16:09:14 +00:00
eugenijm d831b81912 Added follow requests counter to nav bar to make it visible behorehand 2019-02-15 12:49:00 +03:00
Shpuld Shpludson b6bac4d06d Merge branch 'fix/profile-not-loading-without-persisted-state' into 'develop'
Fix #324 Profiles sometimes not loading when there's no persisted state

Closes #324

See merge request pleroma/pleroma-fe!553
2019-02-11 13:34:03 +00:00
Shpuld Shpludson 0e6134b32e Merge branch 'issue-332-update-follow-tabs' into 'develop'
#332 - add follow/not follow button to follow list

See merge request pleroma/pleroma-fe!558
2019-02-11 13:29:58 +00:00
Edijs fc26f1852e Merge branch 'develop' into fix/hashtag-opening 2019-02-10 11:59:19 -07:00
dave 4b18989fef #332 - add follow/not follow button to follow list 2019-02-09 23:05:23 -05:00
shpuld 3fb531976a Change the async stuff to not render app before theme is loaded 2019-02-09 11:26:35 +02:00
HJ 62b3b9b8d4 Merge branch 'add-admin-and-moderator-fields-to-user-card-view' into 'develop'
Add admin and moderator indicators to the user profile

See merge request pleroma/pleroma-fe!519
2019-02-07 22:45:08 +00:00
Edijs c0b833cb85 Added tag extractor method and spec 2019-02-07 14:46:10 -07:00
dave bd24c615d1 #315 - revert changes 2019-02-07 09:59:12 -05:00
dave 3128417176 #315 - separate export and fetch follows logic 2019-02-07 09:57:16 -05:00
dave a3a9949a21 #315 - clean up the request 2019-02-06 13:18:54 -05:00
dave 2f12ac7ea4 #315 - export all follows as CSV 2019-02-06 11:17:23 -05:00
eugenijm 648f635429 Allow to configure visibility for admin and moderator badges 2019-02-06 18:07:10 +03:00
eugenijm c714eb2600 Add admin and moderator indicators to the user card 2019-02-06 18:04:21 +03:00
Maxim Filippov 0c5c889850 Rename "hide_following" to "hide_follows" 2019-02-06 14:21:13 +03:00
Maxim Filippov 18594569bd Split hide_network into hide_followers & hide_followings 2019-02-06 02:59:59 +03:00
shpuld 54e7e0e31b merge develop and fix conflicts AGAIN 2019-02-04 19:49:23 +02:00
Shpuld Shpludson d4991d0162 Revert "Merge branch 'feature/split-hide-network' into 'develop'"
This reverts merge request !497
2019-02-03 14:32:23 +00:00
shpuld b614cb94e5 merge develop in 2019-02-03 10:13:09 +02:00
shpuld dbb16d56e2 follows/followers pagination ready for review 2019-02-02 22:29:10 +02:00
eugenijm b62d2c76e5 Use integer type of notitication ids (avoid redundant casting for getting maxId in addNewNotifications) 2019-02-02 18:40:47 +03:00
shpuld 8ce513ed09 initial draft for follows/following pagination 2019-01-31 21:11:28 +02:00
shpuld c7cffbb6c7 Merge branch 'develop' into feat/media-modal 2019-01-30 20:49:24 +02:00
lambda b1facdf7ad Merge branch 'fix/timeline-too-eager-flush' into 'develop'
Fix #290 Add a better check for fresh TL flushing

Closes #290

See merge request pleroma/pleroma-fe!494
2019-01-30 17:51:12 +00:00
lambda 1717e70046 Merge branch 'feat/dont-show-load-more-when-bottomed-out' into 'develop'
fix #292 dont show "load more" when bottomed out

Closes #292

See merge request pleroma/pleroma-fe!496
2019-01-30 17:49:27 +00:00
lambda 7b0e3dc471 Merge branch 'feat/make-mentions-use-internal-routing' into 'develop'
Fix #289 Make more user links use internal routing

Closes #289

See merge request pleroma/pleroma-fe!500
2019-01-30 17:46:18 +00:00
shpuld 15603981f8 Capture clicks on statuses to hijack mention clicks, match mention href to user somehow 2019-01-30 19:24:47 +02:00
Maxim Filippov 298cea8f6d Split hide_network into hide_followers & hide_followings 2019-01-30 01:11:40 +03:00
shpuld 62e9525724 Add loading indicator for notifications, make timelines indicate bottoming out when no more statuses 2019-01-29 21:04:52 +02:00
shpuld 89bfc41174 Add a better check for fresh TL flushing 2019-01-29 18:40:49 +02:00
shpuld 51024a2c8a Merge branch 'develop' into feat/media-modal 2019-01-28 19:02:46 +02:00
William Pitcock b27ec058ca entity normalizer: add support for opengraph cards 2019-01-28 05:50:12 +00:00
lain e4303da372 Properly handle websocket token (fixes chat). 2019-01-27 21:38:33 +01:00
shpuld b9142e6fac Move following to qvitter only space 2019-01-27 16:10:55 +02:00
shpuld 4c9f3b946d Add forgotten prop to entity normalizer 2019-01-27 08:42:34 +02:00
shpuld 0ab828bb30 Merge develop and fix conflict 2019-01-26 17:50:41 +02:00
shpuld 3978aaef84 Redo everything in the MR 2019-01-26 17:45:03 +02:00
William Pitcock dbe0205a9c api service: add the ability to fetch a media-only timeline 2019-01-26 13:49:24 +00:00
lambda 28d1571530 Merge branch 'hotfix/summary-html' into 'develop'
entity normalizer: provide summary_html property

See merge request pleroma/pleroma-fe!475
2019-01-25 10:10:27 +00:00
William Pitcock 5e68161d91 entity normalizer: provide summary_html property
Mastodon API returns HTML always in spoiler_text, while TwitterAPI sends both a
text version as well as an HTML version of the message subject, which we started
to use when we allowed custom emoji in message subjects.
2019-01-25 10:05:19 +00:00
Henry Jameson f48e3d0db8 quickfix 2019-01-25 01:39:19 +03:00
Henry Jameson 9d0d6b86c8 this attempts converting id to number to sort them numerically, since "99" >
"100" while 99 < 100
2019-01-25 01:08:08 +03:00
HJ 8b7faa8106 Merge branch 'favorites-fixes' into 'develop'
fix reply-to tooltip being somewhat unreliable

See merge request pleroma/pleroma-fe!473
2019-01-24 18:05:09 +00:00
Maxim Filippov 958557201a Always send "hide_network" when updating user profile 2019-01-23 19:46:35 +03:00
Henry Jameson 61c9ecd855 fix reply-to tooltip being somewhat unreliable 2019-01-23 00:10:26 +03:00
HJ c8caa477d7 Revert "fix reply-to tooltip being somewhat unreliable"
This reverts commit 66dc72deb2
2019-01-22 21:08:28 +00:00
Henry Jameson 66dc72deb2 fix reply-to tooltip being somewhat unreliable 2019-01-23 00:03:33 +03:00
Henry Jameson 42f8d01b66 confusion 2019-01-21 21:41:17 +03:00
Henry Jameson 031c044297 better handling of attachments 2019-01-21 16:28:36 +03:00
Henry Jameson d231a45644 support for extended fields (for future, doesn't work yet), fix reply bug 2019-01-19 04:10:16 +03:00
Henry Jameson bac7154bc6 more fields for users 2019-01-17 23:57:24 +03:00
Henry Jameson 6c70e9950c some more post fields 2019-01-17 23:57:24 +03:00
Henry Jameson af36f4915a support for CW/Subject. fix replies. 2019-01-17 23:57:24 +03:00
Henry Jameson 8f4fbf8571 some consistency 2019-01-17 23:01:38 +03:00
Henry Jameson 93cbb58212 fix login and favorites tab... 2019-01-17 22:11:51 +03:00
Henry Jameson cab87744c8 Revert "some initial work to make it possible to use "unregistered" timelines, i.e. not"
and some stuff to make favorites still work

This reverts commit 039a407400.
2019-01-17 21:46:03 +03:00
Henry Jameson 1e61c8140b tests for the tests god! bugfixes for bugfixes throne! 2019-01-17 20:44:37 +03:00
Henry Jameson 9682ee66ce added conversions to ids for consistency from the get-go 2019-01-17 19:23:14 +03:00
Henry Jameson 5251de317d Merge branch 'switch-to-string-ids' into favorites
with some changes/merge conflicts resolution

* switch-to-string-ids:
  fixx?????
  fix notifications?
  fix lint
  fix tests, removed one unused function, fix real problem that tests helped to surface
  added some more explicit to string conversion since BE seem to be sending numbers and it could cause an issue.
  Remove all explicit and implicit conversions of statusId to number, changed explicit ones so that they convert them to string
2019-01-17 19:16:45 +03:00
Henry Jameson d7bd294666 migrated some tests to normalizer, fixed some potential bug, fixed tests to use
normalized naming instead of raw qvitter api objects. needs more tests tho.
2019-01-15 18:39:24 +03:00
Henry Jameson 966a9e78af cleanup 2019-01-14 22:59:44 +03:00
Henry Jameson fd27c78c4b fixes, guards 2019-01-14 22:58:23 +03:00
Henry Jameson 790fcf37d2 notifications now also undergo some parsing, hypothetically could use MastoAPI
notifications, maybe.
2019-01-14 22:38:37 +03:00
Henry Jameson e0fd6d12ed user normalizer works 2019-01-14 15:30:14 +03:00
Henry Jameson f9fb85ee42 Merge remote-tracking branch 'upstream/develop' into favorites
* upstream/develop:
  Add Korean translation
  Change emptlyTl to take userId
  better fix
  fixes #265 and also that thin line below gradient on chrome (UGH)
  fix #262 part of user profiles not being able to load previous posts
  Retain userId on clearing user timeline, don't flush when empty timeline
2019-01-13 22:21:09 +03:00
Henry Jameson 519f49e29b separated normalization into a another file, removed catchall and added more stuff 2019-01-13 22:14:55 +03:00
Henry Jameson 4be737b4df moved some stuff from statuses to api service. added initial adapter (currently
mastoapi status -> qvitter status, would change some naming in the future)

favorites timeline works somewhat, notifications are broken because they are
fetched using same code to fetch usual timeline/using old architechture
2019-01-13 01:26:24 +03:00
Henry Jameson 039a407400 some initial work to make it possible to use "unregistered" timelines, i.e. not
reserving a timeline by name, instead just passing timeline object itself.
2019-01-12 23:33:45 +03:00
Henry Jameson b18e27c6d4 fix tests, removed one unused function, fix real problem that tests helped to
surface
2019-01-11 03:38:23 +03:00
Henry Jameson ef2585e32b Remove all explicit and implicit conversions of statusId to number, changed
explicit ones so that they convert them to string
2019-01-11 02:40:17 +03:00
shpuld a8f6099be2 Retain userId on clearing user timeline, don't flush when empty timeline 2019-01-08 23:09:03 +02:00
shpuld 16c7bd0199 merge develop, fix conflicts, fix logged out bug 2018-12-29 16:25:45 +02:00
lambda 1555a5fef3 Merge branch 'restore-routes' into 'develop'
Restore old routes, enable user route as fallback.

See merge request pleroma/pleroma-fe!440
2018-12-29 13:27:59 +00:00
shpuld 650655709d fix conflict in user card content 2018-12-28 21:44:09 +02:00
shpuld 85c058e95c New routes, notifications, other impovements in side drwaer 2018-12-28 21:39:54 +02:00
Maxim Filippov 85c487b933 Make "noAttachmentLinks" configurable 2018-12-27 13:25:11 +03:00
Maxim Filippov 13855f46e2 No attachment links 2018-12-27 02:37:36 +03:00
Lambda f35dbaf064 Treat reserved users like external users in the frontend. 2018-12-26 14:50:48 +01:00
Lambda 24eba26c5b Restore old routes, enable user route as fallback. 2018-12-25 18:43:52 +01:00
Egor Kislitsyn c5847349e0 improve web push notifications 2018-12-25 20:43:18 +07:00
Henry Jameson 500b4bd374 fix 2018-12-25 14:28:49 +03:00
Henry Jameson a4f0902926 small refactor, added push unsub notice for BE 2018-12-25 03:46:19 +03:00
Henry Jameson 957b2a6f7e simplified some code, made it possible to unregister serviceworker altogether 2018-12-20 09:17:59 +03:00
Henry Jameson 5c2030e467 no more "broken favorite" 2018-12-19 01:55:53 +03:00
lambda 2f28bf95fd Merge branch 'feature/new-user-routes' into 'develop'
Make domain.com/username routes work

Closes pleroma#395

See merge request pleroma/pleroma-fe!392
2018-12-18 15:26:00 +00:00
Maxim Filippov 63ad08050e Fix oauth url 2018-12-17 21:58:16 +03:00
Maxim Filippov 2211c533dd Merge branch 'develop' into feature/new-user-routes 2018-12-17 02:39:37 +03:00
Ekaterina Vaartis a525df32c9 Separate captcha into the backendInteractor 2018-12-16 20:53:41 +03:00
Maxim Filippov 828b1c78f9 Implement user_profile.spec.js 2018-12-15 06:16:44 +03:00
Maxim Filippov 1341a7bb9c Use babel polyfill in karma 2018-12-13 20:27:03 +03:00
Maxim Filippov e4a34cc4d4 Use 'userProfileLink' to generate user-profile link 2018-12-13 19:57:11 +03:00
Rinpatch 6de4dcc7c9 Resolve merge conflict 2018-12-13 17:22:19 +03:00
Egor Kislitsyn a8521fc8d9 Merge commit 'e443716bcd616ad61efae161624dd970841a935c' into feature/push-subscriptions
# Conflicts:
#	src/i18n/en.json
#	src/modules/interface.js
#	src/modules/users.js
#	yarn.lock
2018-12-13 18:22:15 +07:00
Egor Kislitsyn b3455649c5 improve notification subscription 2018-12-13 18:04:09 +07:00
Maxim Filippov 7ffb7e6795 Use "-1" in indexOf 2018-12-13 13:51:47 +03:00
Maxim Filippov 24caa2cfcd Add generateProfileLink 2018-12-13 05:00:01 +03:00
Egor Kislitsyn 02c0e15781 add checkbox to disable web push 2018-12-13 00:03:50 +07:00
Henry Jameson a17ac74df7 revert that, it's actually used, i'm an idiot 2018-12-11 02:05:22 +03:00
Henry Jameson 90a5670661 removed unused function from color_convert 2018-12-11 01:41:19 +03:00
Henry Jameson 73aa9153d9 cleanup 2018-12-11 01:40:19 +03:00
Henry Jameson 4b25475b57 setColors -> applyTheme. For sanity. Also disabled export because nobody uses it
and should not use anyway.
2018-12-11 01:39:18 +03:00
Henry Jameson fe2fe09236 fixed v2 setting as default theme 2018-12-11 01:38:20 +03:00
Rinpatch 6a00854189 Count in binary bytes and remove i18 from file size format service 2018-12-10 17:06:32 +03:00
Rinpatch c69a8dc197 Add file size formating 2018-12-10 09:50:04 +03:00
Egor Kislitsyn 73b17d70ec improve push notifications code 2018-12-09 19:25:43 +07:00
Egor Kislitsyn a85d128d37 Revert "add subscribe module and fix race condition"
This reverts commit 07f1b8523e.
2018-12-07 18:53:40 +07:00
Egor Kislitsyn 07f1b8523e add subscribe module and fix race condition 2018-12-07 18:13:04 +07:00
Egor Kislitsyn 264da19f69 fix typo 2018-12-07 15:21:19 +07:00
Egor Kislitsyn bbae2e10f3 Add configuration to enable/disable web push notifications 2018-12-07 15:15:31 +07:00
Egor Kislitsyn ebe2a95140 improve web push notifications 2018-12-07 14:57:35 +07:00
Egor Kislitsyn 09147cacea add service worker and push notifications 2018-12-06 20:34:00 +07:00
Henry Jameson 51cf4dc298 Merge remote-tracking branch 'upstream/develop' into feature/theming2
* upstream/develop:
  Fix iOS Safari from making videos play fullscreen by default
  added PR comments
  resolved the lint
  used the deleted data param as condition in status template
  Switch to "timeline" when pressing user-settings
  Added user setting tooltip
  made links in user bio always open in new tabs
  addressed PR comments
  added tooltip
  Add userId property to timelines so that we don't overwrite user timeline meant for another user
  Added option to auto-hide subject field when it's empty.
  removes hacks from notifications storage, adds api call to let server update is_seen attribute
  fixes vimium not giving retweet button a hint
  Do not use underscore at the beginning of the method
  Logout user on password change
  Route user to the correct profile URL
  Typo
  Fix filetype detection
  Switch to settings when touching settings
  Switch to timeline on nav panel actions
2018-12-05 10:43:03 +03:00
lambda ea28aa62f0 Merge branch 'ss-read' into 'develop'
Server-side read marking

See merge request pleroma/pleroma-fe!386
2018-12-03 14:47:27 +00:00
Henry Jameson ccb1682379 Add userId property to timelines so that we don't overwrite user timeline meant
for another user
2018-12-03 09:29:33 +03:00
Henry Jameson e95b6c7e53 fix 2018-12-02 15:20:25 +03:00
Henry Jameson fad19c3c2f fix 2018-12-02 15:10:18 +03:00
Henry Jameson dd4deae66e fallback for some weird case on my phone 2018-12-02 15:03:51 +03:00
Henry Jameson b555d617e4 removes hacks from notifications storage, adds api call to let server update
is_seen attribute
2018-12-02 13:36:11 +03:00
Henry Jameson bee738c815 making inset shadows work on avatars again 2018-12-02 08:47:55 +03:00
Henry Jameson 406df4399b avatars shadows, also allows drop-shadow use 2018-11-30 16:39:53 +03:00
rinpatch cddb173089 Fix filetype detection 2018-11-27 18:44:49 +03:00
Henry Jameson bb39b99d65 fix panel link color, fix broken user profiles 2018-11-26 20:13:56 +03:00
Henry Jameson a806d43f05 Merge remote-tracking branch 'upstream/develop' into feature/theming2
* upstream/develop: (60 commits)
  whoops
  whoops
  DM timeline: stream new statuses
  update-japanese-translation
  Add actual user search.
  incorporate most translation changes from MR 368
  update french translation
  Always show dm panel.
  Add direct message tab.
  api service url
  remove deploy stage
  remove deploy stage
  updated and completed German translation
  On logout switch to public timeline.
  minor modification of Chinese translation
  update Chinese translation
  Add Chinese language
  Fix posting.
  Put oauth text into description.
  Display OAuth login on login form button.
  ...
2018-11-26 05:21:58 +03:00