Henry Jameson
4c78fdb393
rename emoji-selector to emoji-picker
2019-07-28 14:41:22 +03:00
Henry Jameson
259e8c52ee
post-merge fix
2019-07-28 13:33:05 +03:00
Henry Jameson
b3aff9bbae
Merge remote-tracking branch 'upstream/develop' into emoji-selector-update
...
* upstream/develop: (469 commits)
Feature/add sticker picker
guard more secure routes
guard secure routes by redirecting to root
closest can returns itself as well
find inside status-content div only
try to use the closest a tag as target
Update es.json
Also apply keyword filter to subjects
Remove files I accidentally pushed in
fix issues caused by merges in usersearch on @
Add user search at
fix eslint warnings
remove vue-popperjs
fix moderation menu partially hidden by usercard boundary
migrate popper css
rewrite ModerationTools using v-tooltip
make popover position for status action dropdow relative to parent node
rewrite ExtraButtons using v-tooltip
install v-tooltip
i18n/Update pedantic Japanese translation
...
2019-07-28 13:30:29 +03: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
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
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
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
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
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
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
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
Henry Jameson
020c6d1bcf
all the manual fixes
2019-07-07 00:54:17 +03:00
Henry Jameson
1ec4caa0bb
fix merge conflict
2019-07-06 23:52:10 +03:00
HJ
8f53796420
Merge branch 'develop' into 'eslint-fix'
...
# Conflicts:
# src/components/post_status_form/post_status_form.vue
2019-07-06 20:43:38 +00:00
