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
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
4a27c6d8d3
Add floating post-status button on mobile
2019-03-11 16:51:37 +00:00
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
d8e938bb5e
Update user settings icon to pencil
2019-03-11 11:52:49 -04:00
4f455eefe5
#433 : do not remove the reply dialog
2019-03-11 10:52:28 -04:00
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
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
3414fce53b
I18n: Update Czech translation
2019-03-11 14:28:44 +00:00
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
d0e78df220
user_card.vue: Copy over .status-content img styling
2019-03-11 05:14:49 +01:00
9c60934786
Code refactoring
2019-03-10 18:13:01 -07:00
8952761370
Version links to BE/FE
2019-03-10 18:06:51 -07:00
06d39b62a8
fixed tests, review fixes, now storing local users with downcase screen name for
...
better compatibility
2019-03-11 02:17:58 +02:00
068c9724e4
Added new tab to display versions of BE/FE
2019-03-10 16:58:12 -07:00
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
70d7ed3607
Make minId reset with minVisibleId to prevent gaps when showing new
2019-03-10 22:40:48 +02:00
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
4a5aef8883
basic user and status actions implemented
2019-03-10 19:15:07 +02:00
0b1506a4c0
wip support for follower/following, a bit broken and with regression
2019-03-10 18:05:51 +02:00
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
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
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
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
489f840d84
fix error
2019-03-09 11:54:11 +02:00
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
47211fb32c
emoji adder
2019-03-09 02:23:50 +02:00
a02a74e9b9
attempt at fixing switching to user TL
2019-03-09 01:51:36 +02:00
fe624f6114
fix reply-to marker, also whoops console log
2019-03-09 01:34:15 +02:00
690c1dcd7a
revert some stuff, turns out it's actually breaking. Fixed some local user things
2019-03-09 01:19:56 +02:00
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
3468c0fd04
#432 - prevent post status form textarea keydown event propagation
2019-03-08 13:53:46 -05:00
853e0bc26f
switch to mastoapi for user timeline
2019-03-08 00:50:58 +02:00
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
6e2946f352
switch direct messages to mastoapi
2019-03-07 20:21:07 +02:00
8522063b2c
switch public and TWKN to MastoAPI
2019-03-07 20:16:35 +02:00
c038d0c12a
undo this change since BE returns empty object for relationship, add in a
...
separate MR
2019-03-07 20:04:29 +02:00
2e59ab738b
updates normalizer for proper user handling and adds support for friends tl via mastoapi
2019-03-07 19:49:41 +02:00
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
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
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
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
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
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
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
292cdfb24b
Merge content types translations
2019-03-06 20:13:04 -08:00
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
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
aca3b37134
Use a cross browser safe solution to get scroll top
2019-03-06 12:10:29 -05:00
830f3762ef
Merge branch 'emoji-limit' into 'develop'
...
compatibility with upcoming changes
See merge request pleroma/pleroma-fe!643
2019-03-06 05:11:07 +00:00
dave