diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cd69195..0cbee1b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Please Read -Please read these instructions before submitting issues to the Smoke.com GitHub repository. The issue tracker is for bugs and specific implementation discussion **only**. It should not be used for other purposes, as described below. +Please read these instructions before submitting issues to the Smoke.io GitHub repository. The issue tracker is for bugs and specific implementation discussion **only**. It should not be used for other purposes, as described below. ## Bug Reports @@ -12,7 +12,7 @@ If you are having trouble using the website but it is not an error with the webs ## Enhancement Suggestions -Do **not** use the issue tracker to suggest enhancements or improvements to the platform. The best place for these discussions is on Smoke.com. If there is a well vetted idea that has the support of the community that you feel should be considered by the development team, please email it to [sneak@smoke.io](mailto:sneak@smoke.io) for review. +Do **not** use the issue tracker to suggest enhancements or improvements to the platform. The best place for these discussions is on Smoke.io. If there is a well vetted idea that has the support of the community that you feel should be considered by the development team, please email it to [sneak@smoke.io](mailto:sneak@smoke.io) for review. ## Implementation Discussion @@ -26,9 +26,9 @@ This is not the place to make suggestions for product improvement (please see th Please do a keyword search to see if there is already an existing issue before opening a new one. -## Smoke.com vs. Smoke Blockchain +## Smoke.io vs. Smoke Blockchain -This issue tracker is only intended to track issues for the Smoke.com website. If the issue is with the Smoke blockchain, please open an issue in the [Smoke Repository](https://github.com/steemit/steem). +This issue tracker is only intended to track issues for the Smoke.io website. If the issue is with the Smoke blockchain, please open an issue in the [Smoke Repository](https://github.com/steemit/steem). ## Pull Requests diff --git a/doc/CONTRIBUTORS.md b/doc/CONTRIBUTORS.md index a34bf4c..b366519 100644 --- a/doc/CONTRIBUTORS.md +++ b/doc/CONTRIBUTORS.md @@ -1,5 +1,5 @@ This file contains a list of people who have made -large contributions to the Smoke.com codebase. +large contributions to the Smoke.io codebase. diff --git a/src/app/components/modules/SignUp.jsx b/src/app/components/modules/SignUp.jsx index 9233daf..1cbdebd 100644 --- a/src/app/components/modules/SignUp.jsx +++ b/src/app/components/modules/SignUp.jsx @@ -23,7 +23,7 @@ class SignUp extends React.Component { if (this.props.serverBusy || $STM_Config.disable_signups) { return
-

Membership to Smoke.com is now under invitation only because of unexpectedly high sign up rate. +

Membership to Smoke.io is now under invitation only because of unexpectedly high sign up rate. Submit your email to get on the waiting list.

