Commit graph

3132 commits

Author SHA1 Message Date
lain
b399235848 Revert "Merge branch 'oauth-extra-scopes' into 'develop'"
This reverts merge request !1024
2019-12-12 09:38:24 +00:00
taehoon
d0c78989aa hide instance url/link/text in header using hideSitename option 2019-12-11 10:14:30 -05:00
Maksim Pechnikov
d6dc2bad1f fixed typo 2019-12-11 15:59:29 +03:00
rinpatch
96cab6d811 Merge branch 'oauth-extra-scopes' into 'develop'
OAuth 'push' and 'admin' scopes support

See merge request pleroma/pleroma-fe!1024
2019-12-11 09:57:32 +00: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
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
Hakaba Hitoyo
55da4462a4 [i18n] Improve easy/pedantic Japanese switching 2019-11-19 17:02:45 +00: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
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
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