03c2f29b0a
cleanup and appropriation for new emoji-input component API, styles updates
2019-07-28 16:07:01 +03:00
4c78fdb393
rename emoji-selector to emoji-picker
2019-07-28 14:41:22 +03:00
259e8c52ee
post-merge fix
2019-07-28 13:33:05 +03:00
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
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
d785ed5a05
rewrite unit tests
2019-07-25 23:34:56 -04:00
a443a5203e
add more unit tests for elimination logic
2019-07-25 14:17:48 -04:00
65ef039316
add unit test for elimination logic
2019-07-25 08:03:41 -04:00
53c9517a4a
use array.includes instead of array.indexOf
2019-07-24 22:42:06 -04:00
0f8ace4836
update status eliminating logic
2019-07-24 21:02:37 -04:00
876c6de806
fix typos
2019-07-24 21:02:37 -04:00
dca384f123
update prop syntax
2019-07-24 21:02:37 -04:00
d7dc070667
put two loops in one parent
2019-07-24 21:02:37 -04:00
ae829e8df1
move pinned statuses showing logic in timeline
2019-07-24 21:02:37 -04:00
4826d72549
update prop name
2019-07-24 21:02:37 -04:00
7f9feacd26
prevent showing pinned statuses twice
2019-07-24 21:02:37 -04:00
6380f7df16
Update es.json (add sticker)
2019-07-24 22:06:45 +00:00
4827e4d972
Merge branch 'feature/add-sticker-picker' into 'develop'
...
Feature/add sticker picker
See merge request pleroma/pleroma-fe!885
2019-07-24 19:35:52 +00:00
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
28f777cb8a
Merge branch '587' into 'develop'
...
Protect secure routes which require auth
Closes #587
See merge request pleroma/pleroma-fe!892
2019-07-24 16:17:06 +00:00
8375d7a3aa
guard more secure routes
2019-07-24 11:08:05 -04:00
ad29e20324
guard secure routes by redirecting to root
2019-07-24 11:08:05 -04:00
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
c2cef3055d
Merge branch '592' into 'develop'
...
Allow to click hyperlink inside markdown/html content
Closes #592
See merge request pleroma/pleroma-fe!891
2019-07-24 13:23:04 +00:00
1cefaa8446
closest can returns itself as well
2019-07-23 20:59:37 -04:00
17ad5bbdf9
find inside status-content div only
2019-07-23 15:44:41 -04:00
09efcb48a4
try to use the closest a tag as target
2019-07-23 15:43:03 -04:00
51fc0a5c52
Update es.json
2019-07-23 15:16:03 +00:00
e448950023
Merge branch 'fix/keyword-filter' into 'develop'
...
Also apply keyword filter to subjects
See merge request pleroma/pleroma-fe!887
2019-07-22 20:06:57 +00:00
fb9f254f8d
Also apply keyword filter to subjects
2019-07-20 19:06:54 +02:00
9c2c00992d
Remove files I accidentally pushed in
2019-07-18 17:25:06 +03:00
619608ea7a
fix issues caused by merges in usersearch on @
2019-07-18 17:22:51 +03:00
029dc7405e
Merge branch 'add-user-search-at' into 'develop'
...
Add user search at
See merge request pleroma/pleroma-fe!852
2019-07-18 03:40:02 +00:00
5909baba7c
Add user search at
2019-07-18 03:40:02 +00:00
cc2e35f499
Merge branch '609' into 'develop'
...
Fix popper issues using another popper library
Closes #612 and #609
See merge request pleroma/pleroma-fe!881
2019-07-16 20:49:49 +00:00
051b3b5141
fix eslint warnings
2019-07-15 21:22:41 -04:00
d35a16b4bd
remove vue-popperjs
2019-07-15 21:22:41 -04:00
e3ac71968b
fix moderation menu partially hidden by usercard boundary
2019-07-15 21:22:41 -04:00
c4789a348f
migrate popper css
2019-07-15 21:22:41 -04:00
4f74392641
rewrite ModerationTools using v-tooltip
2019-07-15 21:22:41 -04:00
b9c547828e
make popover position for status action dropdow relative to parent node
2019-07-15 21:22:41 -04:00
005815c825
rewrite ExtraButtons using v-tooltip
2019-07-15 21:22:40 -04:00
1727c815f8
install v-tooltip
2019-07-15 21:22:40 -04:00
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
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
bfc6f7b3ec
Merge branch 'revert-0a7c60c3' into 'develop'
...
Revert "Merge branch 'csp-header' into 'develop'"
See merge request pleroma/pleroma-fe!880
2019-07-15 19:21:01 +00:00
c649e202b3
Merge branch 'i18n/update-pedantic-japanese-traslation' into 'develop'
...
i18n/Update pedantic Japanese translation
See merge request pleroma/pleroma-fe!882
2019-07-15 19:18:40 +00:00
54b45ec4a3
i18n/Update pedantic Japanese translation
2019-07-15 19:18:40 +00:00
34ca0d369f
Merge branch 'i18n/update-japanese-trasnlation' into 'develop'
...
i18n/Update easy Japanese trasnlation
See merge request pleroma/pleroma-fe!878
2019-07-15 19:18:20 +00:00
f665ac83e7
i18n/Update easy Japanese trasnlation
2019-07-15 19:18:20 +00:00
Henry Jameson