Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
4752 commits 59 branches 16 tags 15 MiB
Commit graph

3850 commits

Author SHA1 Message Date
Henry Jameson
1b1620a755 Merge remote-tracking branch 'upstream/develop' into streaming 
* upstream/develop:
  Remove whitespace hack on empty post content
  Change output directory of fontello
  add html-webpack-plugin to karma config
  use another fork of fontello-webpack-plugin
  add animate-spin class
  remove needless code
  use another approach for versioning font files
  versioning the font resources through webpack
  fix "can't find property of undefined" errors in mrf transparency panel
  move mention button right next to mute button
  restore muted users collapsing logic on other user’s profiles
 2019-12-08 16:07:30 +02:00
Henry Jameson
ff95d865d2 Updated streaming and improved error-handling, some more refactoring to api 2019-12-08 16:05:41 +02:00
Ivan Tashkinov
a06705d939 Added OAuth 'push' and 'admin' scopes. 2019-12-08 13:52:26 +03:00
rinpatch
3b11860d34 Remove whitespace hack on empty post content 
It's no longer necessary since the backend handles posts with empty
content fine and also fixes an odd whitespace when attachment links are
disabled.
 2019-12-08 02:05:50 +03:00
Absturztaube
914c783984 fix sticker picker height in emojo picker 2019-12-07 10:29:53 +01:00
Wyatt Benno
01855f315c Wording updates 2019-12-06 09:38:55 +09:00
Wyatt Benno
13fc2612ae Change 403 messaging 2019-12-05 11:48:37 +09:00
taehoon
9d44015ab4 add animate-spin class 2019-12-03 11:16:38 -05:00
taehoon
57f46e68e4 remove needless code 2019-12-03 10:34:17 -05:00
taehoon
afd4524c39 use another approach for versioning font files 2019-12-03 10:32:46 -05:00
taehoon
0082ed837e versioning the font resources through webpack 2019-12-02 10:24:43 -05:00
Shpuld Shpludson
fa38a41e42 fix "can't find property of undefined" errors in mrf transparency panel 2019-12-02 12:20:24 +00:00
Shpuld Shpludson
d3adffbefe Merge branch '719' into 'develop' 
Fix "Muted users not being collapsed on other user's profiles"

Closes #719

See merge request pleroma/pleroma-fe!1013
 2019-12-02 12:17:43 +00:00
taehoon
7ebf3602d5 move mention button right next to mute button 2019-11-26 19:57:27 -05:00
taehoon
40e774e05a restore muted users collapsing logic on other user’s profiles 2019-11-25 12:25:01 -05:00
Henry Jameson
172ebaf4e6 improved initial notifications fetching 2019-11-24 22:01:12 +02:00
Henry Jameson
319bb4ac28 initial streaming work 2019-11-24 18:50:28 +02:00
Henry Jameson
ddb6fb9217 Backend Interactor service overhaul, removed the need for copypasting 2019-11-24 13:57:46 +02:00
kPherox
bfdf7c876c
Change field name to right justify 2019-11-20 19:26:04 +09:00
kPherox
a15baa8962
Use fields_html only 2019-11-20 19:26:04 +09:00
kPherox
d2e334daa3
Add tooltip 2019-11-20 19:26:02 +09:00
kPherox
87940ead8a
Change css selectors to classname from elementname 2019-11-20 18:59:37 +09:00
Hakaba Hitoyo
55da4462a4 [i18n] Improve easy/pedantic Japanese switching 2019-11-19 17:02:45 +00:00
kPherox
004827a7f1
Change profile fields design to horizontal 2019-11-20 00:19:47 +09:00
kPherox
2bc549a66a
Fix emoji size 2019-11-20 00:19:47 +09:00
kPherox
ca4d5950d0
Display user profile fields 2019-11-20 00:19:47 +09:00
HJ
0eda60eeb4 Merge branch 'greentext-strikes-back' into 'develop' 
⑨ Added greentext support ⑨

Closes #9

See merge request pleroma/pleroma-fe!994
 2019-11-19 14:22:17 +00:00
kPherox
a55486f8d7 Normalize profile fields 2019-11-19 14:15:41 +00:00
kPherox
0995658757 backend interactor service: implement startFetchingFollowRequest 
backend interactor service: remove unused fetchFollowRequests
 2019-11-19 14:07:15 +00:00
