dave
06fd3a9c5f
#436 - apply patch
2019-03-31 14:50:34 -04:00
dave
ecacc933e7
#436 - keep original naming
2019-03-31 13:47:23 -04:00
dave
0db66e2905
#436 - keep original naming
2019-03-31 13:41:22 -04:00
dave
8efcfc69e8
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
2019-03-31 11:03:43 -04:00
Marcin Mikołajczak
6828c7d74c
Update Polish translation
2019-03-31 13:50:51 +00:00
Henry Jameson
0792732822
final touches
2019-03-30 12:42:42 +02:00
Henry Jameson
4dc64438e9
aaaaggghh
2019-03-30 12:41:42 +02:00
Henry Jameson
995daf70b7
fix lint
2019-03-30 12:34:13 +02: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
Henry Jameson
bf927122df
Review
2019-03-30 12:25:23 +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 Shpludson
e329a362e0
Merge branch 'fix/warnings-in-user-profile' into 'develop'
...
#461 Fix warnings about user-profile
Closes #461
See merge request pleroma/pleroma-fe!708
2019-03-29 15:32:40 +00:00
dave
783cc00dd0
merge develop & resolve conflict
2019-03-29 10:11:28 -04:00
jasper
e6f9b1517b
Fix: Change condition
2019-03-28 18:43:03 -07:00
Shpuld Shpludson
25370083b6
Merge branch '255-emoji-input' into 'develop'
...
#255 - add emoji input component
Closes #255
See merge request pleroma/pleroma-fe!706
2019-03-28 21:09:48 +00:00
shpuld
c06bcf3303
add gesture to close notifications drawer
2019-03-28 22:54:45 +02:00
shpuld
31010779f6
Merge branch 'develop' into feature/mobile-improvements-3
2019-03-28 22:25:40 +02:00
Shpuld Shpludson
c829b1a5f4
Merge branch 'feat/gesture-service' into 'develop'
...
Add a gesture service for easier touch gestures
See merge request pleroma/pleroma-fe!714
2019-03-28 20:20:16 +00:00
shpuld
1e2c304f76
fix typo
2019-03-28 22:11:05 +02:00
Shpuld Shpludson
ee9aa40001
Merge branch 'issues/#466' into 'develop'
...
show replies count right after reply icon
Closes #466
See merge request pleroma/pleroma-fe!716
2019-03-28 20:09:59 +00:00
Brenden Bice
8e4ddcb843
update store according to retweeted status
2019-03-28 13:20:09 -04:00
dave
a39fc49e84
#433 - update sort by for conversation
2019-03-28 10:02:33 -04:00
dave
e24145e233
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form
2019-03-28 09:54:55 -04:00
Brenden Bice
6b5a84e2b3
display replies_count right after reply icon
2019-03-28 03:47:00 -04:00
Brenden Bice
95639fbd63
expose replies_count from mastodon api
2019-03-28 03:46:41 -04:00
HJ
e2e3a65c44
Merge branch 'fix/convos-masto' into 'develop'
...
Apparently, MastoAPI gives status in ancestors if you try opening a repeat...
Closes #460
See merge request pleroma/pleroma-fe!715
2019-03-27 20:55:24 +00:00
Henry Jameson
31a71ee3ee
Apparently, MastoAPI gives status in ancestors if you try opening a repeat...
2019-03-27 22:50:19 +02:00
shpuld
0eff4bd0ac
make side drawer use gesture service and fix its animations
2019-03-27 22:44:25 +02:00
dave
30084a1204
merge develop and resolve conflict
2019-03-27 16:41:05 -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
c2c7e12aad
review/remove error hiding
2019-03-27 22:18:43 +02:00
Henry Jameson
a5e71d1dd1
Merge remote-tracking branch 'upstream/develop' into mastoapi/followers
...
* upstream/develop:
Revert "Merge branch 'revert-987b5162' into 'develop'"
Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
Add await to login action'
switch direct messages to mastoapi
switch public and TWKN to MastoAPI
2019-03-27 22:14:26 +02:00
Henry Jameson
ff18e339cf
Merge remote-tracking branch 'upstream/develop' into mastoapi/followers
...
* upstream/develop:
#442 - update placeholder linebreak
#442 - clean up Bio placeholder text
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:12:51 +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
dave
43e97e590c
#433 - sort conversation for retweets and clean up
2019-03-27 16:00:54 -04:00
HJ
ea50f55148
Merge branch 'develop' into 'masto-api/direct'
...
# Conflicts:
# src/services/api/api.service.js
2019-03-27 19:48:41 +00:00
HJ
3870adf51f
Merge branch 'mastoapi/friends-tl' into 'develop'
...
Mastoapi/friends tl
See merge request pleroma/pleroma-fe!711
2019-03-27 19:40:51 +00:00
Exilat
e1e0b8b254
Update oc.json for !611 and !691
2019-03-27 18:46:40 +00:00
dave
0e2931e7de
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form
2019-03-27 13:50:51 -04:00
Shpuld Shpludson
85e9e52090
Merge branch 'fix/add-await-to-login-request' into 'develop'
...
!701 Add await to login action in after_store
See merge request pleroma/pleroma-fe!709
2019-03-27 16:22:31 +00:00
jared
37b33fc615
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into 255-emoji-input
2019-03-27 11:13:06 -04:00
dave
578b412177
#457 - merge develop and resolve conflict
2019-03-27 11:09:30 -04:00
Henry Jameson
b3a6bec17b
Revert "Merge branch 'revert-987b5162' into 'develop'"
...
This reverts commit 96753e6a5f
, reversing
changes made to 987b5162a7
.
2019-03-27 11:17:04 +02:00
HJ
e750b2f197
Merge branch 'mastoapi/public-tl' into 'develop'
...
switch public and TWKN to MastoAPI
See merge request pleroma/pleroma-fe!650
2019-03-27 08:54:57 +00:00
HJ
95459ff0bc
Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
...
This reverts merge request !647
2019-03-27 08:47:54 +00:00
jasper
2d05aef24b
Add await to login action'
2019-03-26 14:26:26 -07:00
jasper
26955af60b
Remove console log
2019-03-26 13:36:33 -07:00
jasper
ab99d5ef95
Fix warnings in user profile routing
2019-03-26 13:35:08 -07:00
shpuld
c50e64f8ee
Add tests for gesture service, fix bug with perpendicular directions
2019-03-26 22:11:45 +02:00
jared
8fe9101f0b
#255 - clean up autocomplete form
2019-03-26 14:53:27 -04:00
jared
6dc2cedab0
#255 - clean up user settings page with self-closing html tags
2019-03-26 13:42:27 -04:00
jared
2927454233
#255 - support textarea and update user settings page
2019-03-26 13:40:37 -04:00
Shpuld Shpludson
987b5162a7
Merge branch 'mastoapi/friends-tl' into 'develop'
...
Switch friends TL to MastoAPI
See merge request pleroma/pleroma-fe!647
2019-03-26 17:24:37 +00:00
dave
982be05873
#457 - update tag timeline endpoint to MastoAPI
2019-03-26 11:40:34 -04:00
dave
5fd589d5e7
merge develop & resolve conflict
2019-03-26 10:52:46 -04:00
jared
441deb405d
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into 255-emoji-input
2019-03-26 09:38:45 -04:00
jared
b97a033839
#255 - add emoji input component
2019-03-25 22:38:15 -04:00
HJ
2f1e690478
Merge branch 'issue-442-placeholder-fix' into 'develop'
...
#442 - clean up Bio placeholder text
Closes #442
See merge request pleroma/pleroma-fe!689
2019-03-25 22:29:17 +00:00
shpuld
e23c19468a
somewhat functioning gesture service
2019-03-25 22:44:58 +02:00
dave
467647d5d7
#433 - fix retweet abnormal behavior
2019-03-25 16:09:40 -04:00
HJ
04217fc660
Merge branch 'develop' into 'mastoapi/friends-tl'
...
# Conflicts:
# src/services/api/api.service.js
2019-03-25 19:21:48 +00:00
Henry Jameson
d766059dee
correctly update relationship on follow/unfollow
2019-03-25 21:19:24 +02:00
Henry Jameson
82f077feb9
fixup! Merge remote-tracking branch 'upstream/develop' into mastoapi/actions
2019-03-25 21:12:54 +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
dave
c5ec4829a7
#433 - consider page on focused
2019-03-25 15:10:45 -04:00
HJ
3025532ecf
Merge branch 'develop' into 'mastoapi/public-tl'
...
# Conflicts:
# src/services/api/api.service.js
2019-03-25 19:09:22 +00:00
Henry Jameson
72749834f3
Merge remote-tracking branch 'upstream/develop' into masto-api/direct
...
* upstream/develop: (40 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:06:58 +02:00
Henry Jameson
968e6c7fe8
correctly paginate on MastoAPI
2019-03-25 21:04:52 +02:00
dave
73dfb00be2
#433 - remove needless nesting/bloating
2019-03-25 14:59:47 -04:00
dave
1a68a9db36
#433 - Fix conversation page highlight, fetch conversation on converation page
2019-03-25 14:55:58 -04:00
dave
6143b1ce0f
Resolve merge conflict,
...
Fix few issues (conversation page highlight, fetch conversation, ...)
2019-03-25 14:47:54 -04:00
Henry Jameson
50960c7cfc
Merge remote-tracking branch 'upstream/develop' into mastoapi/followers
...
* 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 20:32:12 +02:00
shpuld
b13a751926
start creating gesture service
2019-03-25 20:27:44 +02:00
Henry Jameson
cb122e3a99
review
2019-03-25 20:11:06 +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
Shpuld Shpludson
b02085f2ef
Merge branch 'issue-450-user-data-populate' into 'develop'
...
#450 - dispatch login after saved state is loaded
Closes #450
See merge request pleroma/pleroma-fe!701
2019-03-25 16:57:05 +00:00
Shpuld Shpludson
57b82e9236
Merge branch 'file-paste' into 'develop'
...
#455 - prevent text pasting if image is pasted
Closes #455
See merge request pleroma/pleroma-fe!705
2019-03-25 16:52:25 +00:00
Shpuld Shpludson
182eab051d
Merge branch 'develop' into 'develop'
...
Remove border radius of suggested emojis
See merge request pleroma/pleroma-fe!704
2019-03-25 16:52:01 +00:00
taehoon
932652e335
Update attachment normalizer
2019-03-25 12:19:33 -04:00
dave
6a9159b255
#433 - fix broken conversation page
2019-03-25 10:50:09 -04:00
dave
4cec0d589d
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form
2019-03-25 10:22:16 -04:00
taehoon
6fdbc182ca
Add fallback for attachments uploaded via the other platforms
2019-03-24 21:16:57 -04:00
taehoon
909c315a44
Get correct mimetype through entity_normalizer
2019-03-24 21:16:57 -04:00
taehoon
966add1b29
Set default parameter
2019-03-24 21:16:57 -04:00
taehoon
9802344603
Switch to mastoapi for posting status and uploading media
2019-03-24 21:16:56 -04:00
HJ
01d0531699
Merge branch '227-manage-blocks-mutes' into 'develop'
...
Transition to MastoAPI: Mute & Block and Add Mutes management tab
See merge request pleroma/pleroma-fe!611
2019-03-24 17:15:21 +00:00
taehoon
f03747e841
Revert changes
2019-03-24 13:04:47 -04:00
nik
b241539d4d
prevent text pasting if image is pasted
2019-03-23 22:45:24 -05:00
nik
05634d222d
remove border radius of suggested emojis
2019-03-23 22:26:31 -05:00
shpuld
fd12263cac
merge develop in
2019-03-23 22:21:57 +02:00
shpuld
85584021fb
make notifications close on navigation
2019-03-23 22:03:38 +02:00
Shpuld Shpludson
f86a5dc804
Merge branch 'issue-448-status-text-null' into 'develop'
...
#448 - fix timeline fetch error when status text is null
Closes #448
See merge request pleroma/pleroma-fe!700
2019-03-23 14:17:47 +00:00
Shpuld Shpludson
e9b58f1af7
Merge branch 'issue-452-unfollow-button' into 'develop'
...
#452 - unfollow button issue
Closes #452
See merge request pleroma/pleroma-fe!698
2019-03-23 07:45:42 +00:00
Shpuld Shpludson
f3f006c8e3
Merge branch 'issue-451-long-user-name' into 'develop'
...
#451 - long username on follow/follower tabs
Closes #451
See merge request pleroma/pleroma-fe!697
2019-03-23 07:45:04 +00:00
dave
31d09931c8
#450 - dispatch login after saved state is loaded
2019-03-22 14:04:22 -04:00
dave
d70928792d
#448 - fix timeline fetch error when status text is null
2019-03-22 13:15:11 -04:00
dave
ed4540530b
#451 - add class to username span
2019-03-22 10:42:21 -04:00
lambda
277790e462
Merge branch '438-mastoapi-user-search' into 'develop'
...
Transition to MastoAPI: user search
Closes #438
See merge request pleroma/pleroma-fe!677
2019-03-22 11:16:25 +00: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
taehoon
af85a3f244
Switch to mastoapi
2019-03-21 21:27:10 -04:00
Henry Jameson
e617ed285e
reactivity fixes
2019-03-22 00:05:20 +02:00
Henry Jameson
67719e9a23
less hackery, more direct usage of mastoapi
2019-03-21 23:45:18 +02:00
Henry Jameson
d6c62fa50f
minor UI improvements - keep current behavior of showing originating post initially
2019-03-21 23:27:14 +02:00
Henry Jameson
ee94a6732a
why did i do that
2019-03-21 22:49:26 +02:00
Henry Jameson
307b4ba698
Merge remote-tracking branch 'upstream/develop' into mastoapi/convos
...
* 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:40: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
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
300259fd97
Add todo comment
2019-03-21 16:26:15 -04: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
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
a6ce191cbc
Update MuteCard ui
2019-03-21 16:19:05 -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
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
dave
23bae67146
#452 - update button class name
2019-03-21 15:03:54 -04:00
dave
8932c53706
#451 - update styling
2019-03-21 14:58:28 -04:00
dave
dfcdf4f32c
#452 - unfollow button issue
2019-03-21 13:19:10 -04:00
dave
1c6e5d3688
#451 - long username on follow/follower tabs
2019-03-21 13:06:37 -04: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
c2b7aff325
Merge branch 'issue-444-remote-follow' into 'develop'
...
#444 - show `remote follow` button when logged out
Closes #444
See merge request pleroma/pleroma-fe!692
2019-03-21 15:46:05 +00:00
Shpuld Shpludson
9890e41440
Merge branch 'feature/bypass-avatar-cropper' into 'develop'
...
#443 Add button to save without cropping
Closes #443
See merge request pleroma/pleroma-fe!691
2019-03-21 15:44:26 +00:00
Shpuld Shpludson
9e17853b2c
Merge branch 'patch-2' into 'develop'
...
[i18n] Update oc.json
See merge request pleroma/pleroma-fe!684
2019-03-21 15:38:19 +00:00
Shpuld Shpludson
a284a267ce
Merge branch 'develop' into 'develop'
...
Fixing typos and badly translated strings (Portuguese)
See merge request pleroma/pleroma-fe!676
2019-03-21 15:37:05 +00: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
shpuld
f389128e53
make mobile notifs drawer more like an actual drawer, make mobile nav buttons bigger to press, fix alert dot
2019-03-20 22:09:29 +02:00
Marcin Mikołajczak
4ace0866da
Make select tag use --inputText as text color
2019-03-20 11:52:58 +00:00
dave
96c88b334c
#444 - remote follow clean up
2019-03-19 14:41:50 -04:00
dave
07b8115a37
#444 - show remote follow
button when logged out
2019-03-19 14:36:27 -04:00
jasper
3108722eda
Add button to save without cropping
2019-03-18 18:19:42 -07: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
5717d97182
#442 - update placeholder linebreak
2019-03-18 10:35:13 -04:00
dave
543cc0d285
#442 - clean up Bio placeholder text
2019-03-17 16:59:08 -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
Exilat
7babbce522
[i18n] Update oc.json
2019-03-15 17:23:30 +00: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
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
lambda
92eb55c7bc
Merge branch 'bugfix/nodeinfo-post-formats' into 'develop'
...
after store: fix setting postFormats field
See merge request pleroma/pleroma-fe!683
2019-03-15 13:03:35 +00:00
lambda
c626f84336
Merge branch 'afterstore-refactor' into 'develop'
...
afterStoreSetup: Move log in and theme load to afterStoreSetup.
See merge request pleroma/pleroma-fe!680
2019-03-15 13:03:19 +00:00
dave
8ade93bb4d
#436 : update test
2019-03-14 22:36:11 -04:00
dave
935aae054f
#436 : add is_local for statuses
2019-03-14 22:07:42 -04:00
HJ
ebc6a75d30
Merge branch 'issue-434-plain-text' into 'develop'
...
#434 - fix plain text issue
Closes #434
See merge request pleroma/pleroma-fe!675
2019-03-14 22:03:33 +00:00
William Pitcock
f93d4a3754
after store: fix setting postFormats field
2019-03-14 21:35:45 +00:00
Henry Jameson
71c12fa3a5
fix user-card avatar falling into permament failed state
2019-03-14 23:07:28 +02:00
Henry Jameson
6420c93e98
fix flake id users not fetching correctly
2019-03-14 23:07:28 +02:00
shpuld
0a86d39ba9
remove notifications from sidebar, make notifications appear on login only
2019-03-14 20:40:56 +02:00
dave
97a3f9c0f5
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
2019-03-14 14:24:23 -04:00
Henry Jameson
885a3a77df
fix console error
2019-03-14 18:50:51 +02:00
dave
52326e6551
#436 : remove clear & dismiss UI updates
2019-03-14 11:57:24 -04:00
shpuld
f19284357e
make nav bar slide, move mobile post status to mobile nav
2019-03-14 17:46:04 +02:00
dave
e5e1d4c643
#436 : fix notification order, follow type link issue, duplicate key
2019-03-14 07:55:39 -04:00
Edijs
3c5c09c74f
Merge branch 'develop' into feature/version-info
2019-03-13 15:24:09 -07: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
lain
5318227c37
afterStoreSetup: Move log in and theme load to afterStoreSetup.
2019-03-13 13:29:34 +01:00
lain
48ac96cfc7
afterStoreSetup: Handle 404 cases.
2019-03-13 12:41:39 +01:00
lain
446785ddce
afterStoreSetup: Emoji and nodeinfo refactor.
2019-03-13 12:26:40 +01:00
lain
f535ccd925
afterStoreSetup: refactor TOS and panel fetching, handle 404s.
2019-03-13 12:10:57 +01:00
lain
c030e62254
afterStoreSetup: refactor.
2019-03-13 11:57:30 +01:00
lain
1387dfb889
Load persistedStated with async/await.
2019-03-13 11:29:45 +01:00
shpuld
7ce8fe9214
merge develop, add mobile nav component
2019-03-12 23:50:54 +02:00
dave
cd9a7dd488
#436 : integrate mastoAPI notifications
2019-03-12 17:16:57 -04:00
Henry Jameson
644eba87fe
whoops
2019-03-12 22:14:41 +02: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
Rond
03f1b95252
fixing typos and badly translated strings
2019-03-11 18:26:40 -03: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
dave
130fb7ae1e
#434 - fix plain text issue
2019-03-11 16:48:27 -04:00
Henry Jameson
4efcda1b41
Added some tests
2019-03-11 22:41:08 +02:00
dave
63d7c7bd80
#433 : persistency of status form
2019-03-11 16:24:37 -04:00
dave
19015a4ae7
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form
2019-03-11 13:41:55 -04:00
Shpuld Shpludson
4a27c6d8d3
Add floating post-status button on mobile
2019-03-11 16:51:37 +00:00
taehoon
d8e938bb5e
Update user settings icon to pencil
2019-03-11 11:52:49 -04:00
dave
4f455eefe5
#433 : do not remove the reply dialog
2019-03-11 10:52:28 -04: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
Lorem Ipsum
3414fce53b
I18n: Update Czech translation
2019-03-11 14:28:44 +00:00
HJ
89d684af4e
Merge branch 'emoji-limit-profile' into 'develop'
...
user_card.vue: Set img.emoji to 32×32px
See merge request pleroma/pleroma-fe!665
2019-03-11 09:45:16 +00:00
Haelwenn (lanodan) Monnier
d0e78df220
user_card.vue: Copy over .status-content img styling
2019-03-11 05:14:49 +01:00
Edijs
9c60934786
Code refactoring
2019-03-10 18:13:01 -07:00
Edijs
8952761370
Version links to BE/FE
2019-03-10 18:06:51 -07: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
Henry Jameson
0b1506a4c0
wip support for follower/following, a bit broken and with regression
2019-03-10 18:05:51 +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
Haelwenn (lanodan) Monnier
07a46f7736
user_card.vue: Set img.emoji to 32×32px
...
Related to https://git.pleroma.social/pleroma/pleroma/merge_requests/792
2019-03-10 01:56:51 +01: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
489f840d84
fix error
2019-03-09 11:54:11 +02:00
Henry Jameson
47211fb32c
emoji adder
2019-03-09 02:23:50 +02:00
Henry Jameson
a02a74e9b9
attempt at fixing switching to user TL
2019-03-09 01:51:36 +02: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
dave
3468c0fd04
#432 - prevent post status form textarea keydown event propagation
2019-03-08 13:53:46 -05: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
09736691ea
Merge branch '420-redo-user-card-content' into 'develop'
...
Re-do UserCardContent Component CSS
Closes #420
See merge request pleroma/pleroma-fe!642
2019-03-07 16:38:45 +00:00
Shpuld Shpludson
82cd1252b5
Merge branch '415-timeline' into 'develop'
...
Fix timeline updating bug when scrolled down
Closes #415
See merge request pleroma/pleroma-fe!644
2019-03-07 16:34:43 +00: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
2baff88e3f
Merge branch 'fix/gallery-css' into 'develop'
...
Fix gallery style - move hide button to top right
Closes #335
See merge request pleroma/pleroma-fe!579
2019-03-07 16:03:32 +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
292cdfb24b
Merge content types translations
2019-03-06 20:13:04 -08:00
Shpuld Shpludson
423e1b3b12
Merge branch 'i18n-cs' into 'develop'
...
I18n: Add Czech translation
See merge request pleroma/pleroma-fe!627
2019-03-06 20:23:46 +00:00
Shpuld Shpludson
de46ede8fd
Merge branch 'issue-346-auto-post' into 'develop'
...
#346 : Hyperlink is not included
Closes #346
See merge request pleroma/pleroma-fe!626
2019-03-06 20:22:12 +00:00
taehoon
aca3b37134
Use a cross browser safe solution to get scroll top
2019-03-06 12:10:29 -05:00
taehoon
5f51fe897d
Revert modifier class notation
2019-03-05 21:52:04 -05:00
taehoon
37acb51df4
Update classname
2019-03-05 21:48:07 -05:00
taehoon
7bceabb5bd
Rename UserCardContent to UserCard
2019-03-05 14:01:49 -05:00
taehoon
baf603a506
Update block class name of BasicUserCard component
2019-03-05 13:56:40 -05:00
taehoon
43c52cb950
Update modifier class notation
2019-03-05 13:25:31 -05:00
Henry Jameson
68b2d9ef56
compatibility with upcoming changes
2019-03-05 20:15:18 +02:00
taehoon
e0a66b989d
Re-do UserCardContent css
2019-03-05 10:46:03 -05:00
Shpuld Shpludson
216073eb58
Merge branch 'fix/gallery-and-attachment-spacing' into 'develop'
...
Unify spacing between gallery/link preview/attachment components
See merge request pleroma/pleroma-fe!638
2019-03-05 14:40:20 +00:00
Edijs
f91e4a5801
Load post status content type from instance config
2019-03-04 21:29:56 -08:00
taehoon
ff9e55ae42
Generate cropped avatar image in the original file type
2019-03-04 21:22:32 -05:00
Shpuld Shpludson
3e4d465eba
Merge branch 'patch-2' into 'develop'
...
Update of the Occitan file.
See merge request pleroma/pleroma-fe!635
2019-03-04 19:27:38 +00:00
Exilat
5a273d528f
Update oc.json
2019-03-04 18:53:16 +00:00
Shpuld Shpludson
4ab3e29877
Merge branch 'develop' into 'develop'
...
Portuguese translation update
See merge request pleroma/pleroma-fe!637
2019-03-04 18:21:14 +00:00
shpuld
bd0485ad2f
unify spacing between gallery/link preview/attachment components
2019-03-04 18:56:47 +02:00
Shpuld Shpludson
d6e9ad3b61
Merge branch 'develop' into 'develop'
...
Update and complete the Esperanto translation
See merge request pleroma/pleroma-fe!630
2019-03-04 16:11:17 +00:00
Shpuld Shpludson
893767b780
Merge branch 'issue-417-profile-tab' into 'develop'
...
Issue 417 profile tab
Closes #417
See merge request pleroma/pleroma-fe!634
2019-03-04 16:09:23 +00:00
aaabulafiaaa
a2a3bda1f6
more pt strings
2019-03-04 08:36:35 -03:00
aaabulafiaaa
116a51e949
more pt strings
2019-03-03 19:42:02 -03:00
aaabulafiaaa
ae1a9a8626
More strings
2019-03-03 19:03:11 -03:00
rondnelly assis
793abed7ed
Translating more strings
2019-03-03 21:55:16 +00:00
dave
0ea9e4ca14
#418 : update timeago margin to align with icons
2019-03-03 14:15:53 -05:00
dave
f392668b73
#418 : update notification timeago format
2019-03-03 14:11:38 -05:00
Exilat
3e16b5a2e0
Update of the Occitan file.
...
Not at 100% but more complete then what it was.
2019-03-03 19:06:32 +00:00
dave
5a0bb29f02
#417 : reset tab from the outside
2019-03-03 13:38:48 -05:00
dave
3d30ad1dda
#417 : refresh tab on user profile only
2019-03-03 12:53:01 -05:00
dave
10711f9045
#417 : reset tab status when active user changes
2019-03-03 12:15:55 -05: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
Henry Jameson
6841f516fc
fix broken statuses
2019-03-02 20:39:04 +02:00
taehoon
94b0321c71
Update font-size of username in UserCardContent component
2019-03-02 12:58:17 -05:00
Aditoo17
93f5f94698
I18n: Add Czech translation
2019-03-02 18:25:49 +01:00
Tirifto
a884bbb6a6
Update and complete the Esperanto translation
2019-03-02 17:50:59 +01:00
Shpuld Shpludson
c4f8426349
Re-do status header a bit, add more consistent spacing to status
2019-03-02 16:35:38 +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
shpuld
1d3b1ac934
start working on one tap notifications
2019-03-02 16:57:32 +02:00
shpuld
068da3cf9f
Fix JS error when no statuses returned
2019-03-02 14:57:41 +02:00
jasper
81e89fed3d
Fetch activites by last id
2019-03-01 12:53:24 -08: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
f3f9fbe302
#392 : clean up notification stopping section
2019-03-01 11:59:50 -05:00
dave
bbab1b1dc6
#346 : Hyperlink is not included
2019-02-28 21:03:35 -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
Shpuld Shpludson
bbe4f3e3af
Merge branch 'issue-410-greyout-checkbox' into 'develop'
...
#410 : disable checkbox when parent is disabled
Closes #410
See merge request pleroma/pleroma-fe!624
2019-02-28 18:02:15 +00:00
dave
cccf33d6dd
#388 : update naming properly
2019-02-28 12:53:37 -05:00
taehoon
36460fd384
Fix layout overflow issue
2019-02-28 12:48:14 -05:00
taehoon
a8d11b22e7
Add a class to screen name
2019-02-28 12:41:20 -05:00
taehoon
24e1adf6df
Add back accidently removed logic
2019-02-28 12:41:20 -05:00
taehoon
0e86681aba
Merge all slots of BasicUserCard into one
2019-02-28 12:41:20 -05:00
taehoon
6e41b4b546
Revert "Minor mobile layout improvement for BasicUserCard"
...
This reverts commit 1cd964bffff3ae4d324d0ab99e5c218eae7cd0ca.
2019-02-28 12:41:20 -05:00
taehoon
d5f8e2b1ee
Minor mobile layout improvement for BasicUserCard
2019-02-28 12:41:20 -05:00
taehoon
651c97153b
Use native filter function
2019-02-28 12:41:20 -05:00
taehoon
a6f2af4ad9
Shorten a classname
2019-02-28 12:41:20 -05:00
taehoon
c5519fa587
Improve mobile layout of user card
2019-02-28 12:41:20 -05:00
taehoon
1fecac9ba6
Update naming
2019-02-28 12:41:20 -05:00
taehoon
8dd42cfc65
Add back some css
2019-02-28 12:41:20 -05:00
taehoon
30f5bf1463
Remove legacy class names in BasicUserCard
2019-02-28 12:41:20 -05:00
taehoon
0d283c3f17
Remove UserCard
2019-02-28 12:41:20 -05:00
taehoon
96e7e8235d
Migrate UserCard to FollowCard and FollowRequestCard
2019-02-28 12:41:20 -05:00
taehoon
390b2bcfee
Add FollowRequestCard component
2019-02-28 12:41:20 -05:00
taehoon
4b0a11acef
Improve action button size and position in BasicUserCard
2019-02-28 12:41:20 -05:00
taehoon
8923492e68
Remove needless div wrapper
2019-02-28 12:41:20 -05:00
taehoon
9ca805a991
Add new FollowCard component
2019-02-28 12:41:20 -05:00
taehoon
1337e42b2d
Add third slot area to BasicUserCard
2019-02-28 12:41:20 -05:00
taehoon
784523b8ec
Use big avatar in BasicUserCard
2019-02-28 12:41:20 -05:00
taehoon
3ab42efbc3
Remove unused component local registration
2019-02-28 12:41:20 -05:00
taehoon
3f9fd07f93
Remove non-existing prop binding
2019-02-28 12:41:20 -05:00
taehoon
bb1fac4bc2
Remove needless component local registration
2019-02-28 12:41:20 -05:00
taehoon
080786c945
Rewrite FollowList using hocs
2019-02-28 12:41:20 -05:00