diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-22 07:49:54 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-22 07:49:54 -0700 |
| commit | e3a662a842f5012c58215f1ede771f491bb2dc48 (patch) | |
| tree | 50794a2875f495c17af038a87516b1126b532664 /web | |
| parent | 6c8d7b1b9fe00e60582900b7c1e782e2c0a00325 (diff) | |
| parent | 7253a6c689611c94141cecec64b37b7371a5cd00 (diff) | |
| download | chat-e3a662a842f5012c58215f1ede771f491bb2dc48.tar.gz chat-e3a662a842f5012c58215f1ede771f491bb2dc48.tar.bz2 chat-e3a662a842f5012c58215f1ede771f491bb2dc48.zip | |
Merge pull request #17 from mattermost/master
to me
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/create_comment.jsx | 2 | ||||
| -rw-r--r-- | web/react/components/create_post.jsx | 2 | ||||
| -rw-r--r-- | web/static/help/configure_links.html | 22 | ||||
| -rw-r--r-- | web/templates/signup_team.html | 2 |
4 files changed, 23 insertions, 5 deletions
diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx index 9bcbad079..cb7aa371c 100644 --- a/web/react/components/create_comment.jsx +++ b/web/react/components/create_comment.jsx @@ -145,7 +145,7 @@ module.exports = React.createClass({ onUserInput={this.handleUserInput} onKeyPress={this.commentMsgKeyPress} messageText={this.state.messageText} - createMessage="Create a comment..." + createMessage="Add a comment..." initialText="" id="reply_textbox" ref="textbox" /> diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx index a534e495d..5a0b6f85f 100644 --- a/web/react/components/create_post.jsx +++ b/web/react/components/create_post.jsx @@ -248,7 +248,7 @@ module.exports = React.createClass({ onUserInput={this.handleUserInput} onKeyPress={this.postMsgKeyPress} messageText={this.state.messageText} - createMessage="Create a post..." + createMessage="Write a message..." channelId={this.state.channel_id} id="post_textbox" ref="textbox" /> diff --git a/web/static/help/configure_links.html b/web/static/help/configure_links.html index 61e64a3b9..be6490192 100644 --- a/web/static/help/configure_links.html +++ b/web/static/help/configure_links.html @@ -1,5 +1,23 @@ <htmL> <body> -<p>update these to your own</p> +<h1>About Mattermost</h1> +<p>Mattermost is a team communication service. It brings team real-time messaging and file sharing into one place, with easy archiving and search, accessible across PCs and phones. +</p> +<p>We built Mattermost to help teams focus on what matters most to them. It works for us, we hope it works for you too. + +Learn more, or download the source code from <a href=http://mattermost.com>http://mattermost.com</a>.</p> + +<h1>How to update this link</h1> +<p>In the source code, search for "config.js" and update the links pointing to this page to whatever policies and product description you prefer. +</p> + +<h1>Join the community</h1> +<p>To take part in the community building Mattermost, please consider sharing comments, feature requests, votes, and contributions. If you like the project, please Tweet about us at <a href=https://twitter.com/mattermosthq>@mattermosthq</a>.</p> + +<p>Here's some links to get started:<br> +<li><a href=http://bit.ly/1dHmQqX>Mattermost source code and install instructions</a></li> +<li><a href=http://bit.ly/1JUDoZ3>Mattermost Feature Request and Voting Site</a> </li> +<li><a href=http://bit.ly/1MH9HKa>Mattermost Issue Tracker for reporting bugs</a></li> +</p> </body> -</html>
\ No newline at end of file +</html> diff --git a/web/templates/signup_team.html b/web/templates/signup_team.html index e2b9bc1ad..f4e73f0a1 100644 --- a/web/templates/signup_team.html +++ b/web/templates/signup_team.html @@ -8,7 +8,7 @@ <div class="col-sm-12"> <div class="signup-team__container"> <img class="signup-team-logo" src="/static/images/logo.png" /> - <h4>{{ .SiteName }} is free for an unlimited time, for unlimited users. </h4> + <h4>{{ .SiteName }} is free for an unlimited time, for unlimited users. </h4> <div id="signup-team"></div> <a class="signup-team-login" href="/login">or Sign In</a> </div> |