taehoon
44cd5ef814 show badge visibility user setting checkbox only if needed 2019-11-16 12:12:21 -05:00
AkiraFukushima
67c95c9d06 Use kana+kanji as default for Japanese translation 2019-11-17 01:11:19 +09:00
Shpuld Shpuldson
de945ba3e9 wip commit, add basic popover for emoji reaction select 2019-11-15 16:29:25 +02:00
Shpuld Shpuldson
d007502629 add fetching for emoji reactions, draft design 2019-11-15 08:39:21 +02:00
Mew Mew
3ecfbc8ea2 Fix translation (https://blob.cat/notice/9oyYO1RzcNbJXxKxeq) 2019-11-15 05:09:01 +00:00
Henry Jameson
bd2a682b83 tests + updates 2019-11-14 22:40:20 +02:00
taehoon
90fc6b0774 close image modal by clicking image 2019-11-14 14:07:05 -05:00
Henry Jameson
51ea295704 eslint 2019-11-14 00:52:38 +02:00
Henry Jameson
bce750c571 making dtluna proud or disgusted 2019-11-14 00:49:31 +02:00
Henry Jameson
897131572f Made it optional 2019-11-14 00:47:20 +02:00
Henry Jameson
692ee0e95a Fix regex, tag detector condition 2019-11-14 00:41:14 +02:00
Henry Jameson
50dc9df8a4 adds greentext, also small fixes 2019-11-14 00:18:14 +02:00
taehoon
58839ecef8 change N/A to Hidden 2019-11-12 13:31:30 -05:00
taehoon
85685d6478 add a translation 2019-11-12 11:42:07 -05:00
taehoon
949f47063b show N/A when count is hidden 2019-11-12 11:41:55 -05:00
Ariadne Conill
43d4d17b41 side drawer: same treatment 2019-11-11 14:37:14 -06:00
Ariadne Conill
cb5f73148a app: search API is not available in private mode so disable it 2019-11-11 14:28:10 -06:00
Ariadne Conill
1f9674350c nav panel: disable TWKN if federation disabled, disable Public and TWKN if privateMode is enabled 2019-11-11 14:28:07 -06:00
Ariadne Conill
21f1637e43 nav panel: refactor to use vuex mapState 2019-11-11 14:14:44 -06:00
Ariadne Conill
99fd096ddd boot: track whether private mode is enabled or not 2019-11-11 14:06:31 -06:00
Henry Jameson
9e774fffbf achieve the perfect speeeeen in media-upload 2019-11-11 21:45:40 +02:00
taehoon
3c3f2c654e add hideISP to defaultState of config module 2019-11-10 14:42:01 -05:00
Ariadne Conill
c24f95b498 mrf transparency panel: refactor to use vuex mapState 2019-11-09 11:32:18 -06:00
Ariadne Conill
6d6b5f3dbb mrf transparency panel: remove unneeded components{} 2019-11-09 11:16:19 -06:00
Ariadne Conill
a4ae956a62 boot: cleanup resolveStaffAccounts 2019-11-09 00:34:05 -06:00
Ariadne Conill
6dfe3cc911 lint 2019-11-09 00:23:22 -06:00
Ariadne Conill
90f764224d about: add MRF transparency panel 2019-11-09 00:09:32 -06:00
Ariadne Conill
20ccd93a17 about: add staff panel 2019-11-08 23:21:07 -06:00
Ariadne Conill
5db77c839b about page: fix hiding of instance-specific panel, flow ToS and ISP better 2019-11-08 21:57:09 -06:00
Ariadne Conill
6cede475be nav panel: add link to about page 2019-11-08 21:53:53 -06:00
Hakaba Hitoyo
e4820012a3 redirect /remote-users/:username@:hostname -> /users/:id, /remote-users/:hostname/:username -> /users/:id 2019-11-08 22:27:25 +00:00
HJ
2b68134ab0 Merge branch 'emoji-optimizations' into 'develop' 
Emoji fixes, optimizations and improvements

Closes #690, #686, #682, #674, and #678

See merge request pleroma/pleroma-fe!969
 2019-11-08 22:01:42 +00:00
Henry Jameson
a3501d58d8 clear filter on reopen, fix error message in console 2019-11-08 23:57:20 +02:00
Henry Jameson
23137dfd4b reset position when reopening emoji picker 2019-11-08 21:44:36 +02:00
Henry Jameson
a69946923b eslint fix 2019-11-08 21:35:58 +02:00
Henry Jameson
a43f1614ca fix not being able to see unicode emojis when there few of them when searching 
on emoji-a-ton instances
 2019-11-08 21:28:51 +02:00
Henry Jameson
9338c81f4a replace sanity button with loading on scroll 2019-11-08 21:25:13 +02:00
Henry Jameson
a38d16273d fix search not working, use computer property instead of state 2019-11-08 20:12:01 +02:00
Henry Jameson
0dcb696e26 Merge remote-tracking branch 'upstream/develop' into emoji-optimizations 
* upstream/develop: (95 commits)
  Lightbox/modal multi image improvements - #381
  '/api/pleroma/profile/mfa' -> '/api/pleroma/accounts/mfa'
  Add ability to change user's email
  translations-de-batch-1
  eu-translate update
  profile-banner rounding css, fixes #690
  fix indentation
  remove needless ref
  show preview popover when hover numbered replies
  refactor conditions
  do not make too many nested div
  add fetchStatus action
  refactor status loading logic
  split status preview popover into a separate component
  uninstall mobile-detect library
  listen both events
  minor css fix
  restrict distance at top side only
  set different trigger event in desktop and mobile by default
  fix eslint warnings
  ...
 2019-11-08 19:48:31 +02:00
taehoon
c1478b0887 fix eslint warnings 2019-11-08 11:14:01 -05:00
Wyatt Benno
f66026bf20 Lightbox/modal multi image improvements - #381 2019-11-08 06:16:26 +00:00
Maksim
ded022a1d2 '/api/pleroma/profile/mfa' -> '/api/pleroma/accounts/mfa' 2019-11-08 02:42:32 +00:00
Sergey Suprunenko
e3381cdef1 Add ability to change user's email 2019-11-08 02:21:19 +00:00
Matrix-Sasuke
18acc7af29 translations-de-batch-1 2019-11-08 01:29:01 +00:00
Tarteka
28524ab4a6 eu-translate update 2019-10-30 22:31:55 +01:00
DYM
1d2ddaf2d0 profile-banner rounding css, fixes #690 2019-10-30 03:15:57 +00:00
Henry Jameson
b66564a30d Merge remote-tracking branch 'upstream/develop' into settings-refactor 
* upstream/develop: (89 commits)
  remove needless ref
  show preview popover when hover numbered replies
  refactor conditions
  do not make too many nested div
  add fetchStatus action
  refactor status loading logic
  split status preview popover into a separate component
  uninstall mobile-detect library
  listen both events
  minor css fix
  restrict distance at top side only
  set different trigger event in desktop and mobile by default
  fix eslint warnings
  fix popper go behind the top bar
  migrate Popper to v-popover
  fix popper go behind the top bar
  fix eslint warnings
  reset font-size to normal text size using rem
  use top placement by default
  hide status preview popper when hover popper content
  ...
 2019-10-29 09:36:16 +02:00
Henry Jameson
c79b2501d2 fix indentation 2019-10-29 09:35:42 +02:00
Shpuld Shpludson
42f428d90e Merge branch 'eu-translate' into 'develop' 
[i18n] basque update and fix

See merge request pleroma/pleroma-fe!966
 2019-10-29 07:04:51 +00:00
Shpuld Shpludson
c79da5c456 Merge branch '599' into 'develop' 
Fix "Posts get cut off when there is not enough space to display them at the bottom"

Closes #599

See merge request pleroma/pleroma-fe!863
 2019-10-29 06:37:23 +00:00
Shpuld Shpludson
3a3db35985 Merge branch 'patch-3' into 'develop' 
Little fix to some strings on es.json

See merge request pleroma/pleroma-fe!967
 2019-10-29 06:06:58 +00:00
Henry Jameson
6ade3be5b4 fix loadEmojiInsane button submitting the form 2019-10-27 19:20:38 +02:00
taehoon
237d95b0f7 remove needless ref 2019-10-24 23:50:50 -04:00
taehoon
fbd1922567 show preview popover when hover numbered replies 2019-10-24 22:55:02 -04:00
taehoon
c5e391b606 refactor conditions 2019-10-24 22:41:15 -04:00
taehoon
644343ccda do not make too many nested div 2019-10-24 22:27:23 -04:00
taehoon
f969e9ab3d add fetchStatus action 2019-10-24 22:21:33 -04:00
taehoon
e00cf288f5 refactor status loading logic 2019-10-24 22:14:53 -04:00
taehoon
62b2648a3e split status preview popover into a separate component 2019-10-24 16:53:36 -04:00
taehoon
95e211ccb7 listen both events 2019-10-24 16:11:28 -04:00
taehoon
052a00dadb minor css fix 2019-10-24 15:15:33 -04:00
taehoon
17295429e5 restrict distance at top side only 2019-10-24 15:15:33 -04:00
taehoon
c009f17651 set different trigger event in desktop and mobile by default 2019-10-24 15:15:33 -04:00
taehoon
c9ba37ba2c fix eslint warnings 2019-10-24 15:15:33 -04:00
taehoon
39e92e76b9 fix popper go behind the top bar 2019-10-24 15:15:33 -04:00
taehoon
85c897403a migrate Popper to v-popover 2019-10-24 15:15:33 -04:00
taehoon
2f7f6967fd fix popper go behind the top bar 2019-10-24 15:15:33 -04:00
taehoon
e834b9d88b fix eslint warnings 2019-10-24 15:15:33 -04:00
taehoon
1504b272d2 reset font-size to normal text size using rem 2019-10-24 15:15:33 -04:00
taehoon
0f65280e20 use top placement by default 2019-10-24 15:15:33 -04:00
taehoon
72fe385ec4 hide status preview popper when hover popper content 2019-10-24 15:15:33 -04:00
taehoon
498d7bcb5e use better name 2019-10-24 15:15:33 -04:00
taehoon
5d6fcb3bb3 css cleanup 2019-10-24 15:15:33 -04:00
taehoon
a26ec64b3b fix minor css issues in status preview 2019-10-24 15:15:33 -04:00
taehoon
565d53812b reposition popper after fetching status 2019-10-24 15:15:33 -04:00
taehoon
5faafdb428 use popper for status preview 2019-10-24 15:15:32 -04:00
Henry Jameson
da3094eab7 fix scrolling to attachments bottom 2019-10-22 23:53:23 +03:00
taehoon
d76b83efc8 set flex-shrink and flex-basis explicitly 2019-10-22 14:47:21 -04:00
taehoon
b9c281c553 set flex amount correctly 2019-10-22 07:17:02 -04:00
taehoon
ad04522206 update flex-grow calculation logic 2019-10-22 07:17:02 -04:00
taehoon
0396c6f29d keep image natural ratio in gallery row 2019-10-22 07:17:02 -04:00
taehoon
6c4d23714a populate gallery row height without getting width 2019-10-22 07:17:01 -04:00
taehoon
eb695fd61d refactor using Set 2019-10-21 20:57:36 -04:00
taehoon
d3a6c030f8 clean up 2019-10-21 20:53:34 -04:00
taehoon
6084a5b6fe update event name 2019-10-21 20:52:31 -04:00
taehoon
c23a87d8ff update condition 2019-10-21 15:56:16 -04:00
taehoon
2cadeeb724 move modal animation keyframes definition 2019-10-21 15:37:14 -04:00
taehoon
c217483640 migrate viewClass prop to class attribute 2019-10-21 15:36:03 -04:00
taehoon
b3699a7c7c fix eslint errors 2019-10-18 12:39:54 -04:00
taehoon
5eeded5675 fix message input not auto-focusing bug 2019-10-18 12:24:03 -04:00
taehoon
95ad5ccaf1 revert changes to render modal into portal 2019-10-18 12:22:12 -04:00
taehoon
d69b8794b0 use higher css specificity 2019-10-18 12:13:11 -04:00
taehoon
a302ec1f08 fix eslint warnings 2019-10-18 11:57:54 -04:00
taehoon
215232cc30 remove needless ref definition 2019-10-18 11:54:42 -04:00
taehoon
a41ffea146 render modals into the “modal” portal 2019-10-18 11:53:38 -04:00
taehoon
d502baaffc remove needless console.log 2019-10-18 07:28:59 -04:00
taehoon
9709075476 remove needless importing 2019-10-18 07:28:29 -04:00
taehoon
2231025c41 fix eslint warning 2019-10-18 07:08:34 -04:00
taehoon
0df0876cf1 move modal css into the correct place 2019-10-18 07:07:16 -04:00
taehoon
348d6664eb refactor all kind of modals using the modal component 2019-10-18 07:05:01 -04:00
taehoon
07ec18fe11 add reusable modal component 2019-10-18 07:04:24 -04:00
taehoon
093d785fbf handle multiple body scroll lockers 2019-10-17 16:03:41 -04:00
taehoon
8db1fa506c lock body scroll when user reporting modal is open 2019-10-17 16:00:19 -04:00
taehoon
776f0ef774 lock body scroll when post status modal is open 2019-10-17 15:43:59 -04:00
HJ
051e6ea5ca Merge branch 'issue/684' into 'develop' 
[#684] updated FollowCard component

See merge request pleroma/pleroma-fe!972
 2019-10-17 19:03:07 +00:00
Maksim Pechnikov
b3f590ceb3 clear code 2019-10-17 20:29:18 +03:00
eal
1287836eee Fix reply arrow highlighting in some accessibility tools 
The cursor style needs to be "pointer" even before hovering, since
keyboard-driven browsing never hovers over the elements.
 2019-10-17 16:44:22 +03:00
Maksim Pechnikov
60828f119c updated FollowCard component 2019-10-17 16:19:52 +03:00
Maxim Filippov
37be781312 Require password reset 2019-10-16 10:00:26 +00:00
HJ
d2feba1487 Merge branch 'feature/following_reblogs' into 'develop' 
[#664]  implementes to hide/show reblogs from a specific user.

See merge request pleroma/pleroma-fe!956
 2019-10-15 06:26:12 +00:00
Henry Jameson
6266148745 Reserve space for emoji picker button in emoji input 2019-10-14 19:56:46 +03:00
Maksim Pechnikov
d53e7e3125 fix orders of a buttons 2019-10-11 16:54:25 +03:00
Maksim Pechnikov
b8d8d02384 revert lint autofix 2019-10-11 16:41:59 +03:00
Maksim Pechnikov
b497882e0e fix position account actions 2019-10-11 14:25:59 +03:00
HJ
8b2d873057 Merge branch 'es-translate' into 'develop' 
[i18n] spanish new strings translations

See merge request pleroma/pleroma-fe!968
 2019-10-10 17:02:34 +00:00
Henry Jameson
1400d723f2 fix picker not filling on opening, removed console log 2019-10-10 19:58:00 +03:00
Henry Jameson
c000879f2f moved emoji fetching from user to instance since it's its state anyway 2019-10-09 22:50:00 +03:00
Henry Jameson
b02de56fcb always preload first batch of emoji to avoid unnecessary UI jumps 2019-10-09 22:33:15 +03:00
Henry Jameson
a54c8b994e another missed thing 2019-10-09 21:32:32 +03:00
Maksim Pechnikov
69fb015e9f removed unused code 2019-10-09 16:20:51 +03:00
Maksim Pechnikov
e3f6001b3e update css 2019-10-09 15:36:26 +03:00
Maksim Pechnikov
a65b328239 remove unused code 2019-10-09 08:30:48 +03:00
Maksim Pechnikov
f6c0e06884 Merge branch 'develop' into feature/following_reblogs 2019-10-09 08:15:37 +03:00
Henry Jameson
792eaf5625 fix! i noticed it!! 2019-10-08 23:57:58 +03:00
Henry Jameson
fa4e69ec8c eslint 2019-10-08 21:38:27 +03:00
Henry Jameson
81d86a39fe fixed emoji picker showing up beyond viewport 2019-10-08 21:38:27 +03:00
Henry Jameson
bed109ae46 start loading emoji when picker is open 2019-10-08 21:38:27 +03:00
Henry Jameson
37b8490c01 remove the "textbox grows the 'wrong' way" behavior, replace it with more 
conditions to scroll to bottom
 2019-10-08 21:38:27 +03:00
Henry Jameson
6511a744a2 arbitrary limit with option to overcome it 2019-10-08 21:38:27 +03:00
Henry Jameson
29e6e62e7c emoji picker gradual render 2019-10-08 21:38:27 +03:00
Henry Jameson
91ca1db778 moved emoji stuff away from after-store and into users module since we only need 
emoji after login
 2019-10-08 21:38:27 +03:00
Maksim Pechnikov
7fede8572d change icon 2019-10-08 17:32:58 +03:00
Maksim Pechnikov
78e8a49f40 fix follow request on search page 2019-10-08 17:07:01 +03:00
Maksim Pechnikov
541a71c3a5 Merge branch 'develop' into feature/following_reblogs 2019-10-08 16:49:03 +03:00
Maksim Pechnikov
a26d550137 updated user_card 2019-10-08 16:46:54 +03:00
Maksim Pechnikov
9c305c5f93 Revert "added acccount_actions component" 
This reverts commit 188b6f56ed.
 2019-10-08 10:21:40 +03:00
tarteka
16c03995cb [i18n] spanish new strings translations 
update to translate the latest text strings
 2019-10-07 21:21:16 +02:00
Henry Jameson
d0800d0bd8 removed unused thing 2019-10-07 20:44:03 +03:00
Henry Jameson
e7532464e3 Replaced most trivial checkboxes with Checkbox component 2019-10-07 20:43:23 +03:00
Echedey López Romero
97f9628bea Little fix to "login"/"description" and "register" strings to es.json referenced as verbs. 2019-10-07 12:34:38 +00:00
tarteka
67436ed144 update and fix 2019-10-07 10:22:17 +02:00
Henry Jameson
8ee50f9f16 replace checkboxes in user-settings with Checkbox component 2019-10-07 00:05:21 +03:00
Henry Jameson
0be86304d2 Fix tests, more replacing with mergedConfig 2019-10-06 23:28:30 +03:00
taehoon
33759e4153 update admin url 2019-10-02 13:28:16 -04:00
taehoon
7e5a3fa09f update copy 2019-10-01 07:36:42 -04:00
taehoon
503f086487 add trailing slash to admin url 2019-10-01 07:36:42 -04:00
taehoon
d9b01643e2 open in a new tab 2019-10-01 07:36:42 -04:00
taehoon
093fcee902 add admin link to the side drawer 2019-10-01 07:36:41 -04:00
taehoon
4f75ad9905 add admin link to nav 2019-10-01 07:36:41 -04:00
kaniini
f3fdc92f15 Merge branch 'fix-regex-normalizer' into 'develop' 
fix regex shortcode problem

Closes #675

See merge request pleroma/pleroma-fe!963
 2019-10-01 06:29:31 +00:00
Henry Jameson
a2923570c3 fix regex shortcode problem 2019-09-30 23:45:03 +03:00
Maksim Pechnikov
188b6f56ed added acccount_actions component 2019-09-30 20:36:14 +03:00
Hakaba Hitoyo
194979783e i18n/Update Pedantic Japanese Messages 2019-09-30 05:09:05 +00:00
Hakaba Hitoyo
087a5b612d i18n/Update Japanese Messages 2019-09-30 05:07:57 +00:00
Henry Jameson
20fc259350 fixed default values for multi-choice configurations, should also fix warnings 2019-09-30 00:04:43 +03:00
Henry Jameson
39b71e5dd6 Removed all whole mess of manual watch/data declaration, now fully automatic 2019-09-29 23:47:26 +03:00
Henry Jameson
979e170bd6 created mergedConfig getter to avoid obnoxious checks for undefined everywhere 2019-09-29 22:33:15 +03:00
taehoon
50d9ed0007 reset post status form only when reply user is changed 2019-09-28 16:35:39 -04:00
Hakaba Hitoyo
bc17839e52 Small refactoring in who to follow page 2019-09-26 22:32:39 +00:00
Hakaba Hitoyo
194dd88118 Feature/Add _Allow user discovery services_ preference 2019-09-26 22:31:28 +00:00
kaniini
4369ce6f1b Merge branch 'hide-followers-follows-count' into 'develop' 
Added a setting to hide follow/follower count from the user profile

See merge request pleroma/pleroma-fe!951
 2019-09-26 22:20:01 +00:00
Maksim Pechnikov
19cb98b85f Merge branch 'develop' into feature/following_reblogs 2019-09-26 21:14:31 +03:00
Henry Jameson
a3305799c7 Merge remote-tracking branch 'upstream/develop' into emoji-selector-update 
* upstream/develop: (42 commits)
  Fix formatting in oc.json
  avoid using global class
  fix logo moving bug when lightbox is open
  Reserve scrollbar gap when body scroll is locked
  setting display: initial makes trouble, instead, toggle display: none using classname
  lock body scroll
  add body-scroll-lock directive
  install body-scroll-lock
  wire up props with PostStatusModal
  rename component
  recover autofocusing behavior
  refactor MobilePostStatusModal using new PostStatusModal
  add new module and modal to post new status
  remove needless condition
  add mention button
  wire up user state with global store
  collapse fav/repeat notifications from muted users
  do not collapse thread muted posts in conversation
  detect thread-muted posts
  do not change word based muting logic
  ...
 2019-09-25 20:26:49 +03:00
Henry Jameson
2f26e8acc5 eslint 2019-09-25 20:23:55 +03:00
Henry Jameson
e6d2cf77af fix emoji inputs in user-settings, styles update 2019-09-25 20:11:06 +03:00
Henry Jameson
0b300e1708 bump z-index so that picker/suggest doesn't get overlapped by mobile button 2019-09-25 20:01:06 +03:00
Henry Jameson
e805303d3a Scroll emoji picker into view if it's obstructed 2019-09-25 19:58:15 +03:00
Henry Jameson
e3ceae0989 very important fix 2019-09-25 19:32:30 +03:00
Henry Jameson
0d6a9f5a62 comment, cleanup and improve autoresize/autoscroll 2019-09-25 19:30:55 +03:00
Shpuld Shpuldson
e55645aec1 Fix formatting in oc.json 2019-09-25 10:25:44 +03:00
Shpuld Shpludson
170372b2bc Merge branch '616' into 'develop' 
Lock body scroll when lightbox is open

Closes #616

See merge request pleroma/pleroma-fe!886
 2019-09-25 07:16:23 +00:00
Shpuld Shpludson
49ea63ddf3 Merge branch 'develop' into 'develop' 
[i18n] Update for the Occitan language file

See merge request pleroma/pleroma-fe!901
 2019-09-25 07:12:34 +00:00
Shpuld Shpludson
7a1081aa66 Merge branch 'es-translate' into 'develop' 
[i18n] Update es translate

See merge request pleroma/pleroma-fe!944
 2019-09-25 07:10:11 +00:00
Shpuld Shpludson
4c55e0d1be Merge branch 'eu-translate' into 'develop' 
[i18n] update eu translate

See merge request pleroma/pleroma-fe!943
 2019-09-25 07:09:57 +00:00
Shpuld Shpludson
ccba92a27c Merge branch '639-2' into 'develop' 
Add "Mention user" button to user card

Closes #639

See merge request pleroma/pleroma-fe!955
 2019-09-25 06:41:26 +00:00
Henry Jameson
0f55359b49 fix 2019-09-25 08:43:02 +03:00
Henry Jameson
4f563e6efb account for parent padding, too 2019-09-25 08:36:30 +03:00
Henry Jameson
daa0e284c3 forgotten file 2019-09-25 00:21:55 +03:00
Henry Jameson
ca92e29401 WIP: fixed autoscroll, restructured Post Status Form's resize method "a bit" 2019-09-25 00:17:04 +03:00
Henry Jameson
2154152d08 fix some bugs 2019-09-24 00:06:53 +03:00
Henry Jameson
6f0257cd7d autoscroll post form on typing + some minor improvements 2019-09-23 22:12:25 +03:00
Henry Jameson
7b4cb38734 split spam mode into two separate options (one in settings page) 2019-09-23 20:36:49 +03:00
eugenijm
aafb29c589 Added a setting to hide follow/follower count from the user profile 2019-09-23 16:19:21 +03:00
Maksim Pechnikov
f0b9f5d29c use repeats intead boosts 2019-09-22 14:45:42 +03:00
Maksim Pechnikov
8721fb57fc added support hide\show reblogs from a specific user 2019-09-21 16:24:47 +03:00
taehoon
7fe6ba2401 avoid using global class 2019-09-20 11:35:47 -04:00
taehoon
37ae0fd92c fix logo moving bug when lightbox is open 2019-09-20 11:35:47 -04:00
taehoon
92be5a6877 Reserve scrollbar gap when body scroll is locked 2019-09-20 11:35:47 -04:00
taehoon
ae70439447 setting display: initial makes trouble, instead, toggle display: none using classname 2019-09-20 11:35:47 -04:00
taehoon
ad504768fe lock body scroll 2019-09-20 11:35:47 -04:00
taehoon
8b321f6f1f add body-scroll-lock directive 2019-09-20 11:35:47 -04:00
taehoon
c8a18f387c wire up props with PostStatusModal 2019-09-20 11:29:31 -04:00
taehoon
d6a941a128 rename component 2019-09-20 11:29:29 -04:00
taehoon
0c8038d4f6 recover autofocusing behavior 2019-09-20 11:29:27 -04:00
taehoon
a9f33272a8 refactor MobilePostStatusModal using new PostStatusModal 2019-09-20 11:29:26 -04:00
taehoon
f4bbf1d4e2 add new module and modal to post new status 2019-09-20 11:29:24 -04:00
taehoon
90981dcce6 remove needless condition 2019-09-20 11:29:23 -04:00
taehoon
5ff899b455 add mention button 2019-09-20 11:29:21 -04:00
taehoon
f8139e369c wire up user state with global store 2019-09-20 11:25:00 -04:00
taehoon
8618857aa3 collapse fav/repeat notifications from muted users 2019-09-20 11:25:00 -04:00
rinpatch
1306fac38f Merge branch 'develop' into 'muting-fixes' 
# Conflicts:
#   src/components/status/status.js
 2019-09-16 11:38:37 +00:00
HJ
3cd23ae2d4 Apply suggestion to src/components/emoji_input/emoji_input.js 2019-09-16 07:23:56 +00:00
Henry Jameson
312e2aa14f fix bottom-left icons being too damn wide 2019-09-15 12:51:39 +03:00
Henry Jameson
a1ed1b9b53 improved post form's icons at bottom display 2019-09-15 12:30:07 +03:00
Henry Jameson
e366adbb6c updated logic for padding with spaces, improved spam mode 2019-09-15 12:30:02 +03:00
Henry Jameson
d2fe797821 update status/user card to use same gradient mask fading effect instead of 
background hack
 2019-09-15 02:14:40 +03:00
Henry Jameson
f0cb6fe03f Fixed scrollability not being obvious, added fade effect 2019-09-15 01:16:54 +03:00
taehoon
baebf08d20 do not collapse thread muted posts in conversation 2019-09-13 22:59:45 -04:00
taehoon
6a3f283256 detect thread-muted posts 2019-09-13 22:59:24 -04:00
taehoon
2f79a7b4a0 do not change word based muting logic 2019-09-13 16:55:17 -04:00
taehoon
b10558f721 do not collapse muted user's posts on muted user's media timeline 2019-09-13 16:17:51 -04:00
taehoon
09deb69bc7 do not collapse muted user's posts on muted user's profile page 2019-09-13 15:38:04 -04:00
Shpuld Shpludson
09db4ceb1a Merge branch 'fix/italics-not-selectable' into 'develop' 
fix italics not being selectable

See merge request pleroma/pleroma-fe!952
 2019-09-13 17:21:15 +00:00
Shpuld Shpuldson
794481d76c fix italics not being selectable 2019-09-13 20:16:05 +03:00
Henry Jameson
3505e53756 review/naming + bugfix for stickers 2019-09-12 20:36:43 +03:00
Henry Jameson
9bd0ed7912 updated logic for hiding picker and also added ability to hide suggestions with 
esc key
 2019-09-12 20:25:11 +03:00
Henry Jameson
0d8b68632b Remove emoji zoom 2019-09-12 20:25:11 +03:00
Shpuld Shpludson
4a469d7fe3 Merge branch 'fix/follow-request-detection' into 'develop' 
Utilize `user.requested` to display follow request status on user card

Closes #635

See merge request pleroma/pleroma-fe!942
 2019-09-12 07:02:11 +00:00
davidyin
a8cddecd41 fix some translation about blocks 2019-09-11 22:37:19 -07:00
davidyin
d0fc509ad1 Complete the Chinese language file based on the version 0.9.999 2019-09-10 19:50:06 -07:00
HJ
4f0195b05c Apply suggestion to src/components/emoji_picker/emoji_picker.vue 2019-09-10 18:39:45 +00:00
tarteka
6217ef4718 fix some translates 2019-09-10 10:09:07 +02:00
Shpuld Shpludson
753d15ed37 Merge branch '651' into 'develop' 
Fix "Needless context api requests when click timeago in conversation page"

Closes #651

See merge request pleroma/pleroma-fe!934
 2019-09-09 19:47:58 +00:00
HJ
9651293956 Apply suggestion to src/components/emoji_picker/emoji_picker.js 2019-09-09 19:42:33 +00:00
Henry Jameson
9146bee7aa better hitbox for status emoji 2019-09-08 21:18:52 +03:00
Henry Jameson
7360a4d9ef fix aspect 2019-09-08 17:11:45 +03:00
HJ
2237da0151 Apply suggestion to src/components/emoji_input/emoji_input.js 2019-09-08 14:08:39 +00:00
Henry Jameson
4f88bb4ea1 scale emoji on hover 2019-09-08 17:01:28 +03:00
Henry Jameson
83f45167b6 added emoji zoom for picker 2019-09-08 16:56:54 +03:00
Henry Jameson
94afc5ee19 fixed scroll when switching back to emoji 2019-09-08 15:57:49 +03:00
Henry Jameson
14df84d89b fixed some bugs, added spam mode, minor collateral fixes 2019-09-08 15:51:17 +03:00
Henry Jameson
db086fe1fd Merge remote-tracking branch 'upstream/develop' into emoji-selector-update 
* upstream/develop: (116 commits)
  Password reset page
  add a comment
  force img updating immediately
  Fixed "sequimiento" to "seguimiento".
  Replace `/api/externalprofile/show.json` with a MastoAPI equialent
  Use mastodon api in follow requests
  "Optional" in lowercase.
  Update es.json
  fix pin/unpin status logic
  rename a mutation
  update
  fix user avatar fallback logic
  remove dead code
  Corrected "Media Proxy" translation.
  Update es.json
  make bio textarea resizable vertically only
  remove dead code
  Make image orientation consistent on FF, fix videos w/ modal
  remove dead code
  fix crazy watch logic in conversation
  ...
 2019-09-08 13:44:29 +03:00
tarteka
5026d3719a fix some translates 2019-09-07 09:07:34 +02:00
tarteka
17a97ee6f5 fix some translates 2019-09-07 09:00:25 +02:00
taehoon
ea5b36a597 refactor toggling body visibility using class 2019-09-06 11:17:29 -04:00
taehoon
9727009147 update prop name 2019-09-06 11:17:05 -04:00
taehoon
482cd52f77 stop fetching whole conversation when change highlighted status 2019-09-06 11:17:04 -04:00
taehoon
c1f3b0dc75 refactoring 2019-09-06 11:17:04 -04:00
taehoon
214ab22c4c update prop binding 2019-09-06 11:17:04 -04:00
taehoon
d7c68d408f accept status id instead of status obj as statusoid prop 2019-09-06 11:17:04 -04:00
tarteka
1167bafb19 Update es translate 2019-09-06 14:58:20 +02:00
tarteka
f48d12b4bc update eu translate 2019-09-06 14:24:37 +02:00
Shpuld Shpludson
e75ac9ddbc Merge branch 'mastoapi-externalprofile' into 'develop' 
Replace `/api/externalprofile/show.json` with a MastoAPI equialent

See merge request pleroma/pleroma-fe!938
 2019-09-06 04:13:21 +00:00
Eugenij
8ee5abb1a5 Password reset page 2019-09-05 11:23:28 +00:00
rinpatch
424d4ab57e Utilize user.requested to display follow request status on user card 
Closes #635
 2019-09-05 11:17:53 +03:00
rinpatch
b33667a743 Avoid iterating over statuses to set thread_muted if the backend does 
not support the extension
 2019-09-04 22:17:29 +03:00
rinpatch
1a5a7bbebf Set thread_muted for all statuses with the same conversation id on 
status mute/unmute
 2019-09-04 21:11:13 +03:00
taehoon
d194431642 add a comment 2019-09-04 11:24:24 -04:00
taehoon
cdbb8ca8b9 force img updating immediately 2019-09-04 11:24:24 -04:00
rinpatch
66a34b7ecf Properly detect thread-muted posts and set with_muted when fetching 
notifications
 2019-09-04 12:20:33 +03:00
Echedey López Romero
d1244e4896 Fixed "sequimiento" to "seguimiento". 2019-09-03 17:51:50 +00:00
rinpatch
457290e81e Replace /api/externalprofile/show.json with a MastoAPI equialent 
`/api/v1/accounts/:id` supports remote nicknames since pleroma!1622
 2019-09-03 19:59:28 +03:00
rinpatch
8e3d6f5c28 Use mastodon api in follow requests 2019-09-03 13:50:26 +03:00
Shpuld Shpludson
6238fe3633 Merge branch '652' into 'develop' 
Fix "TypeError: Cannot set property 'pinned' of undefined"

Closes #652

See merge request pleroma/pleroma-fe!936
 2019-09-03 04:48:24 +00:00
Shpuld Shpludson
c43a5ab992 Merge branch 'patch-1' into 'develop' 
Some corrections to the spanish translation

See merge request pleroma/pleroma-fe!929
 2019-09-03 04:11:16 +00:00
Shpuld Shpludson
fbfedf0084 Merge branch 'fix/attachment-css' into 'develop' 
Make image orientation consistent on FF, fix videos w/ modal

See merge request pleroma/pleroma-fe!926
 2019-09-03 04:09:56 +00:00
Echedey López Romero
66e9f17c58 "Optional" in lowercase. 2019-09-02 11:41:30 +00:00
Echedey López Romero
4f82ea0fea Update es.json 2019-09-01 21:57:07 +00:00
taehoon
daf7d4e661 fix pin/unpin status logic 2019-09-01 13:07:43 -04:00
taehoon
13b80b5c7c rename a mutation 2019-09-01 13:07:43 -04:00
Shpuld Shpludson
018a650166 Merge branch 'remove-dead-code' into 'develop' 
Remove dead code

See merge request pleroma/pleroma-fe!927
 2019-08-29 17:16:57 +00:00
taehoon
9476fbba5a fix user avatar fallback logic 2019-08-28 14:02:04 -04:00
taehoon
c01d2543d5 remove dead code 2019-08-28 13:06:57 -04:00
Echedey López Romero
a15810afc8 Corrected "Media Proxy" translation. 2019-08-27 19:07:07 +00:00
Echedey López Romero
50bf9e633b Update es.json 2019-08-26 21:37:39 +00:00
taehoon
e1c2c5cfed make bio textarea resizable vertically only 2019-08-26 16:00:19 -04:00
taehoon
a0712270aa remove dead code 2019-08-26 14:29:40 -04:00
Shpuld Shpuldson
15c4088a68 Make image orientation consistent on FF, fix videos w/ modal 2019-08-26 14:08:30 +03:00
taehoon
7b5cdab7cd remove dead code 2019-08-25 16:58:13 -04:00
taehoon
9b8bf655e1 fix crazy watch logic in conversation 2019-08-23 13:49:39 -04:00
taehoon
65579796ed show three dot button only if needed 2019-08-20 17:00:28 -04:00
taehoon
92a0c475f7 hide mute conversation button to guests 2019-08-20 16:55:42 -04:00
taehoon
4bedbfea3c update keyBy 2019-08-17 22:10:01 -04:00
taehoon
1146119d6a generate idObj at timeline level 2019-08-17 14:33:32 -04:00
taehoon
4b444708f2 fix pin showing logic in conversation 2019-08-17 14:33:32 -04:00
Sergey Suprunenko
d74f6ed6ea Initialize chat only if user is logged in and it wasn't initialized before 2019-08-17 08:18:42 +00:00
Shpuld Shpludson
58713e342d Merge branch 'eu-translate' into 'develop' 
add Basque translate

See merge request pleroma/pleroma-fe!900
 2019-08-17 08:16:45 +00:00
Shpuld Shpludson
84c3403143 Merge branch 'es-translate' into 'develop' 
[i18n] Spanish corrections

See merge request pleroma/pleroma-fe!904
 2019-08-17 08:15:06 +00:00
Shpuld Shpludson
aef97bc9bc Merge branch 'update-nb' into 'develop' 
Update norwegian bokmål translation

See merge request pleroma/pleroma-fe!906
 2019-08-17 08:14:47 +00:00
Hakaba Hitoyo
091fb5573c i18n/Update Japanese 2019-08-17 08:14:17 +00:00
Hakaba Hitoyo
fc68c3907d i18n/Update pedantic Japanese 2019-08-17 08:14:00 +00:00
Shpuld Shpludson
e8fad7a460 Merge branch 'telugu-translation' into 'develop' 
i18n: Translated to Telugu (44.3%)

See merge request pleroma/pleroma-fe!913
 2019-08-17 08:13:29 +00:00
taehoon
7dfcabb543 sync profile tab state with location query 2019-08-15 13:25:38 -04:00
taehoon
e8c22fbfa3 refactor TabSwitcher 2019-08-15 13:25:38 -04:00
taehoon
6e51774ccb use better name of controlled prop 2019-08-15 13:25:38 -04:00
taehoon
eafd53f994 fix potential bug to render active tab in controlled way 2019-08-15 13:25:38 -04:00
taehoon
9dd9ba0205 remove unused param 2019-08-15 13:25:38 -04:00
taehoon
df3e80b7c3 use key prop instead of dataset to identify active tab 2019-08-15 13:25:38 -04:00
taehoon
cd14566a34 remove useless index param of onSwitch 2019-08-15 13:25:38 -04:00
taehoon
539913673f reset error state when load new profile 2019-08-15 13:25:38 -04:00
taehoon
2e0603bdca clear timelines only if load user not viewed previously 2019-08-15 13:25:38 -04:00
Hakaba Hitoyo
dd340bb9e3 Fix/Fix links to external users in Who to follow page 2019-08-15 17:19:49 +00:00
taehoon
9229f28edb rel also accepts list, update rel detection logic 2019-08-13 13:11:37 -04:00
taehoon
5aa2c44487 use hashtag class detection as fallback 2019-08-12 15:22:39 -04:00
taehoon
5e99bad417 detect hashtag using rel instead of class 2019-08-12 14:48:11 -04:00
taehoon
0bce615fe8 hide ISP if the panel content is empty 2019-08-12 14:29:11 -04:00
taehoon
a71d14704f fix user card overflow bug 2019-08-12 13:59:39 -04:00
Henry Jameson
5851f97eb0 fixed a lot of bugs with emoji picker, improved relevant components 2019-08-12 20:03:48 +03:00
Henry Jameson
579b5c9e77 initial attempts at making emoji-picker somewhat extensible 2019-08-12 14:20:08 +03:00
Henry Jameson
036882d27c rename for consistency 2019-08-12 13:51:05 +03:00
shpuld
f1bdbeabf0 fix js error on mute 2019-08-10 15:53:46 +03:00
Joseph Nuthalpati
5e0b4e06ec
i18n: Translated to Telugu (44.3%) 
Verified that the translation strings work by running Pleroma-FE locally.

Signed-off-by: Joseph Nuthalapati <njoseph@riseup.net>
 2019-08-10 16:50:59 +05:30
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
Exilat
39106dc545 Update oc.json 2019-08-03 14:04:49 +00:00
Exilat
920bd05081 Update for Interactions, new search, sticker picker, update copy. 2019-08-03 13:55:05 +00: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
Henry Jameson
fd66afe1e5 linting 2019-07-29 00:10:43 +03:00
Henry Jameson
03c2f29b0a cleanup and appropriation for new emoji-input component API, styles updates 2019-07-28 16:07:01 +03:00
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
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
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
taehoon
bba4b57dd8 preserve formatting of content 2019-07-05 21:57:48 -04:00
taehoon
66842efd81 update regex for commit hash 2019-07-05 11:11:31 -04:00
Shpuld Shpludson
60b413d02c Merge branch '602' into 'develop' 
Fix mixed profiles bug on user profile page

Closes #586

See merge request pleroma/pleroma-fe!865
 2019-07-05 13:28:15 +00:00
Shpuld Shpludson
7ec02445cc Merge branch 'develop' into 'develop' 
[i18n] Update of the Occitan translation

See merge request pleroma/pleroma-fe!866
 2019-07-05 13:22:49 +00:00
Shpuld Shpludson
4f0ba97be9 Merge branch '603' into 'develop' 
Hide text format when only plaintext is available

Closes #603

See merge request pleroma/pleroma-fe!867
 2019-07-05 13:22:04 +00:00
Henry Jameson
8d6750d9c2 eslint --fix --ext .js,.vue src 2019-07-05 10:17:44 +03:00
Henry Jameson
2c2b84d31d npm eslint --fix . 2019-07-05 10:02:14 +03:00
HJ
6bea363b9d Merge branch 'fix-android-emoji-autocompletion' into 'develop' 
Fix android emoji autocompletion

Closes #606

See merge request pleroma/pleroma-fe!869
 2019-07-04 18:55:13 +00:00
Henry Jameson
f86f4b514f Support compositionupdate event to properly show autocomplete popup for IMEs and 
android
 2019-07-03 23:08:51 +03:00
taehoon
6c6aa8446d place scope selector on the left consistently 2019-07-03 12:19:25 -04:00
taehoon
0c102deeed hide text format when only plaintext is available 2019-07-02 16:36:14 -04:00
taehoon
b70c2bfef7 make sure that user timelines are empty when opening profile page 2019-07-02 14:43:01 -04:00
taehoon
0e9b8be88c clear userId property of timeline by default in clearTimeline action 2019-07-02 14:32:46 -04:00
Egor Kislitsyn
52319acf58 Revoke oAuth token 2019-07-02 15:33:40 +07:00
Exilat
fe500c44ed Update oc.json 2019-06-30 14:24:34 +00:00
Henry Jameson
82464b3a7e review 2019-06-26 00:34:09 +03:00
Henry Jameson
9dbafa4c78 lint fix 2019-06-25 21:39:33 +03:00
Henry Jameson
01bda605a7 fix all known problems with clicks on autocomplete emojis 2019-06-25 21:31:43 +03:00
Shpuld Shpludson
b059deb551 fix specificity that made attachments misalign 2019-06-25 16:30:21 +00:00
HJ
8d33832fe1 Merge branch 'clearer-user-profile-tabs' into 'develop' 
Clearer user profile tabs when status is empty

See merge request pleroma/pleroma-fe!847
 2019-06-25 06:32:08 +00:00
Wyatt Benno
f2d84ef233 Keep statuses always enabled 2019-06-25 10:27:41 +09:00
HJ
bb8e2b1933 Merge branch 'timeline-skip-fix' into 'develop' 
timeline-skip-fix

See merge request pleroma/pleroma-fe!850
 2019-06-24 22:08:09 +00:00
taehoon
1c03bd0ebc add resolve param to user search api request 2019-06-24 07:49:22 -04:00
Wyatt Benno
7a5d06a6cf change isPinned to noIdUpdate 2019-06-24 12:01:13 +09:00
Shpuld Shpludson
947f69a953 Fix: problems with polls state 2019-06-22 14:01:36 +00:00
Shpuld Shpludson
30a340955e Move character counter into the input box 2019-06-22 13:41:02 +00:00
Wyatt Benno
a1c50c3fc1 fix for #553 2019-06-21 10:31:00 +09:00
Wyatt Benno
308c4c9789 Make scss change for tab switcher only 2019-06-21 08:35:02 +09:00
taehoon
bd377148ad delete state.token instead of setting false 2019-06-20 11:48:31 -04:00
taehoon
8a32731e4d use clientSecret in login flow 2019-06-20 11:48:30 -04:00
taehoon
c23228f196 fix error breaking logout flow 2019-06-20 11:48:30 -04:00
taehoon
268e9ce504 make sure to clear old token when logout 2019-06-20 11:48:29 -04:00
Shpuld Shpludson
e5e9bb27f3 Move poll state handling to its own module 2019-06-20 13:02:04 +00:00
Shpuld Shpludson
44a03922e6 Fix/messed up long polls 2019-06-20 13:00:10 +00:00
Wyatt Benno
066efd5b3c A small sass fix for #577 2019-06-20 16:15:49 +09:00
taehoon
90fda1f245 reset margin property of form controls 2019-06-19 07:55:54 -04:00
HJ
c4fcdc7125 Merge branch 'mr-origin-740' into 'develop' 
Update french translation

See merge request pleroma/pleroma-fe!829
 2019-06-18 20:39:59 +00:00
lain
0eed2ccca8 Feature/polls attempt 2 2019-06-18 20:28:31 +00:00
Dashie
57dbfc269c
Update translation with review comments 2019-06-18 22:14:02 +02:00
Dashie
64d7dd60cc
Update file with current en.json 2019-06-18 21:22:22 +02:00
Satak
3fcc4ba288
Update fr.json 
added missing ,
 2019-06-18 21:22:21 +02:00
Satak
ceffe72f6f
Update fr.json 
stoped at line 134, more to do below
 2019-06-18 21:22:15 +02:00
HJ
69eff65130 Merge branch 'refactor-emoji-input' into 'develop' 
EmojiInput refactoring

Closes #565

See merge request pleroma/pleroma-fe!824
 2019-06-18 19:17:37 +00:00
Henry Jameson
46e0122067 review 2019-06-18 22:13:03 +03:00
Henry Jameson
0032802f0a review 2019-06-18 21:30:35 +03:00
HJ
e5020d6936 Update emoji-input.js 2019-06-18 17:49:43 +00:00
Shpuld Shpludson
c0c012ccf9 Merge branch 'fix-user-search' into 'develop' 
fix user search

See merge request pleroma/pleroma-fe!839
 2019-06-18 16:32:11 +00:00
HJ
3cd4201ce4 Merge branch '573' into 'develop' 
Apply font smoothing in webkit and firefox

Closes #573

See merge request pleroma/pleroma-fe!841
 2019-06-18 16:31:33 +00:00
Shpuld Shpludson
76efbcbe92 Misc fixes: Fix uploads stretching on chrome, fix warnings in console 2019-06-18 16:31:20 +00:00
taehoon
2b5ac611c9 apply font smoothing in webkit and firefox 2019-06-17 23:34:20 -04:00
Henry Jameson
de03eda9f3 fix user search 2019-06-17 23:39:30 +03:00
HJ
ac46de3972 Merge branch 'mastoapi-login-and-config-fixes' into 'develop' 
Mastoapi login and config fixes

See merge request pleroma/pleroma-fe!833
 2019-06-17 20:17:58 +00:00
HJ
22a3351208 Apply suggestion to src/services/backend_interactor_service/backend_interactor_service.js 2019-06-17 20:12:11 +00:00
Henry Jameson
5f4a8dcc05 properly position the caret after replacement 2019-06-17 21:24:10 +03:00
HJ
8caf13bbce Apply suggestion to src/services/api/api.service.js 2019-06-17 08:20:02 +00:00
Henry Jameson
06c84a9cf3 fix MFA crashing on user-settings page 2019-06-16 20:36:21 +03:00
Henry Jameson
6744396f82 getting and setting user background via MastoAPI 2019-06-16 20:17:59 +03:00
Henry Jameson
e3638af031 Removed formattingOptionsEnabled in favor of relying on BE-provided list of 
accepted formatting options
 2019-06-16 20:16:52 +03:00
HJ
1db3c785d8 Merge branch 'masto-register-app-secret' into 'develop' 
Proper clientId/secret/token caching, MastoAPI registration

Closes #554

See merge request pleroma/pleroma-fe!806
 2019-06-16 11:18:21 +00:00
taehoon
de2504ad6c fix typo 2019-06-13 15:00:13 -04:00
Henry Jameson
acbeea59ff rename mutations according to actual property names 2019-06-13 10:11:17 +03:00
Henry Jameson
f9c3aabea4 Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret 
* upstream/develop:
  fix user banner
 2019-06-13 10:05:53 +03:00
Henry Jameson
0988065f50 fix 2019-06-13 10:05:22 +03:00
Henry Jameson
dba8d8910c fix 2019-06-13 10:00:06 +03:00
Henry Jameson
d551b39859 fix logged out post-update 2019-06-13 09:48:43 +03:00
Henry Jameson
d1fd3e3a1c fix user banner 2019-06-13 01:48:41 +03:00
Henry Jameson
edb24da016 fix 2019-06-13 01:02:08 +03:00
Henry Jameson
c8a57ad32e Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret 
* upstream/develop:
  Revert "add TOTP/Recovery Form for mobile version"
 2019-06-13 00:51:14 +03:00
Henry Jameson
1e94aecbc9 AMERICA 2019-06-13 00:47:06 +03:00
Henry Jameson
6cd4546873 comments 2019-06-13 00:44:25 +03:00
Henry Jameson
af75c6d1ea No longer sending extra data, renamed some properties 2019-06-13 00:39:51 +03:00
Henry Jameson
77511a5338 Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret 
* upstream/develop:
  Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js
  i18n/Update Japanese translation
  render modal at the root level using portal
  install portal vue
  Small improve of the who to follow panel layout
  Fix/Small fix in the who to follow page
  remove console spam
  i18n
  wire up user.description with masto api data
  i18n/Add Japanese with kanji (2)
  move drowdown menu to popper
  notification controls: redesign entirely
  entity normalizer: collapse data.pleroma if blocks
  wire up notification settings
  do not miss statusnet_profile_url of mentions
  Translation to Hebrew of everything other than theme_helpers and style.
  Translate up to settings.
  mastoapi login works
 2019-06-13 00:07:28 +03:00
Maksim
77eceedbf7 Revert "add TOTP/Recovery Form for mobile version" 
This reverts commit a3811f944819430c278b6da6b08dc322a9b9ff65.
 2019-06-12 20:16:55 +00:00
HJ
9df99c5205 Merge branch 'masto-login-fixes' into 'develop' 
MastoAPI login

See merge request pleroma/pleroma-fe!805
 2019-06-12 19:42:25 +00:00
HJ
a7b0b07e6f Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js 2019-06-12 11:44:14 +00:00
Henry Jameson
a05fd042df fix small annoyance 2019-06-12 10:56:08 +03:00
Henry Jameson
0535d2c14c fixed some bugs i found, also cleaned up some stuff + documentation 2019-06-11 21:18:09 +03:00
Hakaba Hitoyo
322c9fbfb6 i18n/Update Japanese translation 2019-06-11 12:10:47 +00:00
Henry Jameson
41eeaf35d9 self-review 2019-06-10 18:57:53 +03:00
Henry Jameson
e536a56250 Linting 2019-06-09 22:40:38 +03:00
Henry Jameson
4d12cd617a fix textarea not resizing properly 2019-06-09 21:23:56 +03:00
Henry Jameson
8a02647de4 more bugfixes related to keybinds and nonworking stuff 2019-06-09 21:17:24 +03:00
Henry Jameson
20923d590c Some comments, added sorting for emojis 2019-06-09 20:41:12 +03:00
Henry Jameson
76b9a66e98 fixed several bugs 2019-06-09 20:40:46 +03:00
Henry Jameson
a3cc8cc5d8 sorting 2019-06-08 17:15:48 +03:00
Henry Jameson
0a778160cc styles 2019-06-08 17:15:42 +03:00
Henry Jameson
8872b4802e standartized autocomplete panel suggesions format, fixed some bugs 2019-06-08 16:23:58 +03:00
Henry Jameson
ca3140fd3e Merge remote-tracking branch 'upstream/develop' into refactor-emoji-input 
* upstream/develop:
  Small improve of the who to follow panel layout
  Fix/Small fix in the who to follow page
 2019-06-08 14:31:49 +03:00
Henry Jameson
96f31716f9 slot-based emoji input/autocomplete component 2019-06-07 00:17:49 +03:00
taehoon
9c8af14908 render modal at the root level using portal 2019-06-06 13:37:27 -04:00
taehoon
5740123ee6 install portal vue 2019-06-06 13:37:26 -04:00
Hakaba Hitoyo
5b274364ce Small improve of the who to follow panel layout 2019-06-05 17:43:35 +00:00
Hakaba Hitoyo
809d872b2d Fix/Small fix in the who to follow page 2019-06-04 08:04:47 +00:00
shpuld
4526939dae remove console spam 2019-06-01 12:10:00 +03:00
kaniini
b4796ccbf6 Merge branch 'feature/notification-controls' into 'develop' 
wire up notification settings

See merge request pleroma/pleroma-fe!809
 2019-06-01 05:16:15 +00:00
Mark Felder
f67f14495b i18n 2019-05-31 10:13:06 -05:00
Shpuld Shpludson
50618b81c8 Merge branch '543' into 'develop' 
Fix "stale user settings shown after save"

Closes #543

See merge request pleroma/pleroma-fe!813
 2019-05-29 17:08:27 +00:00
Shpuld Shpludson
6045708a5d Merge branch 'fix-dropdown' into 'develop' 
move drowdown menu to popper

Closes #559

See merge request pleroma/pleroma-fe!814
 2019-05-29 16:55:28 +00:00
taehoon
0532995847 wire up user.description with masto api data 2019-05-29 12:32:14 -04:00
Hakaba Hitoyo
443794b000 i18n/Add Japanese with kanji (2) 2019-05-29 05:31:03 +00:00
Henry Jameson
6c7eeb93fe move drowdown menu to popper 2019-05-27 00:13:08 +03:00
William Pitcock
855566f887 notification controls: redesign entirely 2019-05-25 23:44:36 +00:00
William Pitcock
ac97cd3e46 entity normalizer: collapse data.pleroma if blocks 2019-05-25 22:59:04 +00:00
William Pitcock
28ca504576 wire up notification settings 2019-05-25 07:34:59 +00:00
taehoon
2af35b8404 do not miss statusnet_profile_url of mentions 2019-05-22 23:47:20 -04:00
j1t
4249a2fd6f Translation to Hebrew of everything other than theme_helpers and style. 2019-05-22 21:33:05 +03:00
Henry Jameson
e7a2a7267d Proper clientId/secret/token caching, MastoAPI registration 2019-05-22 19:13:41 +03:00
j1t
3b3e4ffc54 Translate up to settings. 2019-05-22 01:46:08 +03:00
Henry Jameson
fc12b63fcc mastoapi login works 2019-05-21 23:35:40 +03:00
HJ
0fc7cbfa24 Merge branch 'fetags' into 'develop' 
add tags to data and to status component

See merge request pleroma/pleroma-fe!801
 2019-05-20 21:02:29 +00:00
HJ
b78ad8998d Merge branch 'masto-remains' into 'develop' 
Interactions 2.0, removing last bits of qvitter api. Only login/register and change background remains after that

See merge request pleroma/pleroma-fe!792
 2019-05-20 20:54:05 +00:00
Moonman
0f824ff311 switch from method to computed property 2019-05-20 15:23:36 -04:00
HJ
b436e0dd12 Merge branch 'webpack-4-dart-sass' into 'develop' 
Massive update for dependencies

See merge request pleroma/pleroma-fe!734
 2019-05-20 18:09:14 +00:00
Moonman
f6600a35a5 formatting 2019-05-20 00:15:58 -04:00
Moonman
fc9acf8fb6 add tags to data and to status component 2019-05-20 00:03:50 -04:00
Senko-san
229c65959e Remove auto-hyphenation 
Auto-hyphenation has terrible heuristics on all browsers, disable it.

Source: https://justmarkup.com/articles/2019-01-28-a-look-at-css-hyphenation-in-2019/
 2019-05-20 00:43:35 +01:00
taehoon
205a9821e6 make staff label visible 2019-05-19 14:28:29 -04:00
taehoon
e01ffc67c6 move visibility-tray css in local scope 2019-05-19 14:28:29 -04:00
taehoon
34ffcb028a refactor css 2019-05-19 14:28:29 -04:00
taehoon
9adbc2c17f make only screen name as link 2019-05-19 14:28:29 -04:00
taehoon
9e6a91e755 refactor css for visibility tray 2019-05-19 14:28:29 -04:00
Henry Jameson
15b3651a30 moved setting styles into common to avoid bug with shared styles 2019-05-19 20:42:44 +03:00
taehoon
07d0143bda hide three dot menu button if has no items 2019-05-19 09:16:47 -04:00
William Pitcock
00ad97fcfa entity normalizer: add tooltip text to emojis 2019-05-17 20:10:50 +00:00
taehoon
2457dd9b91 rename for consistency's sake 2019-05-16 14:02:37 -04:00
taehoon
b6731bd9af update admin api urls in accordance with new docs 2019-05-16 13:21:14 -04:00
Shpuld Shpludson
81278651d9 Line up rich text format picker with the status form 2019-05-15 19:53:33 +00:00
Henry Jameson
aa24ac7ea6 fix lint 2019-05-15 20:49:46 +03:00
Henry Jameson
7976d118ca Cleanup, little documentation, localization 2019-05-15 20:44:35 +03:00
taehoon
2ce0186327 update api service functions 2019-05-15 12:04:26 -04:00
taehoon
daba688f46 remove needless importing 2019-05-15 12:04:26 -04:00
taehoon
f68653d0dd show pinned state only in the user timeline 2019-05-15 12:04:26 -04:00
taehoon
110c9d3b26 improve performance by caching pinned status ids into user object 2019-05-15 12:04:26 -04:00
taehoon
87de130ee5 apply status normalizer 2019-05-15 12:04:26 -04:00
taehoon
2af088969a improve error handling logic 2019-05-15 12:04:26 -04:00
taehoon
12f8269f01 make sure to have rights property of user object 2019-05-15 12:04:26 -04:00
taehoon
1747cd8771 use text color instead 2019-05-15 12:04:26 -04:00
taehoon
19e79895bb revert unnecessary changes 2019-05-15 12:04:26 -04:00
taehoon
beaf512573 add translation 2019-05-15 12:04:26 -04:00
taehoon
d76bd0044f fix typo 2019-05-15 12:04:26 -04:00
taehoon
32be0e15d1 use pinned property from status directly 2019-05-15 12:04:26 -04:00
taehoon
f8186bfc74 show immediately pinned statuses 2019-05-15 12:04:26 -04:00
taehoon
a601337a20 clean up 2019-05-15 12:04:26 -04:00
taehoon
93e9bc019e clean up fetchPinnedStatuses api service 2019-05-15 12:04:26 -04:00
taehoon
8308315038 revert removeStatus changes 2019-05-15 12:04:26 -04:00
taehoon
1229622fed refactor error handling of pinStatus 2019-05-15 12:04:25 -04:00
taehoon
ce1d19136d refactor pin/unpin status logic 2019-05-15 12:04:25 -04:00
taehoon
e8abe1273b filter pinned statuses based on pinned entity instead of a separate user entity 2019-05-15 12:04:25 -04:00
taehoon
cd0a7afa06 remove pinned timeline, instead, use simple entity of user object 2019-05-15 12:04:25 -04:00
taehoon
9e22d6212a revert pinned timeline polling logic 2019-05-15 12:04:25 -04:00
dave
8095ce8f62 #468 - hide status menu after action button is clicked 2019-05-15 12:04:25 -04:00
dave
075ddc34f1 #468 - shwo pin button for valid statuses (public & unlisted) 2019-05-15 12:04:25 -04:00
dave
9fc997500e #468 - add extra buttons for status actions 2019-05-15 12:04:25 -04:00
dave
006bf1ce63 #468 - fix plus button size issue, use scss variable properly 2019-05-15 12:04:25 -04:00
dave
e6268c492e #468 - clean up 2019-05-15 12:04:25 -04:00
dave
5ab0e71500 #468 - show pin status API error 2019-05-15 12:04:24 -04:00
dave
df207593e9 #468 - update pinned status after actions(remove, add) 2019-05-15 12:04:24 -04:00
dave
f1ff48ffd6 #468 - remove unpinned status from timeline 2019-05-15 12:04:24 -04:00
dave
2c89d49a3d #468 - show pinned timeline and add pinned label to the status 2019-05-15 12:04:24 -04:00
dave
e28b19645a #468 - show pin for own statuses only 2019-05-15 12:04:24 -04:00
dave
1aa0e8d7e0 #468 - pin/unpin status 2019-05-15 12:04:24 -04:00
dave
affbe8700e #468 - integrate endpoints 2019-05-15 12:04:24 -04:00
tarteka
bacbfc1154 Update es.json 2019-05-15 09:16:49 +00:00
taehoon
5e0235fa63 make reply icon not hoverable if disabled 2019-05-14 22:45:57 -04:00
taehoon
731ad0a48b show reply button and count when logged out as well 2019-05-14 22:44:56 -04:00
Henry Jameson
543604fd2d removed unused masto api, added initial version of interactions timeline 2019-05-14 22:48:44 +03:00
Henry Jameson
04fa2aefb3 get rid of reply-left, we decided it should go long time ago 2019-05-14 19:49:03 +03:00
Henry Jameson
addeb85220 fix prod build 2019-05-13 21:54:25 +03:00
Henry Jameson
750dca4a10 Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sass 
* upstream/develop: (116 commits)
  Fix small mistake in Polish translation
  link interaction avatars to the user profile
  Use more clear explanation in the scope notice, make sure the hide button doesn't overlap with text in notice.
  use backendInteractor
  refactor api service functions using new helper
  clean up
  update favorite number earlier
  update status interaction upon retweet action response
  sync up favoritedBy with favorite/unfavorite action
  do not regenerate status object
  reduce needless calculation
  Move scope visibility notice to the status form, make it dismissible
  Revert "eliminate expandable prop in favor of inConversation"
  status attention doesn’t have relationship entities
  make it short
  fix wrong inlineExpanded
  expanded is always false, eliminate it
  eliminate expandable prop in favor of inConversation
  fix conversationId comparision bug using integer format
  Display additional scope description above the status form for mobile users.
  ...
 2019-05-13 20:38:54 +03:00
Marcin Mikołajczak
caf9e627a7 Fix small mistake in Polish translation 2019-05-10 06:52:01 +00:00
HJ
cd67b1f496 Merge branch '527' into 'develop' 
Fix "Liking/reprööting posts while post is highlighted in conversation fails to update the liked/reprööted status"

Closes #527

See merge request pleroma/pleroma-fe!787
 2019-05-09 17:17:26 +00:00
HJ
177e53cf6a Merge branch 'mobile-scope' into 'develop' 
Display additional scope description above the status form for mobile users.

Closes #505

See merge request pleroma/pleroma-fe!767
 2019-05-09 17:13:50 +00:00
taehoon
31e14cd45d link interaction avatars to the user profile 2019-05-08 12:04:33 -04:00
eugenijm
a89010843d Use more clear explanation in the scope notice, make sure the hide button doesn't overlap with text in notice. 2019-05-08 16:50:39 +03:00
taehoon
7d60ab322e use backendInteractor 2019-05-07 23:36:35 -04:00
taehoon
26131266a9 refactor api service functions using new helper 2019-05-07 23:27:22 -04:00
taehoon
a54cf47ba5 clean up 2019-05-07 23:21:19 -04:00
taehoon
28c2a700e1 update favorite number earlier 2019-05-07 23:19:46 -04:00
taehoon
ff3a7e8b5b update status interaction upon retweet action response 2019-05-07 23:17:52 -04:00
taehoon
f75e40e462 sync up favoritedBy with favorite/unfavorite action 2019-05-07 16:43:54 -04:00
taehoon
78a4ab98af do not regenerate status object 2019-05-07 16:20:24 -04:00
taehoon
9a9d66dca1 reduce needless calculation 2019-05-07 15:54:49 -04:00
HJ
157d4e601e Merge branch 'fix/floating-button' into 'develop' 
Mobile Post button fix

Closes #506

See merge request pleroma/pleroma-fe!769
 2019-05-07 18:40:49 +00:00
Shpuld Shpludson
496ccd0bb3 Merge branch 'patch-2' into 'develop' 
Update es.json

See merge request pleroma/pleroma-fe!784
 2019-05-07 17:35:28 +00:00
eugenijm
4af343374a Move scope visibility notice to the status form, make it dismissible 2019-05-07 19:13:45 +03:00
taehoon
917e82e8ee Revert "eliminate expandable prop in favor of inConversation" 
This reverts commit 1455e1f9d5.
 2019-05-06 21:36:55 -04:00
taehoon
134b1894d6 status attention doesn’t have relationship entities 2019-05-06 16:41:12 -04:00
taehoon
44a18eb838 make it short 2019-05-06 16:17:29 -04:00
taehoon
1a3799bfac fix wrong inlineExpanded 2019-05-06 16:16:43 -04:00
taehoon
3adfbc0357 expanded is always false, eliminate it 2019-05-06 15:30:36 -04:00
taehoon
1455e1f9d5 eliminate expandable prop in favor of inConversation 2019-05-06 15:29:24 -04:00
taehoon
a27a2f78ac fix conversationId comparision bug using integer format 2019-05-06 13:24:11 -04:00
eugenijm
befaa477a3 Display additional scope description above the status form for mobile users. 2019-05-06 18:10:58 +03:00
tarteka
bfd25a5c3f Update es.json 2019-05-06 08:38:24 +00:00
taehoon
489927bdc9 toggle showing new status form instead of toggle mouting 2019-05-05 23:00:45 -04:00
taehoon
bc41a7b305 make sure media modal to be above reporting modal 2019-05-05 13:48:25 -04:00
taehoon
9787d99672 update api services 2019-05-03 11:40:06 -04:00
taehoon
220a7e89d5 use native scrollbar 2019-05-03 11:40:06 -04:00
taehoon
abad528dd4 refactor using List component 2019-05-03 11:40:06 -04:00
taehoon
8561bf6612 remove transition css 2019-05-03 11:40:06 -04:00
taehoon
19a0476985 update api endpoint url 2019-05-03 11:40:06 -04:00
taehoon
ddc7c870f4 rewrite checkbox component 2019-05-03 11:40:06 -04:00
taehoon
58a420f2b3 fix panel title overflow issue in mobile 2019-05-03 11:40:06 -04:00
taehoon
0bb8247822 fix double scrollbar display bug in mobile 2019-05-03 11:40:06 -04:00
taehoon
e97f8a4728 prevent parent scroll 2019-05-03 11:40:06 -04:00
taehoon
6b1e305a18 use custom scrollbar 2019-05-03 11:40:06 -04:00
taehoon
01cc7e4480 modal style improvements 2019-05-03 11:40:06 -04:00
taehoon
2e6eab51b8 Update promisedRequest helper to support json payload 2019-05-03 11:40:06 -04:00
taehoon
f364068e10 Improve mobile layout 2019-05-03 11:40:06 -04:00
taehoon
91502a25a4 Add a css class to the checkbox indicator 2019-05-03 11:40:06 -04:00
taehoon
cf72ebb407 update copy 2019-05-03 11:40:05 -04:00
taehoon
5d0bae5569 update generic error message 2019-05-03 11:40:05 -04:00
taehoon
d115d98a1b add translations 2019-05-03 11:40:05 -04:00
taehoon
471085f0f3 add error message 2019-05-03 11:40:05 -04:00
taehoon
dfc56dfee2 reset modal state if api request is completed 2019-05-03 11:40:05 -04:00
taehoon
1b07c6ae4f add processing state and close modal after api request is completed 2019-05-03 11:40:05 -04:00
taehoon
1878e56c16 reset modal state when userId is changed 2019-05-03 11:40:05 -04:00
taehoon
02d169b92c add promisedRequest helper 2019-05-03 11:40:05 -04:00
taehoon
cea6ea42f0 add api service function 2019-05-03 11:40:05 -04:00
taehoon
2cda9010df add user reporting modal 2019-05-03 11:40:05 -04:00
Shpuld Shpludson
0438031da4 Merge branch 'develop' into 'develop' 
[i18n]Update oc.json

See merge request pleroma/pleroma-fe!777
 2019-05-03 14:57:04 +00:00
Shpuld Shpludson
513613a4b2 Merge branch 'patch-2' into 'develop' 
Update es.json

See merge request pleroma/pleroma-fe!779
 2019-05-03 14:56:45 +00:00
taehoon
6ae3c1cfcf autoload older notifications when scrolled to the bottom 2019-05-03 07:52:22 -04:00
tarteka
09253420a2 Update es.json 2019-05-03 00:22:14 +00:00
taehoon
f8ae631d8c fix notifications div scrolling issue on mobile 2019-05-02 08:21:02 -04:00
Exilat
b98bab52a9 Update oc.json 2019-05-01 16:40:40 +00:00
shpuld
c44c048356 add title and alt for avatars, fix console errors in avatarlist 2019-05-01 17:33:56 +03:00
Shpuld Shpludson
b1bd5bd08e Merge branch 'develop' into 'brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users' 
# Conflicts:
#   src/services/api/api.service.js
 2019-04-30 15:11:30 +00:00
HJ
0f7f685c5e Merge branch '437-user-profile-settings' into 'develop' 
Transition to MastoAPI: user profile settings

Closes #437

See merge request pleroma/pleroma-fe!682
 2019-04-30 06:05:52 +00:00
eugenijm
b18fea8508 Debounce floating post button autohide 2019-04-29 22:53:30 +03:00
shpuld
da08388d6a filter outside of component 2019-04-29 22:36:39 +03:00
eugenijm
ae1496cfb4 Make floating post button configurable 2019-04-29 21:32:29 +03:00
HJ
d94fdd0617 Merge branch '220-import-export-blocks-mutes' into 'develop' 
Allow import/export of blocks

See merge request pleroma/pleroma-fe!717
 2019-04-29 18:15:58 +00:00
taehoon
5b16e36828 remove & 2019-04-29 13:57:44 -04:00
taehoon
a793835566 add a comment 2019-04-29 13:53:21 -04:00
taehoon
b1f8221a0a show ellipsis for long user name and screen name 2019-04-29 13:27:10 -04:00
taehoon
3665c86d70 use default_scope parameter 2019-04-27 21:51:17 -04:00
taehoon
904a64de89 use json content type 2019-04-27 14:20:32 -04:00
taehoon
2c4af6693a clean up 2019-04-27 14:04:30 -04:00
taehoon
ab19669bf1 refactoring 2019-04-27 08:31:06 -04:00
taehoon
95bc2d727b add “export blocks” feature 2019-04-27 08:31:06 -04:00
taehoon
13abe64f87 fix wrong function binding 2019-04-27 08:31:06 -04:00
taehoon
08eaf9bd33 make reusable Exporter component 2019-04-27 08:31:06 -04:00
taehoon
0ab2f9dfa5 add “block import” feature 2019-04-27 08:31:06 -04:00
taehoon
6ea4154084 change api function name 2019-04-27 08:31:06 -04:00
taehoon
6d0e98a1c2 make Importer component reusable 2019-04-27 08:31:06 -04:00
taehoon
18bb209ace add uploading icon css 2019-04-27 08:31:06 -04:00
taehoon
903bce40c3 move formData generating logic to api.service 2019-04-27 08:31:06 -04:00
taehoon
562120ae48 split out follow’s importer as a separate component 2019-04-27 08:31:06 -04:00
taehoon
ac0b45fa14 Update avatar uploading 2019-04-27 08:30:08 -04:00
taehoon
e14720419f Switch to mastoapi for updating user profile 2019-04-27 08:30:08 -04:00
taehoon
909d11825d Switch to mastoapi for updating banner 2019-04-27 08:30:08 -04:00
taehoon
808e1ac11c Switch to mastoapi for updating avatar 
# Conflicts:
#	src/services/api/api.service.js
 2019-04-27 08:30:08 -04:00
Henry Jameson
e0247e21f6 Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sass 
* upstream/develop: (126 commits)
  entity normalizer: hook up in_reply_to_account_acct
  add BBCode strings
  fix follow button not updating bug in follow-card
  refer searched user objects from the global user rep
  set max-width of textarea in settings page
  Remove space in the timeline setting copy
  user_card.vue: Fix .emoji to apply to img
  Update oc.json
  Update oc.json
  Update oc.json
  Update oc.json
  replace pencil with wrench icon
  rebuild fontello with wrench icon added
  fetch all friends using pagination
  stop fetching user relationship when user is unauthorized
  Revert "recover border between basic-user-card using list component"
  remove extra spacing
  code readability
  fix typos
  clean up
  ...
 2019-04-27 12:26:17 +03:00
William Pitcock
f4420cbf9f entity normalizer: hook up in_reply_to_account_acct 2019-04-27 04:52:11 +00:00
William Pitcock
55823b8d67 add BBCode strings 2019-04-26 22:48:21 +00:00
Henry Jameson
2b5cf61a8f firefox 2019-04-24 21:53:51 +03:00
shpuld
8af8f719e4 fix i18n 2019-04-22 21:37:27 +03:00
shpuld
3e23b34168 fix overflow behavior 2019-04-22 21:07:29 +03:00
taehoon
445b54c553 fix follow button not updating bug in follow-card 2019-04-22 11:17:01 -04:00
taehoon
f2f3fa81d8 refer searched user objects from the global user rep 2019-04-22 11:17:01 -04:00
shpuld
d417945427 Merge branch 'develop' into brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users 2019-04-22 17:24:35 +03:00
Shpuld Shpludson
c8f967d5c0 Merge branch '500' into 'develop' 
Set max-width of textarea in settings page

Closes #500

See merge request pleroma/pleroma-fe!761
 2019-04-22 14:00:09 +00:00
Shpuld Shpludson
4b173b5182 Merge branch '487' into 'develop' 
Fix broken Follow Export

Closes #487

See merge request pleroma/pleroma-fe!762
 2019-04-22 13:59:12 +00:00
Shpuld Shpludson
ffecbc2e79 Merge branch 'develop' into 'develop' 
[i18n] Update for Occitan language

See merge request pleroma/pleroma-fe!765
 2019-04-22 13:20:13 +00:00
Shpuld Shpludson
98742979c8 Merge branch '501' into 'develop' 
Remove space in the timeline setting copy

Closes #501

See merge request pleroma/pleroma-fe!763
 2019-04-22 13:15:07 +00:00
Shpuld Shpludson
9183c9e845 Merge branch 'change-pencil-to-wrentch' into 'develop' 
Change pencil icon to wrentch

See merge request pleroma/pleroma-fe!764
 2019-04-22 13:11:14 +00:00
taehoon
f7baa6e190 set max-width of textarea in settings page 2019-04-21 14:06:32 -04:00
taehoon
aefd4551a3 Remove space in the timeline setting copy 2019-04-21 14:06:10 -04:00
Haelwenn (lanodan) Monnier
14d506154e
user_card.vue: Fix .emoji to apply to img 2019-04-20 21:12:56 +02:00
Exilat
ed9aa8df76 Update oc.json 2019-04-20 14:44:43 +00:00
Exilat
213891ac71 Update oc.json 2019-04-20 14:38:04 +00:00
Exilat
69468c7c41 Update oc.json 2019-04-20 14:35:14 +00:00
Exilat
44f18caf4d Update oc.json 2019-04-20 14:29:04 +00:00
Brenden Bice
6aee2ed63f replace pencil with wrench icon 
# Conflicts:
#	src/components/user_card/user_card.vue
 2019-04-19 13:24:35 -04:00
taehoon
3565b18712 fetch all friends using pagination 2019-04-19 00:27:06 -04:00
taehoon
992c8e1f77 stop fetching user relationship when user is unauthorized 2019-04-17 22:47:56 -04:00
taehoon
de945e5f88 Revert "recover border between basic-user-card using list component" 
This reverts commit 1d56d486f1f679e793e710969ad54cce5fdb1ebc.

# Conflicts:
#	src/components/follow_requests/follow_requests.vue
#	src/components/user_search/user_search.vue
#	src/components/who_to_follow/who_to_follow.vue
 2019-04-17 11:32:49 -04:00
taehoon
bd88a481c6 remove extra spacing 2019-04-17 11:32:49 -04:00
taehoon
e67fecff0a code readability 2019-04-17 11:32:49 -04:00
taehoon
bb38a43117 fix typos 2019-04-17 11:32:49 -04:00
taehoon
a89236f67c clean up 2019-04-17 11:32:49 -04:00
taehoon
10ecc2c816 make sure to use filtered selected keys 2019-04-17 11:32:49 -04:00
taehoon
ecff6acf2d support indeterminate checkbox state 2019-04-17 11:32:49 -04:00
taehoon
3f5e798de7 render span tag only if it has content 2019-04-17 11:32:49 -04:00
taehoon
988849116d update model and props properties 2019-04-17 11:32:49 -04:00
taehoon
8088043a0c import scss variables 2019-04-17 11:32:49 -04:00
taehoon
1144025f30 update checkbox importing path 2019-04-17 11:32:49 -04:00
taehoon
468aec0de1 rewrite checkbox component as non-functional 2019-04-17 11:32:49 -04:00
taehoon
ac9ddfb1e2 support i18n 2019-04-17 11:32:49 -04:00
taehoon
7f6bd538f3 ui improvements 2019-04-17 11:32:49 -04:00
taehoon
c81bde0c1d clean up 2019-04-17 11:32:49 -04:00
taehoon
d3cad54aa3 add bulk mute/unmute buttons and wire up to vuex 2019-04-17 11:32:49 -04:00
taehoon
13c8f10f4b wire up bulk action buttons to vuex 2019-04-17 11:32:49 -04:00
taehoon
7e74a13fcf add a comment 2019-04-17 11:32:49 -04:00
taehoon
1afef1037e show list header only if there are items 2019-04-17 11:32:49 -04:00
taehoon
ac62e47c70 pass down empty slot 2019-04-17 11:32:49 -04:00
taehoon
67919f95a6 make border of list header thicker 2019-04-17 11:32:49 -04:00
taehoon
8fa639f252 add bulk action buttons 2019-04-17 11:32:49 -04:00
taehoon
403c7bbe6c add reusable progress-button cmoponent 2019-04-17 11:32:49 -04:00
taehoon
fe7766bc61 replace scope attributes by slot-scope 2019-04-17 11:32:49 -04:00
taehoon
d4e43e0e26 add border-bottom to the header 2019-04-17 11:32:49 -04:00
taehoon
7a8ffcd79b support header slot 2019-04-17 11:32:49 -04:00
taehoon
cf2c411db3 add header to selectable-list component 2019-04-17 11:32:49 -04:00
taehoon
83faa96f1b remove border-bottom of the last list item 2019-04-17 11:32:49 -04:00
taehoon
ca26776b4e recover border between basic-user-card using list component 2019-04-17 11:32:49 -04:00
taehoon
f066ccd28b show empty slot only if it has content 2019-04-17 11:32:49 -04:00
taehoon
b8ec13c8fd let not selectable-list know about getKey prop 2019-04-17 11:32:49 -04:00
taehoon
32035217b8 clean up 2019-04-17 11:32:49 -04:00