diff --git a/src/app/components/modules/TermsAgree.jsx b/src/app/components/modules/TermsAgree.jsx index f548efb..75417e5 100644 --- a/src/app/components/modules/TermsAgree.jsx +++ b/src/app/components/modules/TermsAgree.jsx @@ -42,13 +42,13 @@ class TermsAgree extends Component {

Last Updated April 28, 2016

Welcome to Smoke! These Terms of Service (“Terms”) apply to your access to and use of Smoke.com and any other products or services that link to these Terms (“Terms”) apply to your access to and use of Smoke.io and any other products or services that link to these Terms (“Smoke”). Smoke is provided by Smoke, Inc. (“Smoke”, “we” or “us”). By accessing or using Smoke, you agree to be bound by these Terms. If you do not agree to these Terms, including the mandatory arbitration provision and class action waiver in Section 14, do not access or use Smoke. If we make changes to these Terms, we will provide notice of those changes by updating the “Last Updated” date above or posting notice on Smoke. Your continued use of Smoke will confirm your acceptance of the changes. -

You understand and agree that these Terms apply solely to your access to, and use of, Smoke and that, when you use other Smoke services such as Smoke.com or Smokegifts.com, the terms and policies particular to those services apply. +

You understand and agree that these Terms apply solely to your access to, and use of, Smoke and that, when you use other Smoke services such as Smoke.io or Smokegifts.com, the terms and policies particular to those services apply.

1. Privacy Policy

Please refer to our Privacy Policy for information about how we collect, use and disclose information about you.

2. Eligibility

24.4. Process

You and Smoke agree that you will notify each other in writing of any Dispute within thirty (30) days of when it arises so that the parties can attempt, in good faith, to resolve the Dispute informally. Notice to Smoke shall be provided by filling out the form available at https://smoke.io/contact/ or sending an email to contact@Smoke.com. Your notice must include: (1) your name, postal address and email address; (2) a description of the nature or basis of the Dispute; and (3) the specific relief that you are seeking. If you and Smoke cannot agree how to resolve the Dispute within thirty (30) days of Smoke receiving the notice, either you or Smoke may, as appropriate pursuant to this Section 14, commence an arbitration proceeding or file a claim in court. You and Smoke agree that any arbitration or claim must be commenced or filed within one (1) year after the Dispute arose; otherwise, you and Smoke agree that the claim is permanently barred (which means that you will no longer have the right to assert a claim regarding the Dispute). You and Smoke agree that: (a) any arbitration will occur in San Francisco County, California; (b) arbitration will be conducted confidentially by a single arbitrator in accordance with the rules of JAMS; and (c) the state or federal courts in California will have exclusive jurisdiction over the enforcement of an arbitration award and over any Dispute between the parties that is not subject to arbitration. You may also litigate a Dispute in small claims court located in the county where you reside if the Dispute meets the requirements to be heard in small claims court. + className="c4">contact@Smoke.io. Your notice must include: (1) your name, postal address and email address; (2) a description of the nature or basis of the Dispute; and (3) the specific relief that you are seeking. If you and Smoke cannot agree how to resolve the Dispute within thirty (30) days of Smoke receiving the notice, either you or Smoke may, as appropriate pursuant to this Section 14, commence an arbitration proceeding or file a claim in court. You and Smoke agree that any arbitration or claim must be commenced or filed within one (1) year after the Dispute arose; otherwise, you and Smoke agree that the claim is permanently barred (which means that you will no longer have the right to assert a claim regarding the Dispute). You and Smoke agree that: (a) any arbitration will occur in San Francisco County, California; (b) arbitration will be conducted confidentially by a single arbitrator in accordance with the rules of JAMS; and (c) the state or federal courts in California will have exclusive jurisdiction over the enforcement of an arbitration award and over any Dispute between the parties that is not subject to arbitration. You may also litigate a Dispute in small claims court located in the county where you reside if the Dispute meets the requirements to be heard in small claims court.

24.5. Authority of Arbitrator

As limited by the FAA, these Terms and applicable JAMS rules, the arbitrator will have: (a) the exclusive authority and jurisdiction to make all procedural and substantive decisions regarding a Dispute; and (b) the authority to grant any remedy that would otherwise be available in court. The arbitrator may only conduct an individual arbitration and may not consolidate more than one individual’ s claims, preside over any type of class or representative proceeding or preside over any proceeding involving more than one individual. diff --git a/src/app/components/pages/CreateAccount.jsx b/src/app/components/pages/CreateAccount.jsx index e17fd48..56ea615 100644 --- a/src/app/components/pages/CreateAccount.jsx +++ b/src/app/components/pages/CreateAccount.jsx @@ -181,7 +181,7 @@ class CreateAccount extends React.Component {


-

Membership to Smoke.com is now under invitation only because of unexpectedly high sign up +

Membership to Smoke.io is now under invitation only because of unexpectedly high sign up rate.

diff --git a/src/app/components/pages/Privacy.jsx b/src/app/components/pages/Privacy.jsx index 15e8a12..5791eee 100644 --- a/src/app/components/pages/Privacy.jsx +++ b/src/app/components/pages/Privacy.jsx @@ -356,7 +356,7 @@ class Privacy extends React.Component { accepted standard on how to respond to web browsers’ DNT signals. When you have DNT enabled, we may still use information collected for analytics and measurement purposes or to otherwise provide our Services (e.g., - Smoke.com buttons), but we will not load any + Smoke.io buttons), but we will not load any third-party trackers. You may, however, opt out of having information about you collected and used for behavioral advertising purposes, as described above. diff --git a/src/app/components/pages/Tos.jsx b/src/app/components/pages/Tos.jsx index ef61147..4957f74 100644 --- a/src/app/components/pages/Tos.jsx +++ b/src/app/components/pages/Tos.jsx @@ -9,13 +9,13 @@ class Tos extends React.Component {

Last Updated April 28, 2016

Welcome to Smoke! These Terms of Service (“Terms”) apply to your access to and use of Smoke.com and any other products or services that link to these Terms (“Terms”) apply to your access to and use of Smoke.io and any other products or services that link to these Terms (“Smoke”). Smoke is provided by Smoke, Inc. (“Smoke”, “we” or “us”). By accessing or using Smoke, you agree to be bound by these Terms. If you do not agree to these Terms, including the mandatory arbitration provision and class action waiver in Section 14, do not access or use Smoke. If we make changes to these Terms, we will provide notice of those changes by updating the “Last Updated” date above or posting notice on Smoke. Your continued use of Smoke will confirm your acceptance of the changes. -

You understand and agree that these Terms apply solely to your access to, and use of, Smoke and that, when you use other Smoke services such as Smoke.com or Smokegifts.com, the terms and policies particular to those services apply. +

You understand and agree that these Terms apply solely to your access to, and use of, Smoke and that, when you use other Smoke services such as Smoke.io or Smokegifts.com, the terms and policies particular to those services apply.

1. Privacy Policy

Please refer to our Privacy Policy for information about how we collect, use and disclose information about you.

2. Eligibility

24.4. Process

You and Smoke agree that you will notify each other in writing of any Dispute within thirty (30) days of when it arises so that the parties can attempt, in good faith, to resolve the Dispute informally. Notice to Smoke shall be provided by filling out the form available at https://smoke.io/contact/ or sending an email to contact@Smoke.com. Your notice must include: (1) your name, postal address and email address; (2) a description of the nature or basis of the Dispute; and (3) the specific relief that you are seeking. If you and Smoke cannot agree how to resolve the Dispute within thirty (30) days of Smoke receiving the notice, either you or Smoke may, as appropriate pursuant to this Section 14, commence an arbitration proceeding or file a claim in court. You and Smoke agree that any arbitration or claim must be commenced or filed within one (1) year after the Dispute arose; otherwise, you and Smoke agree that the claim is permanently barred (which means that you will no longer have the right to assert a claim regarding the Dispute). You and Smoke agree that: (a) any arbitration will occur in San Francisco County, California; (b) arbitration will be conducted confidentially by a single arbitrator in accordance with the rules of JAMS; and (c) the state or federal courts in California will have exclusive jurisdiction over the enforcement of an arbitration award and over any Dispute between the parties that is not subject to arbitration. You may also litigate a Dispute in small claims court located in the county where you reside if the Dispute meets the requirements to be heard in small claims court. + className="c4">contact@Smoke.io. Your notice must include: (1) your name, postal address and email address; (2) a description of the nature or basis of the Dispute; and (3) the specific relief that you are seeking. If you and Smoke cannot agree how to resolve the Dispute within thirty (30) days of Smoke receiving the notice, either you or Smoke may, as appropriate pursuant to this Section 14, commence an arbitration proceeding or file a claim in court. You and Smoke agree that any arbitration or claim must be commenced or filed within one (1) year after the Dispute arose; otherwise, you and Smoke agree that the claim is permanently barred (which means that you will no longer have the right to assert a claim regarding the Dispute). You and Smoke agree that: (a) any arbitration will occur in San Francisco County, California; (b) arbitration will be conducted confidentially by a single arbitrator in accordance with the rules of JAMS; and (c) the state or federal courts in California will have exclusive jurisdiction over the enforcement of an arbitration award and over any Dispute between the parties that is not subject to arbitration. You may also litigate a Dispute in small claims court located in the county where you reside if the Dispute meets the requirements to be heard in small claims court.

24.5. Authority of Arbitrator

As limited by the FAA, these Terms and applicable JAMS rules, the arbitrator will have: (a) the exclusive authority and jurisdiction to make all procedural and substantive decisions regarding a Dispute; and (b) the authority to grant any remedy that would otherwise be available in court. The arbitrator may only conduct an individual arbitration and may not consolidate more than one individual’ s claims, preside over any type of class or representative proceeding or preside over any proceeding involving more than one individual. diff --git a/src/app/help/en/faq.md b/src/app/help/en/faq.md index fe6cec6..19cd6c7 100644 --- a/src/app/help/en/faq.md +++ b/src/app/help/en/faq.md @@ -5,7 +5,7 @@ ### General -- What is Smoke.com? +- What is Smoke.io? - How does Smoke work? - How does Smoke differ from other social media websites? - Does it cost anything to post, comment, or vote? @@ -21,7 +21,7 @@ - How long does the account approval process take? - Why do I need to provide my email and phone number? - Can I create a Smoke account without an email and phone number? -- What are other ways to create an account on the blockchain besides using Smoke.com? +- What are other ways to create an account on the blockchain besides using Smoke.io? - It is not letting me create an account with my phone number. What should I do? - What happens if my email or phone number changes? - Am I allowed to create more than one account @@ -181,8 +181,8 @@ ### Developers -- Are the Smoke blockchain and Smoke.com code open-source? -- Is there a Github page for Smoke.com? +- Are the Smoke blockchain and Smoke.io code open-source? +- Is there a Github page for Smoke.io? - Is there a Github page for the Smoke blockchain? - What is available for developers interested in Smoke and Smoke? - How do I use cli_wallet? @@ -208,7 +208,7 @@ # General -## What is Smoke.com? +## What is Smoke.io? Smoke is a social network and content rewards platform that makes the crowd the beneficiaries of the attention economy. It does this be rewarding users with SMOKE. @@ -230,7 +230,7 @@ Most social media sites extract value from their userbase for the benefit of sha ## Does it cost anything to post, comment, or vote? -No. It is free to post, comment, and vote on content on Smoke.com. You might even get paid for it! +No. It is free to post, comment, and vote on content on Smoke.io. You might even get paid for it! ^ @@ -274,7 +274,7 @@ It is best to have realistic expectations, without focusing on rewards when you ## How do I create an account? -Click on the "Sign Up" link at the top of Smoke.com to get started. +Click on the "Sign Up" link at the top of Smoke.io to get started. You will be asked to verify your email address and phone number. After your email address and phone number have been verified, you will be added to the waiting list. You will be notified via email once your account is approved. @@ -298,17 +298,17 @@ If your account has not been approved after one week, please ask for help in the ## Why do I need to provide my email and phone number? -To create an account on the blockchain, it costs SMOKE tokens. When you create an account through Smoke.com, Smoke Inc. is supplying the tokens to pay the account creation fee. In order to prevent users from abusing the paid-for signup and creating multiple accounts, we need to be able to verify that each user is only signing up for one account. +To create an account on the blockchain, it costs SMOKE tokens. When you create an account through Smoke.io, Smoke Inc. is supplying the tokens to pay the account creation fee. In order to prevent users from abusing the paid-for signup and creating multiple accounts, we need to be able to verify that each user is only signing up for one account. ^ ## Can I create a Smoke account without an email and phone number? -The only way to have an account created via Smoke.com is to supply your email and phone number. Because Smoke is an open and permissionless network, there are other ways to create a Smoke account. Any Smoke blockchain account can be used on Smoke.com +The only way to have an account created via Smoke.io is to supply your email and phone number. Because Smoke is an open and permissionless network, there are other ways to create a Smoke account. Any Smoke blockchain account can be used on Smoke.io ^ -## What are other ways to create an account on the blockchain besides using Smoke.com? +## What are other ways to create an account on the blockchain besides using Smoke.io? If you are willing to pay your own signup fee, then there are other ways to create a new account on the blockchain. @@ -332,7 +332,7 @@ Currently there is no way to change the email or phone number that is linked to ## Am I allowed to create more than one account? -Each user is allowed only one paid-for account created via Smoke.com, however users are allowed to create multiple accounts on the blockchain. Creating additional accounts on the blockchain requires users to pay their own account creation fee for any additional accounts. +Each user is allowed only one paid-for account created via Smoke.io, however users are allowed to create multiple accounts on the blockchain. Creating additional accounts on the blockchain requires users to pay their own account creation fee for any additional accounts. ^ @@ -346,7 +346,7 @@ Accounts can not be deactivated or deleted. The account along with all of its ac ## Is there an Etiquette Guide for Smoke? -There are no official rules for participating on Smoke.com, but one of the users @thecryptofiend has created an Etiquette Guide for the community. While it is not required to follow the suggestions in the guide, they are standards that many users in the community choose to follow. +There are no official rules for participating on Smoke.io, but one of the users @thecryptofiend has created an Etiquette Guide for the community. While it is not required to follow the suggestions in the guide, they are standards that many users in the community choose to follow. ^ @@ -386,7 +386,7 @@ These are various ways to sort Smoke posts. ## What information is available in my account menu? -You can get to your account menu by clicking on the avatar icon in the top-right corner of a Smoke.com page. +You can get to your account menu by clicking on the avatar icon in the top-right corner of a Smoke.io page. **Feed** - Here is where you go to see the most recent posts from the people you follow. @@ -448,7 +448,7 @@ When there is new activity in your feed, you receive a reply from another user, Smoke also allows you to subscribe to receive additional notifications when users mention you in a comment or post. -Currently, there are no options to receive notifications for votes directly on Smoke.com. But, there is a third-party application https://steemstats.com/, developed by @jesta, which has an option to set up additional notifications on your computer. +Currently, there are no options to receive notifications for votes directly on Smoke.io. But, there is a third-party application https://steemstats.com/, developed by @jesta, which has an option to set up additional notifications on your computer. ^ @@ -498,7 +498,7 @@ Yes. This can be seen under the Settings page. ## Can I see which users have muted me? -No. This information is not presented on Smoke.com. +No. This information is not presented on Smoke.io. ^ @@ -564,7 +564,7 @@ You can also read ## Is there a way I can make my images smaller? -Yes, but the picture must be resized before it is uploaded into the Smoke.com editor. This can be done in your favorite photo editing software, or online by uploading to a third-party website that features editing such as imgur.com. +Yes, but the picture must be resized before it is uploaded into the Smoke.io editor. This can be done in your favorite photo editing software, or online by uploading to a third-party website that features editing such as imgur.com. ^ @@ -650,7 +650,7 @@ Language-specific groups include: ## Can I delete something I posted? -The blockchain will always contain the full edit history of posts and comments, so it can never be completely deleted. If you would like to update a post so that users cannot see the content via Smoke.com, you can edit the post and replace it with blank content for as long as the post is active. After seven days, the post can no longer be edited. +The blockchain will always contain the full edit history of posts and comments, so it can never be completely deleted. If you would like to update a post so that users cannot see the content via Smoke.io, you can edit the post and replace it with blank content for as long as the post is active. After seven days, the post can no longer be edited. ^ @@ -762,7 +762,7 @@ Posts and comments remain active for 7 days. When the period is over, you are ab Users have the option to delegate SMOKE Power to other users. When a user is delegated SMOKE Power, their content votes and curation rewards are calculated as if it were their own SMOKE Power. Users are not able to power down or cash out delegated SMOKE Power, as it still belongs to the original owner. -Most users will have a small amount of SMOKE Power delegated to them by the Smoke account after creating an account via Smoke.com. +Most users will have a small amount of SMOKE Power delegated to them by the Smoke account after creating an account via Smoke.io. Delegated SMOKE Power shows up in a user's wallet below their actual SMOKE Power balance in parentheses. @@ -781,13 +781,13 @@ With SMOKE tokens in your wallet, click "Power Up" to turn them into SMOKE Power If you don’t already have SMOKE or Smoke Dollars in your wallet, you can purchase them using bitcoin (BTC), ether (ETH), or BitShares (BTS) tokens. You may purchase BTC on various exchanges, such as Coinbase.com or Localbitcoins.com. To buy: -- Click "Buy Smoke" from the main menu in the top right corner of Smoke.com, or from your wallet. +- Click "Buy Smoke" from the main menu in the top right corner of Smoke.io, or from your wallet. - Select the currency to deposit, and enter the amount of that currency you wish to use. - Enter your Smoke account name (without the @) for "Your receive address". - Click the "Get Deposit Address" button. - Send the currency to the provided address. -SMOKE purchases made via Smoke.com are facilitated by BlockTrades. +SMOKE purchases made via Smoke.io are facilitated by BlockTrades. bitcoin can also be exchanged for SMOKE on external markets such as Poloniex, Bittrex, ShapeShift.io, and Changelly. @@ -866,7 +866,7 @@ A VEST is a unit of measurement for SMOKE Power. A MVEST is one million VESTS. T ## Can I sell goods and services on Smoke? -Other than making a post and making sales manually, there is no interface for selling items directly on Smoke.com. You can list goods on the third-party website PeerHub.com. Through PeerHub, you can accept payment in Smoke Dollars or SMOKE, and you have the option to advertise your items through Smoke posts. +Other than making a post and making sales manually, there is no interface for selling items directly on Smoke.io. You can list goods on the third-party website PeerHub.com. Through PeerHub, you can accept payment in Smoke Dollars or SMOKE, and you have the option to advertise your items through Smoke posts. ^ @@ -1304,7 +1304,7 @@ If you made your account through Smoke and it is compromised, immediately visit If your password has been changed without your consent, then the account designated as your recovery account can generate a new owner key for the account. The account recovery must be completed within 30 days of the password being changed, and you must supply a recent owner key that was valid within the last 30 days. -Smoke Inc. owns the default recovery account (@steem) for all users who sign up using Smoke.com. Smoke can identify users by their original email, Facebook, or Reddit logins that were used to signup via Smoke.com. +Smoke Inc. owns the default recovery account (@steem) for all users who sign up using Smoke.io. Smoke can identify users by their original email, Facebook, or Reddit logins that were used to signup via Smoke.io. If you don't have the master password or owner key that was valid the past 30 days, or are unable to prove that you are the original owner of the account, then your account will be unrecoverable. @@ -1318,15 +1318,15 @@ If you find a security issue please report the details to security@smoke.io. # Developers -## Are the Smoke blockchain and Smoke.com code open-source? +## Are the Smoke blockchain and Smoke.io code open-source? -Yes. Both the Smoke blockchain and Smoke.com are open-source projects. +Yes. Both the Smoke blockchain and Smoke.io are open-source projects. -Developers should however avoid the use of the term "Smoke" in their own products, and instead refer to the Smoke Blockchain or Smoke Platform. Smoke refers to Smoke.com, which is owned by Smoke, Inc. +Developers should however avoid the use of the term "Smoke" in their own products, and instead refer to the Smoke Blockchain or Smoke Platform. Smoke refers to Smoke.io, which is owned by Smoke, Inc. ^ -## Is there a Github page for Smoke.com? +## Is there a Github page for Smoke.io? https://github.com/steemit/condenser @@ -1410,7 +1410,7 @@ https://steem.io/SmokeWhitePaper.pdf If you post your question in the #help channel on steemit.chat, the users there may be able to help. -You can also create a post on Smoke.com with the tag #help, and someone in the community may be able to answer it. +You can also create a post on Smoke.io with the tag #help, and someone in the community may be able to answer it. ^ diff --git a/src/app/help/en/welcome.md b/src/app/help/en/welcome.md index ec4f728..44235ab 100644 --- a/src/app/help/en/welcome.md +++ b/src/app/help/en/welcome.md @@ -52,7 +52,7 @@ Below that is a list of recommended users to follow, a collection of other resou ### No Cost to Participate -It is free to post, comment, or upvote all content on Smoke.com. You might even get paid for it! +It is free to post, comment, or upvote all content on Smoke.io. You might even get paid for it! ^ diff --git a/src/shared/HtmlReady.js b/src/shared/HtmlReady.js index a685ccb..a08ff7e 100644 --- a/src/shared/HtmlReady.js +++ b/src/shared/HtmlReady.js @@ -51,7 +51,7 @@ const XMLSerializer = new xmldom.XMLSerializer() * - convert naked URLs to images/links * - convert embeddable URLs to