1
0
mirror of https://git.pleroma.social/sjw/pleroma-fe.git synced 2024-12-25 16:35:22 +01:00
Commit Graph

3897 Commits

Author SHA1 Message Date
Your New SJW Waifu
78bae97994 Happy birthday to me! Added banner by ddeevviiaanntt and changed link. 2019-12-04 00:24:06 -06:00
Your New SJW Waifu
46f8af35d5 Merge remote-tracking branch 'upstream/develop' into develop 2019-12-02 21:10:00 -06: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
Your New SJW Waifu
ea8b6e7439 oops 2019-11-24 19:21:17 -06:00
Your New SJW Waifu
17265f65c9 Change reactions name 2019-11-24 18:57:16 -06:00
Your New SJW Waifu
153cf0a03c Add another christmas background 2019-11-24 18:43:41 -06:00
Your New SJW Waifu
04c3125028 Add another christmas background 2019-11-24 18:38:35 -06:00
Your New SJW Waifu
0e3d67ce48 Remove tall ass image for now 2019-11-24 18:26:04 -06:00
Your New SJW Waifu
22265f47bf Fix typo 2019-11-24 18:24:23 -06:00
Your New SJW Waifu
2dbd0f14dd Fix sticker picker 2019-11-24 18:20:25 -06:00
Your New SJW Waifu
1508b44ca9 Add christmas background 2019-11-24 17:58:18 -06:00
Your New SJW Waifu
eb78126559 Add stickers 2019-11-24 17:30:28 -06:00
Your New SJW Waifu
7d12e13b47 Update config.js 2019-11-24 17:08:09 +00:00
Your New SJW Waifu
f7a39696ac Update config.js 2019-11-24 17:06:49 +00:00
Your New SJW Waifu
2c3327f0ad Update config.js 2019-11-24 16:55:55 +00:00
Your New SJW Waifu
e4cc314b0f Don't crop attachments 2019-11-24 16:51:10 +00:00
Your New SJW Waifu
3442020d1b Revert "Change formatting"
This reverts commit ef1143db8d
2019-11-24 16:37:16 +00:00
Your New SJW Waifu
ef1143db8d Change formatting 2019-11-24 16:34:19 +00:00
Your New SJW Waifu
07b28d79ae Add more compressed waste_collection and use it for background 2019-11-23 12:11:40 -06:00
Your New SJW Waifu
8f0051cab6 Change background and test serving background, logo and nsfw warning from /media/ 2019-11-22 23:10:08 -06:00
Your New SJW Waifu
97c7e993f7 Update config.json 2019-11-21 18:36:05 +00:00
Your New SJW Waifu
3743ad175d Update styles.json 2019-11-21 18:35:08 +00:00
Your New SJW Waifu
65b5073564 Change default theme to Electra 2019-11-21 18:12:29 +00:00
Your New SJW Waifu
0cbf3e249a Enable greentext by default 2019-11-21 18:08:40 +00:00
Your New SJW Waifu
1e7f82a15c Hide posts from muted users by default 2019-11-21 18:07:24 +00:00
Your New SJW Waifu
04d825fdc0 Merge remote-tracking branch 'upstream/develop' into develop 2019-11-19 14:40:21 -06: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
Your New SJW Waifu
cb696117df Switch to new banner by VD-15 with bevel by Deviant and update banner link to PADORU.EXE 2019-11-17 11:20:25 -06:00
Your New SJW Waifu
a63adc203b Upload Christmas banner with bevel by ddeevviiaanntt 2019-11-17 17:16:20 +00:00
Your New SJW Waifu
d27be8b59f Upload Christmas banner 2019-11-17 04:15:37 +00:00
Your New SJW Waifu
eaedd03a7f Merge remote-tracking branch 'upstream/develop' into develop 2019-11-16 20:22:04 -06: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