Commit Graph

4422 Commits

Author SHA1 Message Date
Shpuld Shpludson 1b9805b550 Merge branch 'develop' into 'master'
Update master with 2.0.0

See merge request pleroma/pleroma-fe!1074
2020-02-28 20:27:02 +00: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
Your New SJW Waifu 02f399c03d Fixed robots.txt 2020-02-25 16:25:05 -06:00
Your New SJW Waifu 6422115c40 Add robots.txt 2020-02-25 16:12:54 -06:00
xenofem 7fa5eb07dd Refactor status showing/hiding code for better handling of edge cases and easier comprehension 2020-02-24 18:10:15 -05:00
Mark Felder 39e3917118 Remove unneccessary nested 2020-02-24 11:23:16 -06:00
Mark Felder 86561592d0 First attempt at not requiring email address for registration 2020-02-24 11:19:00 -06:00
Mark Felder 23e0ce59e6 Fix captcha input and disable ALL the helpers 2020-02-22 09:42:22 -06:00
Shpuld Shpuldson 5b7acca0ba make theme loading work with source-only presets 2020-02-22 10:57:08 +02:00
Shpuld Shpuldson 1fb91b1795 remove bloat from themes 2020-02-22 10:34:54 +02:00
Shpuld Shpuldson b5c6b77ca8 update using variables 2020-02-22 10:03:16 +02:00
Shpuld Shpludson 8c454b9456 Apply suggestion to static/themes/pleroma-dark.json 2020-02-21 14:09:31 +00:00
Shpuld Shpludson c9935362de Apply suggestion to static/themes/pleroma-dark.json 2020-02-21 14:09:29 +00:00
Shpuld Shpludson 19cc739598 Apply suggestion to static/themes/pleroma-dark.json 2020-02-21 14:09:25 +00:00
Shpuld Shpludson e342dbcb10 Apply suggestion to static/themes/pleroma-dark.json 2020-02-21 14:09:21 +00:00
Your New SJW Waifu 32358b8abd Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-02-20 19:59:08 -06:00
Shpuld Shpuldson 64a6ba219a make panel header highlight less harsh 2020-02-20 21:14:42 +02:00
Shpuld Shpuldson 8bb5d775b4 update pleroma-dark and pleroma-light 2020-02-20 20:47:24 +02:00
Henry Jameson d19c64314f stop using customTheme in user card, instead use color slots. fix for opacity
inheritance polluting inheritors
2020-02-20 18:13:40 +02:00
Shpuld Shpludson 0abc3f9b85 Merge branch 'moderation-menu-fix' into 'develop'
Fix user deactivation, deletion, and role assignment in the moderation menu

See merge request pleroma/pleroma-fe!1063
2020-02-19 16:30:53 +00:00
HJ 3ddf7ebe2c Merge branch 'themes-accent' into 'develop'
Themes v3 Part 1 "2.1" codenamed "One step for themes, a giant burder for code reviewers"

Closes #750 and #774

See merge request pleroma/pleroma-fe!1037
2020-02-18 21:20:43 +00:00
Henry Jameson 32902e01f8 fix changelog. kenomo didn't happen. 2020-02-18 00:30:10 +02:00
Henry Jameson 171f4c7ddb update headers in switcher to better separate the subsections 2020-02-18 00:01:48 +02:00
Henry Jameson 1e95a0795a paper theme, updated todo, lol 2020-02-17 23:59:52 +02:00
Henry Jameson 3b3a31b461 improve the display of disabled buttons 2020-02-17 23:43:56 +02:00
Henry Jameson 5c6046ea0a attempt to fix some bugs with shadows control 2020-02-17 23:43:35 +02:00
Henry Jameson 76323d6d9a fix #774 2020-02-17 22:38:24 +02:00
Henry Jameson e36647e95e revert emoji reaction style 2020-02-17 22:28:14 +02:00
eugenijm 695d6b6c50 Fix user activation/deactivation, deletion, and role assignment in the moderation menu 2020-02-17 16:29:39 +03:00
Shpuld Shpludson 26e455bb4c Merge branch 'fix/no-mrf-transparency-crash' into 'develop'
after_store: Fix failing to parse nodeinfo when mrf transparency is disabled

Closes #772

See merge request pleroma/pleroma-fe!1064
2020-02-17 08:17:36 +00:00
HJ 12cd96bfa7 Merge branch 'fix-android-emoji-input' into 'develop'
Add onInput() function as listener for input events, remove unnecessary compositionupdate listener

Closes #775

See merge request pleroma/pleroma-fe!1065
2020-02-16 23:54:57 +00:00
xenofem c1e38a4423 EmojiInput tests should be checking the input value on the last input event, not the first 2020-02-16 16:35:04 -05:00
xenofem 59dd7f1320 Add onInput() function as listener for input events, remove unnecessary compositionupdate listener 2020-02-16 14:58:43 -05:00
Your New SJW Waifu d031267ef3 updates to neckbeard 2020-02-14 16:04:32 -06:00
Henry Jameson c43325acd7 fix pressed button in top bar 2020-02-13 21:39:14 +02:00
rinpatch 0dcc3bf2fe after_store: Fix failing to parse nodeinfo when mrf transparency is
disabled

Closes #772
2020-02-13 22:35:46 +03:00
Shpuld Shpludson 21f6120e9d Merge branch 'refactor/i18n-messages-for-mrf-policy-disclosure' into 'develop'
Refactor i18n messages for MRF policy disclosure

See merge request pleroma/pleroma-fe!1062
2020-02-13 09:43:56 +00:00
Hakaba Hitoyo 4aeba026e6 Refactor i18n messages for MRF policy disclosure 2020-02-13 09:43:56 +00:00
Shpuld Shpludson f50068ef35 Merge branch 'improve-default-tos' into 'develop'
Improve default ToS

See merge request pleroma/pleroma-fe!1057
2020-02-13 09:41:31 +00:00
Hakaba Hitoyo 823a303f8a Improve default ToS 2020-02-13 09:41:31 +00:00
Your New SJW Waifu 23d91b7806 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-02-12 17:01:26 -06:00
Henry Jameson ba3c278002 dismiss warning when selecting other themes, fix collapsed attachments link color 2020-02-12 01:26:01 +02:00