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
Shpuld Shpludson
7c26435e66
Merge branch 'develop' into 'master'
...
Update master with bugfixes (and other changes)
See merge request pleroma/pleroma-fe!673
2019-03-11 18:53:34 +00: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
f397537642
Merge branch 'feature/mobile-improvements-2' into 'develop'
...
Add floating post-status button on mobile
See merge request pleroma/pleroma-fe!628
2019-03-11 16:51:37 +00:00
Shpuld Shpludson
4a27c6d8d3
Add floating post-status button on mobile
2019-03-11 16:51:37 +00:00
Shpuld Shpludson
bb1a4e11f8
Merge branch '382-update-user-settings-icon' into 'develop'
...
Update user settings icon to pencil
Closes #382
See merge request pleroma/pleroma-fe!602
2019-03-11 16:48:16 +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
lambda
ed3bf6f027
Merge branch 'i18n-cs' into 'develop'
...
I18n: Update Czech translation
See merge request pleroma/pleroma-fe!651
2019-03-11 14:28:44 +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 Shpludson
151e200983
Merge branch 'fix/timeline-gaps-when-loading-older-after-showing-new' into 'develop'
...
Fix gaps in timeline when loading older after pressing show new
See merge request pleroma/pleroma-fe!670
2019-03-10 21:11:26 +00: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
Shpuld Shpludson
841648676c
Merge branch 'issue-432-dot-key' into 'develop'
...
#432 - prevent post status form textarea keydown event propagation
Closes #432
See merge request pleroma/pleroma-fe!658
2019-03-10 15:29:44 +00: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
f3a9200b7c
some test fixes, disabled one test for now since logic now is even more async in general
2019-03-09 02:47:20 +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