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
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
Shpuld Shpludson
95fb768b5a
Fix #399 Make max attachments configurable
2019-02-27 14:38:58 +00:00
taehoon
e687b58091
Show error message when visit profile page of invalid user
2019-02-26 11:08:13 -05:00
jasper
4e79300232
Remove posts by blocking or unfollowing
2019-02-25 14:35:47 -08:00
HJ
d5348c13ff
Merge branch 'issue-380-noification-unread' into 'develop'
...
#380 : fix false alarm for unread notifications
Closes #380
See merge request pleroma/pleroma-fe!614
2019-02-25 20:08:45 +00:00
dave
7dbbd8e270
#380 : simply and remove redundancy
2019-02-25 14:57:56 -05:00
dave
4e8b696797
#380 : fix false alarm for unread notifications
2019-02-25 12:12:49 -05:00
dave
662e6bda14
#390 : fixed the problem loading other user's media data
2019-02-25 10:21:17 -05:00
Shpuld Shpludson
e34e1ccdae
Merge branch '227-manage-blocks-mutes' into 'develop'
...
Add Blocks / Mutes management tabs under user settings page
See merge request pleroma/pleroma-fe!578
2019-02-22 14:54:12 +00:00
Henry Jameson
4136d9cdd1
bad defaults
2019-02-21 19:52:58 +02:00
taehoon
8f608e060c
Just save blocks/mutes instead of adding
2019-02-20 13:30:30 -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
52913d8f87
Complete functionality of BlockCard
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
dave
5251ccd708
#364 : update ap_id error with username
2019-02-19 09:22:42 -05:00
jasper
24d7f9917b
Remove posts by blocking or following
2019-02-18 11:39:35 -08:00
Henry Jameson
f41341b79b
fix notifications
2019-02-14 21:43:32 +02: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
3fb531976a
Change the async stuff to not render app before theme is loaded
2019-02-09 11:26:35 +02:00
Shpuld Shpludson
5296d41372
Merge branch 'fix/js-error-in-tag-page' into 'develop'
...
Fixed JS error in tag page
See merge request pleroma/pleroma-fe!543
2019-02-09 06:56:46 +00:00
Shpuld Shpludson
531f150dd3
Merge branch 'fix/add-option-to-hide-filtered-statues' into 'develop'
...
#254 Add option to hide filtered statuses
See merge request pleroma/pleroma-fe!539
2019-02-09 06:47:29 +00:00
jasper
5b52e020e3
fixing conflicts
2019-02-08 13:20:47 -08:00
jasper
ced29a6482
fixing conflicts
2019-02-08 13:18:50 -08:00
jasper
92874b6902
Fxing conflicts
2019-02-08 13:13:11 -08:00
jasper
70c05a0c08
Fix showFeaturesPanel option as instance
2019-02-08 12:17:14 -08:00
Edijs
0dc7c45f32
Code refactoring
2019-02-07 16:23:18 -07:00
Edijs
19870c0b6d
Fix issue while fetching timelines for tag page
2019-02-06 19:19:43 -07:00
Xiaofeng An
460976c6e5
#301 - add an option for default formatting
2019-02-06 14:26:46 -05:00
jasper
a57f8bdd68
Add option to hide filtered statuses
2019-02-06 10:18:13 -08:00
dev92341
f2c6dd6581
Add option to hide features panel
2019-02-05 03:57:11 -08:00
shpuld
dbb16d56e2
follows/followers pagination ready for review
2019-02-02 22:29:10 +02: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
shpuld
62e9525724
Add loading indicator for notifications, make timelines indicate bottoming out when no more statuses
2019-01-29 21:04:52 +02:00
lambda
bd6c446b33
Merge branch 'fix/dont-connect-ws-when-chat-disabled' into 'develop'
...
fix #288 - Don't connect WS when chat is disabled
Closes #288
See merge request pleroma/pleroma-fe!492
2019-01-29 15:57:36 +00:00
shpuld
b042c48fa7
Fix TypeError crash when using url of an invalid user
2019-01-29 17:38:55 +02:00
shpuld
41c4d59341
Connect only after-store instead of when user gets token
2019-01-29 17:16:25 +02:00
lambda
fcd99ebc5b
Merge branch 'fix/make-user-by-name-case-insensitive' into 'develop'
...
Make userByName case-insensitive
See merge request pleroma/pleroma-fe!489
2019-01-28 19:25:25 +00:00
shpuld
a593c2cb8c
Make userByName case-insensitive
2019-01-28 21:21:11 +02:00
shpuld
ca78623b34
fix user tl clearing and give it a test
2019-01-28 20:15:00 +02:00
shpuld
51024a2c8a
Merge branch 'develop' into feat/media-modal
2019-01-28 19:02:46 +02:00
shpuld
0ab828bb30
Merge develop and fix conflict
2019-01-26 17:50:41 +02:00
William Pitcock
7b296696a3
user profile: add media timeline
2019-01-26 13:49:24 +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
Henry Jameson
80a7035154
removing unnecessary conversions since it should already be converted in normalizer
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
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
387bf794ff
fixx?????
2019-01-16 18:52:30 +03:00
shpuld
e1c3691a72
Add escape button support
2019-01-16 17:27:23 +02:00
Henry Jameson
7d15720339
fix notifications?
2019-01-16 17:30:47 +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
shpuld
17735943d5
Add media viewer module and media module component, modify attachment behavior
2019-01-14 19:23:13 +02:00
Henry Jameson
5a3c9cfc9b
post-merge fix
2019-01-13 22:25:48 +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
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
22e0686395
fix lint
2019-01-11 03:41:57 +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
48e811e6ed
added some more explicit to string conversion since BE seem to be sending
...
numbers and it could cause an issue.
2019-01-11 03:00:11 +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
b8b18b198d
Change emptlyTl to take userId
2019-01-09 22:19:02 +02:00
shpuld
a8f6099be2
Retain userId on clearing user timeline, don't flush when empty timeline
2019-01-08 23:09:03 +02:00