Henry Jameson
fe13b1b75a
Merge remote-tracking branch 'upstream/develop' into mastoapi/friends-tl
...
* upstream/develop: (47 commits)
#449 - fix auth token fetch issue
Make select tag use --inputText as text color
#444 - remote follow clean up
#444 - show `remote follow` button when logged out
Add button to save without cropping
post-merge fixes
[i18n] Update oc.json
after store: fix setting postFormats field
fix user-card avatar falling into permament failed state
fix flake id users not fetching correctly
fix console error
afterStoreSetup: Move log in and theme load to afterStoreSetup.
afterStoreSetup: Handle 404 cases.
afterStoreSetup: Emoji and nodeinfo refactor.
afterStoreSetup: refactor TOS and panel fetching, handle 404s.
afterStoreSetup: refactor.
Load persistedStated with async/await.
whoops
レインせんぱいにサンキュー
fix embedded relationship card parsing
...
2019-03-21 22:28:29 +02:00
taehoon
333afd2138
Minor code refactoring
2019-03-21 16:26:15 -04:00
taehoon
d65422a6a5
Improve fetch error handling using a util
2019-03-21 16:26:13 -04:00
taehoon
302310a653
Remove old muting logic
2019-03-21 16:19:09 -04:00
taehoon
3255950b0e
Add mute/unmute featrue and mutes management tab
2019-03-21 16:19:03 -04:00
Henry Jameson
faef769b40
Merge remote-tracking branch 'upstream/develop' into masto-api/direct
...
* upstream/develop: (47 commits)
#449 - fix auth token fetch issue
Make select tag use --inputText as text color
#444 - remote follow clean up
#444 - show `remote follow` button when logged out
Add button to save without cropping
post-merge fixes
[i18n] Update oc.json
after store: fix setting postFormats field
fix user-card avatar falling into permament failed state
fix flake id users not fetching correctly
fix console error
afterStoreSetup: Move log in and theme load to afterStoreSetup.
afterStoreSetup: Handle 404 cases.
afterStoreSetup: Emoji and nodeinfo refactor.
afterStoreSetup: refactor TOS and panel fetching, handle 404s.
afterStoreSetup: refactor.
Load persistedStated with async/await.
whoops
レインせんぱいにサンキュー
fix embedded relationship card parsing
...
2019-03-21 22:11:02 +02:00
Shpuld Shpludson
66e60572bc
Merge branch 'issue-449-auto-token-fetch' into 'develop'
...
#449 - fix auth token fetch issue
Closes #449
See merge request pleroma/pleroma-fe!696
2019-03-21 16:12:33 +00:00
dave
db3b48d444
#449 - fix auth token fetch issue
2019-03-21 12:04:57 -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
dave
13e727b5ee
#436 : sync notification with timeline
2019-03-18 14:42:09 -04:00
dave
060d3b0713
#436 : implement is_seen logic
2019-03-18 12:30:34 -04:00
dave
55d7bd6d4e
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
2019-03-18 10:37:26 -04:00
dave
241503346f
#436 : clean up based on comment
2019-03-17 10:08:01 -04:00
Henry Jameson
4cdfd5fb86
post-merge fixes
2019-03-17 14:41:05 +02:00
Henry Jameson
30c0cafff1
Merge remote-tracking branch 'upstream/develop' into mastoapi/emojis
...
* upstream/develop: (34 commits)
after store: fix setting postFormats field
fix user-card avatar falling into permament failed state
fix flake id users not fetching correctly
fix console error
afterStoreSetup: Move log in and theme load to afterStoreSetup.
afterStoreSetup: Handle 404 cases.
afterStoreSetup: Emoji and nodeinfo refactor.
afterStoreSetup: refactor TOS and panel fetching, handle 404s.
afterStoreSetup: refactor.
Load persistedStated with async/await.
whoops
レインせんぱいにサンキュー
fix embedded relationship card parsing
actually use embedded relationship if it's present
instead of filtering nulls, let's just not have them in the first place
#434 - fix plain text issue
Add floating post-status button on mobile
Update user settings icon to pencil
I18n: Update Czech translation
user_card.vue: Copy over .status-content img styling
...
2019-03-17 13:32:56 +02:00
dave
e5786f32a7
#436 : merge develop
2019-03-15 11:28:33 -04:00
taehoon
6e60873a3d
Switch to mastoapi for user search
2019-03-15 11:03:11 -04:00
dave
935aae054f
#436 : add is_local for statuses
2019-03-14 22:07:42 -04:00
dave
52326e6551
#436 : remove clear & dismiss UI updates
2019-03-14 11:57:24 -04:00
dave
e5e1d4c643
#436 : fix notification order, follow type link issue, duplicate key
2019-03-14 07:55:39 -04:00
dave
93a2510ede
#436 : update is_local
2019-03-13 15:43:48 -04:00
dave
78951964fb
#436 : update entity_normalizer
2019-03-13 15:34:45 -04:00
dave
2f7d890ad2
#436 : add dismiss button, disable is_seen part
2019-03-13 14:08:03 -04:00
dave
cd9a7dd488
#436 : integrate mastoAPI notifications
2019-03-12 17:16:57 -04:00
Henry Jameson
27cbe3ca65
レインせんぱいにサンキュー
2019-03-12 22:10:22 +02:00
Henry Jameson
ce8b5fcd11
fix embedded relationship card parsing
2019-03-12 21:49:03 +02:00
Henry Jameson
b9877a4323
actually use embedded relationship if it's present
2019-03-11 23:45:24 +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
Henry Jameson
4efcda1b41
Added some tests
2019-03-11 22:41:08 +02:00
Edijs
8952761370
Version links to BE/FE
2019-03-10 18:06:51 -07:00
Edijs
068c9724e4
Added new tab to display versions of BE/FE
2019-03-10 16:58:12 -07:00
Henry Jameson
4a5aef8883
basic user and status actions implemented
2019-03-10 19:15:07 +02:00
Henry Jameson
0b1506a4c0
wip support for follower/following, a bit broken and with regression
2019-03-10 18:05:51 +02:00
Henry Jameson
49b0f0a04a
Fetching convos via MastoAPI. Had to change conversation component a bit for
...
better support, since MastoAPI doesn't have coversation ids
2019-03-09 18:33:49 +02:00
Henry Jameson
47211fb32c
emoji adder
2019-03-09 02:23:50 +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
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