Commit graph

3792 commits

Author SHA1 Message Date
Wyatt Benno
1a043d4350 remove console 2019-12-09 09:11:31 +09:00
Wyatt Benno
e86af0c965 Change naming, make more general 2019-12-09 09:02:34 +09: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
HJ
7b1d5a4f5c Merge branch '701' into 'develop'
Versioning the font resources using webpack

Closes #701

See merge request pleroma/pleroma-fe!1017
2019-12-03 20:15:06 +00:00
taehoon
d37caeeded add html-webpack-plugin to karma config 2019-12-03 14:40:51 -05:00
taehoon
36589f32d1 use another fork of fontello-webpack-plugin 2019-12-03 13:26:00 -05: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
5096bff16c Merge branch 'fix/mrf-js-errors' into 'develop'
fix "can't find property of undefined" errors in mrf transparency panel

See merge request pleroma/pleroma-fe!1008
2019-12-02 12:20:25 +00: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
Shpuld Shpludson
0c6737f336 Merge branch '712' into 'develop'
Move mention button right next to mute button

Closes #712

See merge request pleroma/pleroma-fe!1015
2019-12-02 12:08:12 +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
HJ
41d2fa2fd6 Merge branch 'i18n/improve-easy-pedantic-japanese-switching-system' into 'develop'
[i18n] Improve easy/pedantic Japanese switching

See merge request pleroma/pleroma-fe!1003
2019-11-19 17:02:45 +00: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
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