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
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
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
Shpuld Shpludson
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
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
7cb13df8ad
Update tests
2019-03-05 14:13:22 -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
Shpuld Shpludson
8cda230fba
Merge branch '419-avatar-cropper-png' into 'develop'
...
Generate cropped avatar image in the original file type
Closes #419
See merge request pleroma/pleroma-fe!640
2019-03-05 14:40:08 +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