moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,948 Commits 70 Branches 19 Tags 22 MiB
Commit Graph

3948 Commits

Author SHA1 Message Date
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 d785ed5a05 rewrite unit tests 2019-07-25 23:34:56 -04:00
taehoon a443a5203e add more unit tests for elimination logic 2019-07-25 14:17:48 -04: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
HJ 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
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
Shpuld Shpludson 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
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
Shpuld Shpludson 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
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
kaniini 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
Toromino fb9f254f8d Also apply keyword filter to subjects 2019-07-20 19:06:54 +02:00
shpuld 9c2c00992d Remove files I accidentally pushed in 2019-07-18 17:25:06 +03:00
shpuld 619608ea7a fix issues caused by merges in usersearch on @ 2019-07-18 17:22:51 +03:00
Shpuld Shpludson 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
Wyatt Benno 5909baba7c Add user search at 2019-07-18 03:40:02 +00:00
HJ 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
taehoon 051b3b5141 fix eslint warnings 2019-07-15 21:22:41 -04:00
taehoon d35a16b4bd remove vue-popperjs 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
Shpuld Shpludson 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
Shpuld Shpludson 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
Hakaba Hitoyo 54b45ec4a3 i18n/Update pedantic Japanese translation 2019-07-15 19:18:40 +00:00
Shpuld Shpludson 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
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
Shpuld Shpludson e9b452575b Merge branch 'new-search' into 'develop' 
New search

See merge request pleroma/pleroma-fe!832
 2019-07-15 16:42:27 +00:00
Eugenij 69a4bcb238 New search 2019-07-15 16:42:27 +00:00
HJ 0c06410584 Merge branch '482-subscribe-user' into 'develop' 
Implement ability to subscribe to a user

Closes #482

See merge request pleroma/pleroma-fe!771
 2019-07-15 06:50:31 +00:00