1
0
mirror of https://git.pleroma.social/sjw/pleroma-fe.git synced 2024-12-23 21:05:05 +01:00
Commit Graph

4256 Commits

Author SHA1 Message Date
Your New SJW Waifu
5fc9c2b4c9 Merge branch 'revert-c7699eed' into 'neckbeard'
Revert "Move favicons"

See merge request sjw/pleroma-fe!2
2020-03-19 20:44:14 +00:00
Your New SJW Waifu
fbc7ec4fcb Revert "Move favicons"
This reverts commit c7699eed17
2020-03-19 20:43:59 +00:00
Your New SJW Waifu
e4f6b0949d Merge branch 'revert-cdd4f0ae' into 'neckbeard'
Revert "Fix favicon placment"

See merge request sjw/pleroma-fe!1
2020-03-19 20:43:46 +00:00
Your New SJW Waifu
26ba382bab Revert "Fix favicon placment"
This reverts commit cdd4f0aeb4
2020-03-19 20:43:10 +00:00
Your New SJW Waifu
cdd4f0aeb4 Fix favicon placment 2020-03-19 15:33:05 -05:00
Your New SJW Waifu
c7699eed17 Move favicons 2020-03-19 15:04:24 -05:00
Your New SJW Waifu
a08b993cbc Favicons 2020-03-19 11:59:01 -05:00
Your New SJW Waifu
354b2da2cf New NSFW image 2020-03-19 11:50:30 -05:00
Your New SJW Waifu
39f1c9a62d Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-03-15 01:12:51 -05:00
Your New SJW Waifu
1f85447dc6 Fixed DMCA link 2020-03-15 01:12:18 -05:00
Shpuld Shpludson
6e14fb292c Merge branch 'caskd-develop-patch-76396' into 'develop'
Prevent overflow for long usernames/domains

See merge request pleroma/pleroma-fe!1083
2020-03-14 20:03:11 +00:00
Alex
b9820b84a1 Prevent overflow for long usernames/domains 2020-03-14 19:41:38 +00:00
Your New SJW Waifu
e3528e5e12 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-03-12 11:34:36 -05:00
Your New SJW Waifu
acd1672f03 More neko 2020-03-12 11:34:19 -05:00
HJ
ed0b240e29 Merge branch 'fix/captcha-input' into 'develop'
Fix captcha input and disable ALL the helpers

Closes #778

See merge request pleroma/pleroma-fe!1071
2020-03-11 16:40:31 +00:00
Your New SJW Waifu
a15a68aac7 Jojo did nothing wrong 2020-03-10 23:41:03 -05:00
Your New SJW Waifu
649ae3333a Fixing and adding stuff 2020-03-10 22:33:13 -05:00
Your New SJW Waifu
3791915279 Cat stuff 2020-03-10 21:38:27 -05:00
Your New SJW Waifu
4520b81b8b Made the T in the lowercase 2020-03-09 19:02:13 -05:00
Your New SJW Waifu
31401f483d Added rule about Jojo and cleaned up rule list html 2020-03-09 18:59:49 -05:00
Your New SJW Waifu
c99203d388 Forgot to update config 2020-03-09 16:27:58 -05:00
Your New SJW Waifu
edc79c7470 Add Favicons 2020-03-09 16:26:37 -05:00
Your New SJW Waifu
701aec8331 Add catears 2020-03-09 16:16:47 -05:00
Your New SJW Waifu
93736c5aa4 Fucked up 2020-03-09 16:15:17 -05:00
Your New SJW Waifu
c58e49d701 Add mods 2020-03-09 16:13:53 -05:00
Your New SJW Waifu
4ec7338ed3 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-03-07 11:55:43 -06:00
HJ
2c3db2b6a2 Merge branch 'fix/themes-2.1-opacity-again' into 'develop'
fix several issues related to opacity

Closes #787 and #789

See merge request pleroma/pleroma-fe!1081
2020-03-07 14:33:19 +00:00
Henry Jameson
a485386a3b fix tests 2020-03-06 21:48:40 +02:00
Henry Jameson
550080bd82 fix last issue 2020-03-06 21:39:17 +02:00
Henry Jameson
7aa5bf0896 prioritize disabled opacity over transparent keyword 2020-03-06 21:20:42 +02:00
Henry Jameson
9f2c1b4008 fix several issues related to opacity 2020-03-06 21:17:24 +02:00
Your New SJW Waifu
cc599dfa68 Better no avi image 2020-03-05 17:12:56 -06:00
Your New SJW Waifu
d7d897037c Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-03-05 17:07:26 -06:00
Shpuld Shpuldson
147364b80c mention status preview fix in changelog 2020-03-04 17:30:59 +02:00
Shpuld Shpludson
f58f294ee8 Merge branch 'fix/themes-2.1-transparency-pink' into 'develop'
fix trasparency problems in some cases (purple headers)

See merge request pleroma/pleroma-fe!1079
2020-03-04 06:20:28 +00:00
Henry Jameson
0702934f4f fix trasparency problems in some cases (purple headers) 2020-03-04 00:23:14 +02:00
Your New SJW Waifu
60b7ce00ac Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-03-02 07:30:50 -06:00
HJ
dbcd8294e8 Merge branch 'fix/remove-spinner-on-failed-status-previews' into 'develop'
Fix: failed status previews spinning forever

See merge request pleroma/pleroma-fe!1078
2020-03-02 10:49:24 +00:00
Shpuld Shpuldson
ab4005add5 add status unavailable message when status can't be loaded in status preview 2020-03-02 08:35:57 +02:00
Your New SJW Waifu
9e7eda4b80 Updated upload size limit on about page 2020-02-29 08:41:35 -06:00
Your New SJW Waifu
46a8533710 updates to neckbeard 2020-02-29 08:30:52 -06:00
Shpuld Shpludson
57e72b48c1 Update CHANGELOG.md 2020-02-28 20:16:53 +00:00
Shpuld Shpludson
a2070fd781 Update CHANGELOG.md 2020-02-28 19:57:22 +00:00
Shpuld Shpludson
575b542db2 Merge branch 'feat/update-pleroma-themes' into 'develop'
update pleroma-dark and pleroma-light

See merge request pleroma/pleroma-fe!1070
2020-02-28 17:53:41 +00:00
Shpuld Shpludson
ee582855d2 Apply suggestion to src/modules/instance.js 2020-02-28 17:20:40 +00:00
Shpuld Shpludson
111c1ced67 Merge branch 'fix/popover-performance' into 'develop'
Fix/popover performance

See merge request pleroma/pleroma-fe!1066
2020-02-28 16:39:47 +00:00
Shpuld Shpludson
31225f5d14 Fix/popover performance 2020-02-28 16:39:47 +00:00
Your New SJW Waifu
b44761167f Add pgp key download link 2020-02-26 11:08:56 -06:00
Your New SJW Waifu
77a036d448 Update pgp 2020-02-26 10:57:34 -06:00
Your New SJW Waifu
9d72876522 Move error pages to fe 2020-02-25 16:56:07 -06:00