Commit graph

3774 commits

Author SHA1 Message Date
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
Shpuld Shpludson
aa1b812484 Merge branch 'iss-149/profile-fields-normalize' into 'develop'
Normalize profile fields

See merge request pleroma/pleroma-fe!995
2019-11-19 14:15:41 +00:00
kPherox
a55486f8d7 Normalize profile fields 2019-11-19 14:15:41 +00:00
Shpuld Shpludson
8b37996805 Merge branch 'fix-fetch-follow-request-for-mobile' into 'develop'
Fix follow request for mobile

See merge request pleroma/pleroma-fe!1005
2019-11-19 14:07:15 +00:00
kPherox
0995658757 backend interactor service: implement startFetchingFollowRequest
backend interactor service: remove unused fetchFollowRequests
2019-11-19 14:07:15 +00:00
Shpuld Shpludson
377b8988b6 Merge branch 'badge-checkbox' into 'develop'
Show badge visibility user setting checkbox only if needed

See merge request pleroma/pleroma-fe!999
2019-11-16 17:36:01 +00:00
taehoon
44cd5ef814 show badge visibility user setting checkbox only if needed 2019-11-16 12:12:21 -05:00
Shpuld Shpludson
10bb22b5cf Merge branch 'feature/japanese-translation' into 'develop'
Use kana+kanji as default for Japanese translation

See merge request pleroma/pleroma-fe!1001
2019-11-16 16:28:12 +00:00
AkiraFukushima
67c95c9d06 Use kana+kanji as default for Japanese translation 2019-11-17 01:11:19 +09:00
rinpatch
748e9c5203 Merge branch 'chore/remove-outdated-changelog' into 'develop'
Remove outdated changelog file

See merge request pleroma/pleroma-fe!1000
2019-11-15 19:58:09 +00:00
rinpatch
a9022d0c32 Remove outdated changelog file
This hasn't been updated in 2 years and we have CHANGELOG.md now.
2019-11-15 22:56:16 +03:00
rinpatch
9a81a61759 Merge branch 'patch-1' into 'develop'
Fix translation (https://blob.cat/notice/9oyYO1RzcNbJXxKxeq)

See merge request pleroma/pleroma-fe!998
2019-11-15 16:59:20 +00:00
Mew Mew
3ecfbc8ea2 Fix translation (https://blob.cat/notice/9oyYO1RzcNbJXxKxeq) 2019-11-15 05:09:01 +00:00
Henry Jameson
28efd7d862 use yarn, try to restart pipeline 2019-11-14 23:46:19 +02:00
Henry Jameson
bd2a682b83 tests + updates 2019-11-14 22:40:20 +02:00
rinpatch
0300502a96 Merge branch '695' into 'develop'
Close image modal by clicking image

Closes #695

See merge request pleroma/pleroma-fe!996
2019-11-14 19:24:08 +00: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
kaniini
1f42283b8d Merge branch 'friend-follower-count-display' into 'develop'
Show "Hidden" instead of zero when followers/following counts are hidden

See merge request pleroma/pleroma-fe!993
2019-11-13 21:22:35 +00: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
kaniini
3dae1cf396 Merge branch 'ocd-triggered' into 'develop'
achieve the perfect speeeeen in media-upload

See merge request pleroma/pleroma-fe!991
2019-11-11 19:51:05 +00:00
Henry Jameson
9e774fffbf achieve the perfect speeeeen in media-upload 2019-11-11 21:45:40 +02:00
Shpuld Shpludson
7502ee9734 Merge branch '704' into 'develop'
Fix "hideISP setting checkbox is broken"

Closes #704

See merge request pleroma/pleroma-fe!990
2019-11-10 20:00:16 +00:00
taehoon
3c3f2c654e add hideISP to defaultState of config module 2019-11-10 14:42:01 -05:00
kaniini
c873a18c64 Merge branch 'feature/about-page' into 'develop'
Feature/about page

Closes #699

See merge request pleroma/pleroma-fe!985
2019-11-09 17:38:45 +00:00
Ariadne Conill
a2a94c4b7b add changelog entry 2019-11-09 11:33:47 -06: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
HJ
044c9ad056 Merge branch 'feature/redirect-external-user-to-id' into 'develop'
[Feature] Redirect remote user to internal ID

See merge request pleroma/pleroma-fe!921
2019-11-08 22:27:25 +00: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
kaniini
5679dcdd18 Merge branch 'eslint-fix' into 'develop'
Fix eslint warnings

See merge request pleroma/pleroma-fe!984
2019-11-08 18:46:44 +00:00