Merge branch 'feature/rich_text_editor' of https://code.gab.com/gab/social/gab-social into develop

2020-06-17 16:45:45 -04:00
parent 9d61659604 13eb1764ec
commit f7e0528d3b
23 changed files with 1181 additions and 293 deletions
--- a/app/javascript/gabsocial/components/modal/pro_upgrade_modal.js
+++ b/app/javascript/gabsocial/components/modal/pro_upgrade_modal.js
@@ -42,6 +42,7 @@ class ProUpgradeModal extends ImmutablePureComponent {
          <Text>• Larger Video and Image Uploads</Text>
          <Text>• Receive the PRO Badge</Text>
          <Text>• Remove in-feed promotions</Text>
+          <Text>• Compose Rich Text posts (Bold, Italic, Underline and more)</Text>
        </div>

        <Button