HJ
7e2d48a26e
Merge branch 'fix/incorrect-follow-request-status' into 'develop'
...
Fix sent follow request detection
See merge request pleroma/pleroma-fe!910
2019-08-09 12:57:05 +00:00
rinpatch
114b5f6eff
Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
2019-08-09 12:26:58 +00:00
rinpatch
5f3ac6625f
Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
2019-08-09 12:25:58 +00:00
rinpatch
e83b321ff2
Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
2019-08-09 12:01:57 +00:00
rinpatch
766bcc2a72
Fix sent follow request detection
...
This fixes `requestFollow` using the relationship instead of user object,
resulting in `sent` always being false for locked users, and also removes
assumptions about follow request being sent, instead relying on
`requested` from user relationship.
2019-08-09 15:01:13 +03:00
HJ
59f2931361
Merge branch 'fix/text-dont-media-viewer' into 'develop'
...
fix english settings label regarding how to view videos
See merge request pleroma/pleroma-fe!909
2019-08-09 08:31:02 +00:00
matrixsasuke
3e7f0ecf9b
fix english settings label regarding how to view videos
2019-08-09 08:03:21 +02:00
shpuld
d4c366a123
fix extra buttons merge bug
2019-08-08 21:24:40 +03:00
Shpuld Shpludson
a45f258a2c
Merge branch '632' into 'develop'
...
Fix gif image zoom bug on hover
Closes #632
See merge request pleroma/pleroma-fe!905
2019-08-08 10:12:46 +00:00
Shpuld Shpludson
acb788d575
Merge branch '631' into 'develop'
...
Hide image block in rich media preview in case of broken image
Closes #631
See merge request pleroma/pleroma-fe!902
2019-08-08 10:10:58 +00:00
Shpuld Shpludson
74cf601094
Merge branch '627' into 'develop'
...
Fix "Post status modal disappearing on mobile landscape mode"
Closes #627
See merge request pleroma/pleroma-fe!899
2019-08-08 10:10:23 +00:00
Shpuld Shpludson
92380652fe
Merge branch 'feat/conversation-muting' into 'develop'
...
Add Conversation/Thread Muting
See merge request pleroma/pleroma-fe!876
2019-08-08 10:09:07 +00:00
morguldir
b9fd3bebc5
Update norwegian bokmål translation
2019-08-08 00:47:48 +02:00
taehoon
4d54c67daa
make size of gif image and preview equal
2019-08-06 22:41:27 -04:00
taehoon
32b4d4d223
css improvements
2019-08-06 20:53:10 -04:00
taehoon
a13c945143
do not unmount post status modal in desktop
2019-08-06 20:53:09 -04:00
taehoon
bb9cee84a3
hide rich media preview image in case of broken image
2019-08-06 20:52:42 -04:00
Lee Starnes
4fc27414d2
Handle JSONified errors while registering
...
Closes #617
2019-08-06 18:03:31 +00:00
tarteka
c0e8d1a809
Corrections and semantics changes for Spanish translation
2019-08-05 15:23:39 +02:00
tarteka
5f6456703c
add Basque translate
2019-08-01 18:21:32 +02:00
Shpuld Shpludson
0e6489d840
Merge branch 'patch-2' into 'develop'
...
Update es.json (add sticker)
See merge request pleroma/pleroma-fe!893
2019-07-31 17:46:40 +00:00
Shpuld Shpludson
f031e96334
Merge branch '618' into 'develop'
...
Ability to enlarge profile picture in profile page
Closes #618
See merge request pleroma/pleroma-fe!890
2019-07-31 17:46:24 +00:00
Eugenij
254648991d
Focus on the search input when the search icon is clicked
2019-07-31 17:39:35 +00:00
taehoon
af75791f1b
prevent scrolling top when click search input
2019-07-31 12:20:05 -04:00
taehoon
be7a508d89
add zoom-in indication to avatar
2019-07-28 21:05:13 -04:00
taehoon
b2bd128f05
allow zooming avatar in profile panel header
2019-07-28 21:05:13 -04:00
taehoon
5881d92eb7
use $route instead of $router.currentRoute
2019-07-28 21:05:13 -04:00
taehoon
7c2982064e
enlarge avatar in profile page
2019-07-28 21:05:13 -04:00
Shpuld Shpludson
d3f6b581d1
Merge branch 'develop' into 'feat/conversation-muting'
...
# Conflicts:
# src/components/extra_buttons/extra_buttons.js
# src/components/extra_buttons/extra_buttons.vue
2019-07-26 12:44:32 +00:00
taehoon
65ef039316
add unit test for elimination logic
2019-07-25 08:03:41 -04:00
taehoon
53c9517a4a
use array.includes instead of array.indexOf
2019-07-24 22:42:06 -04:00
taehoon
0f8ace4836
update status eliminating logic
2019-07-24 21:02:37 -04:00
taehoon
876c6de806
fix typos
2019-07-24 21:02:37 -04:00
taehoon
dca384f123
update prop syntax
2019-07-24 21:02:37 -04:00
taehoon
d7dc070667
put two loops in one parent
2019-07-24 21:02:37 -04:00
taehoon
ae829e8df1
move pinned statuses showing logic in timeline
2019-07-24 21:02:37 -04:00
taehoon
4826d72549
update prop name
2019-07-24 21:02:37 -04:00
taehoon
7f9feacd26
prevent showing pinned statuses twice
2019-07-24 21:02:37 -04:00
tarteka
6380f7df16
Update es.json (add sticker)
2019-07-24 22:06:45 +00:00
absturztaube
fa6210872f
Feature/add sticker picker
...
Squash to avoid storing commits with stickers in it to avoid possible copyright problems and excess storage space. --hj
2019-07-24 19:35:52 +00:00
taehoon
8375d7a3aa
guard more secure routes
2019-07-24 11:08:05 -04:00
taehoon
ad29e20324
guard secure routes by redirecting to root
2019-07-24 11:08:05 -04:00
Shpuld Shpludson
1f8f2e26e3
Merge branch 'patch-2' into 'develop'
...
Update es.json
See merge request pleroma/pleroma-fe!889
2019-07-24 13:32:57 +00:00
taehoon
1cefaa8446
closest can returns itself as well
2019-07-23 20:59:37 -04:00
taehoon
17ad5bbdf9
find inside status-content div only
2019-07-23 15:44:41 -04:00
taehoon
09efcb48a4
try to use the closest a tag as target
2019-07-23 15:43:03 -04:00
tarteka
51fc0a5c52
Update es.json
2019-07-23 15:16:03 +00:00
Toromino
fb9f254f8d
Also apply keyword filter to subjects
2019-07-20 19:06:54 +02:00
shpuld
619608ea7a
fix issues caused by merges in usersearch on @
2019-07-18 17:22:51 +03:00
Wyatt Benno
5909baba7c
Add user search at
2019-07-18 03:40:02 +00:00
taehoon
051b3b5141
fix eslint warnings
2019-07-15 21:22:41 -04:00
taehoon
e3ac71968b
fix moderation menu partially hidden by usercard boundary
2019-07-15 21:22:41 -04:00
taehoon
c4789a348f
migrate popper css
2019-07-15 21:22:41 -04:00
taehoon
4f74392641
rewrite ModerationTools using v-tooltip
2019-07-15 21:22:41 -04:00
taehoon
b9c547828e
make popover position for status action dropdow relative to parent node
2019-07-15 21:22:41 -04:00
taehoon
005815c825
rewrite ExtraButtons using v-tooltip
2019-07-15 21:22:40 -04:00
taehoon
1727c815f8
install v-tooltip
2019-07-15 21:22:40 -04:00
HJ
f734a72116
Merge branch 'fix/respect-hide-post-stats' into 'develop'
...
Hide favs/rts properly when hide post stats is enabled
See merge request pleroma/pleroma-fe!877
2019-07-15 21:47:45 +00:00
Shpuld Shpludson
e86f6edb7c
Merge branch 'patch-2' into 'develop'
...
Update es.json
See merge request pleroma/pleroma-fe!794
2019-07-15 19:21:37 +00:00
Hakaba Hitoyo
54b45ec4a3
i18n/Update pedantic Japanese translation
2019-07-15 19:18:40 +00:00
Hakaba Hitoyo
f665ac83e7
i18n/Update easy Japanese trasnlation
2019-07-15 19:18:20 +00:00
Shpuld Shpludson
3370dd80dc
Merge branch 'develop' into 'feat/conversation-muting'
...
# Conflicts:
# src/services/api/api.service.js
2019-07-15 19:09:01 +00:00
Eugenij
69a4bcb238
New search
2019-07-15 16:42:27 +00:00
taehoon
ff90d864cc
fix wrong eslint comments
2019-07-12 15:11:54 -04:00
taehoon
78594f61d4
add a todo comment
2019-07-12 15:10:30 -04:00
taehoon
57c5d269b8
add bell-ringing icon
2019-07-11 12:52:05 -04:00
taehoon
b2dbf01a72
eslint —fix
2019-07-10 21:01:08 -04:00
taehoon
9712e324e5
hide subscribe button unless following
2019-07-10 21:01:08 -04:00
taehoon
1237d0d2b8
use normal bell for unsubscribed state
2019-07-10 21:01:08 -04:00
taehoon
4f26299bd5
update copy
2019-07-10 21:01:08 -04:00
taehoon
0f4cccd115
improve ui
2019-07-10 21:01:08 -04:00
taehoon
38ba5fe028
change subscribe button to icon button
2019-07-10 21:01:08 -04:00
taehoon
2ab00387fe
clean up + add btn-group css class
2019-07-10 21:01:07 -04:00
taehoon
e1d6e56e1b
clean up layout
2019-07-10 21:01:07 -04:00
taehoon
0fc154d9d4
clean up UserCard css
2019-07-10 21:01:07 -04:00
taehoon
dbe2decc59
clean up UserCard template
2019-07-10 21:01:07 -04:00
taehoon
3b9ab0e343
no need to covert to boolean
2019-07-10 21:01:07 -04:00
taehoon
670cbfdd1c
change subscribing to subscribed
2019-07-10 21:01:07 -04:00
taehoon
0c52d69a52
update copy
2019-07-10 21:01:07 -04:00
taehoon
ace3b399ff
support i18n
2019-07-10 21:01:07 -04:00
taehoon
deee07d6fb
show subscribe button only if user is logged in
2019-07-10 21:01:07 -04:00
taehoon
646d197bf1
mutate updated relationship to the store
2019-07-10 21:01:07 -04:00
taehoon
e9e6daa76e
show text in progress only when slot is given
2019-07-10 21:01:07 -04:00
taehoon
f4a16e6541
add subscribing to user entity normalizer
2019-07-10 21:01:07 -04:00
taehoon
4cf402ff21
migrate SubscribeButton to the existing common component
2019-07-10 21:01:07 -04:00
jared
d5e8315e83
#482 - add subscribe button
2019-07-10 21:01:07 -04:00
jared
f2c95f9d0b
#482 - add new endpoints to subscribe to the user
2019-07-10 21:01:07 -04:00
Tae Hoon
532b76eb64
Refactor user search api, better api error response handling
2019-07-10 16:58:49 +00:00
shpuld
59ade4084e
Hide favs/rts properly when hide post stats is enabled
2019-07-09 16:50:23 +03:00
taehoon
0131effb01
add comments
2019-07-07 22:49:18 -04:00
taehoon
ab4d7d9616
refetch favs and repeats separately
2019-07-07 22:49:18 -04:00
taehoon
e9b6e0e2b7
refetch favs and repeats when stats are changed
2019-07-07 22:49:18 -04:00
taehoon
17498ef906
update favs and repeats stats using favoritedByUsers and rebloggedByUsers data
2019-07-07 22:49:18 -04:00
shpuld
7ed9d17ce7
Add thread muting to context menu of status
2019-07-07 23:02:09 +03:00
shpuld
e5879e3d4d
check for user before checking users props
2019-07-07 22:23:04 +03:00
Shpuld Shpludson
54b0f90133
Merge branch 'eslint-fix' into 'develop'
...
Fix shitton warning eslint gives
See merge request pleroma/pleroma-fe!871
2019-07-07 19:12:33 +00:00
Shpuld Shpludson
171673113f
Merge branch 'revoke-token' into 'develop'
...
Revoke oAuth token on logout
Closes pleroma#952
See merge request pleroma/pleroma-fe!864
2019-07-07 18:29:36 +00:00
Shpuld Shpludson
c8794b2b84
Merge branch '580' into 'develop'
...
Fix backend version string parsing
Closes #580
See merge request pleroma/pleroma-fe!868
2019-07-07 10:30:45 +00:00
Shpuld Shpludson
e7ff9b5227
Merge branch '600-2' into 'develop'
...
Preserve formatting of status content
Closes #600
See merge request pleroma/pleroma-fe!872
2019-07-07 10:21:55 +00:00
Eugenij
14ec12b4f6
Set hide_follows and hide_followers settings when parsing Mastodon format
2019-07-07 10:20:55 +00:00
