dave
783cc00dd0
merge develop & resolve conflict
2019-03-29 10:11:28 -04: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 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
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
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
43e97e590c
#433 - sort conversation for retweets and clean up
2019-03-27 16:00:54 -04: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
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
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
dave
c5ec4829a7
#433 - consider page on focused
2019-03-25 15:10:45 -04: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
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
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
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
909c315a44
Get correct mimetype through entity_normalizer
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
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
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
ed4540530b
#451 - add class to username span
2019-03-22 10:42:21 -04: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
9857002bf5
Add hideMutedPosts setting and wire up to post-returning endpoints
2019-03-21 16:33:02 -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
3255950b0e
Add mute/unmute featrue and mutes management tab
2019-03-21 16:19:03 -04: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
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
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
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
5717d97182
#442 - update placeholder linebreak
2019-03-18 10:35:13 -04:00
dave
e5786f32a7
#436 : merge develop
2019-03-15 11:28:33 -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
dave
8ade93bb4d
#436 : update test
2019-03-14 22:36:11 -04: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
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
2f7d890ad2
#436 : add dismiss button, disable is_seen part
2019-03-13 14:08:03 -04: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
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
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
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
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
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
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