Permalink
Browse files

Rename all re:dash/Re:dash to Readsh. Closes #1396.

  • Loading branch information...
1 parent 8d39ee4 commit 6f3ca1e01a8fb0dac1ec38bd0f9a5aa59b60daf8 @arikfr arikfr committed Dec 20, 2016
@@ -39,7 +39,7 @@ def send_invite_email(inviter, invited, invite_url, org):
context = dict(inviter=inviter, invited=invited, org=org, invite_url=invite_url)
html_content = render_template('emails/invite.html', **context)
text_content = render_template('emails/invite.txt', **context)
- subject = u"{} invited you to join Re:dash".format(inviter.name)
+ subject = u"{} invited you to join Redash".format(inviter.name)
send_mail.delay([invited.email], subject, html_content, text_content)
@@ -112,7 +112,7 @@ def custom_get_iter(self, obj):
return iter(obj)
def add_result_column(self, result, column_name, friendly_name, column_type):
- """Helper function to add columns inside a Python script running in re:dash in an easier way
+ """Helper function to add columns inside a Python script running in Redash in an easier way
Parameters:
:result dict: The result dict
View
@@ -64,7 +64,7 @@ def all_settings():
STATSD_PREFIX = os.environ.get('REDASH_STATSD_PREFIX', "redash")
STATSD_USE_TAGS = parse_boolean(os.environ.get('REDASH_STATSD_USE_TAGS', "false"))
-# Connection settings for re:dash's own database (where we store the queries, results, etc)
+# Connection settings for Redash's own database (where we store the queries, results, etc)
SQLALCHEMY_DATABASE_URI = os.environ.get("REDASH_DATABASE_URL", os.environ.get('DATABASE_URL', "postgresql:///postgres"))
SQLALCHEMY_TRACK_MODIFICATIONS = False
SQLALCHEMY_ECHO = False
@@ -5,15 +5,15 @@
<p class="intercom-align-left" style="line-height: 1.5; margin: 0 0 17px; text-align: left !important" align="left">Hi {{ invited.name }},</p>
<h2 class="intercom-align-left" style="color: #282F33; font-size: 18px; font-weight: bold; margin-bottom: 7px; margin-top: 30px; text-align: left !important" align="left">
{{ inviter.name }} (<a href="mailto:{{ inviter.email }}" target="_blank" style="border: none; color: #1251BA; outline: none !important">{{ inviter.email }}</a>)
- invited you to join the Re:dash account of {{ org.name }}.
+ invited you to join the Redash account of {{ org.name }}.
</h2>
<table class="intercom-container intercom-align-center" align="center" style="border-collapse: collapse; border-spacing: 0; margin: 17px auto; table-layout: fixed; text-align: center !important"><tr><td style="background: #0071b2; border: 1px none #dadada; border-radius: 3px; font-family: Helvetica, Arial, sans-serif; font-size: 16px; margin: 0; padding: 12px 35px; text-align: left; vertical-align: top" align="left" bgcolor="#0071b2" valign="top"><a class="intercom-h2b-button" target="_blank" href="{{ invite_url }}" style="background: #0071b2; border: none; border-radius: 3px; color: white; display: inline-block; font-size: 14px; font-weight: bold; outline: none !important; text-decoration: none">Setup Account</a></td></tr></table>
<p class="intercom-align-left" style="line-height: 1.5; margin: 0 0 17px; text-align: left !important" align="left">
<small>You may copy/paste this link into your browser: {{ invite_url }}</small>
</p>
<p class="intercom-align-left" style="line-height: 1.5; margin: 0 0 17px; text-align: left !important" align="left">
Your sign-in email is: {{ invited.email }}<br>
- Your Re:dash account is: <a href="{{ url_for('redash.index', org_slug=org.slug, _external=True) }}" target="_blank" style="border: none; color: #1251BA; outline: none !important">{{ url_for('redash.index', org_slug=org.slug, _external=True) }}</a>
+ Your Redash account is: <a href="{{ url_for('redash.index', org_slug=org.slug, _external=True) }}" target="_blank" style="border: none; color: #1251BA; outline: none !important">{{ url_for('redash.index', org_slug=org.slug, _external=True) }}</a>
</p>
{% endblock %}
@@ -1,10 +1,10 @@
Hi {{ invited.name }},
-{{ inviter.name }} ({{inviter.email}}) invited you to join the Re:dash account of {{org.name}}.
+{{ inviter.name }} ({{inviter.email}}) invited you to join the Redash account of {{org.name}}.
Use the following link to setup your account:
{{ invite_url }}
Your sign-in email: {{invited.email}}
-Your Re:dash account: {{ url_for('redash.index', org_slug=org.slug, _external=True) }}
+Your Redash account: {{ url_for('redash.index', org_slug=org.slug, _external=True) }}
@@ -1,5 +1,5 @@
<footer id="footer">
- <a href="http://redash.io">Re:dash</a> <span ng-bind="version"></span> <small ng-if="newVersionAvailable" ng-cloak class="ng-cloak"><a href="http://version.redash.io/">(New Re:dash version available)</a></small>
+ <a href="http://redash.io">Redash</a> <span ng-bind="version"></span> <small ng-if="newVersionAvailable" ng-cloak class="ng-cloak"><a href="http://version.redash.io/">(New Redash version available)</a></small>
<ul class="f-menu">
<li><a href="https://redash.io/help/">Documentation</a></li>
@@ -2,7 +2,7 @@
{% block content %}
-<h2>Welcome to Re:dash!</h2>
+<h2>Welcome to Redash!</h2>
<p class="lead">
{% if google_auth_url %}
To create your account, please choose a password or login with your Google account ({{ user.email }}).
@@ -166,7 +166,7 @@ cd /opt/redash/current
# TODO: generate temp password and print to screen
sudo -u redash bin/run ./manage.py users create --admin --password admin "Admin" "admin"
-# Create re:dash read only pg user & setup data source
+# Create Redash read only pg user & setup data source
pg_user_exists=0
sudo -u postgres psql postgres -tAc "SELECT 1 FROM pg_roles WHERE rolname='redash_reader'" | grep -q 1 || pg_user_exists=$?
if [ $pg_user_exists -ne 0 ]; then
@@ -180,7 +180,7 @@ if [ $pg_user_exists -ne 0 ]; then
sudo -u redash psql -c "grant select on events, queries, dashboards, widgets, visualizations, query_results to redash_reader;" redash
cd /opt/redash/current
- sudo -u redash bin/run ./manage.py ds new -n "re:dash metadata" -t "pg" -o "{\"user\": \"redash_reader\", \"password\": \"$REDASH_READER_PASSWORD\", \"host\": \"localhost\", \"dbname\": \"redash\"}"
+ sudo -u redash bin/run ./manage.py ds new -n "Redash Metadata" -t "pg" -o "{\"user\": \"redash_reader\", \"password\": \"$REDASH_READER_PASSWORD\", \"host\": \"localhost\", \"dbname\": \"redash\"}"
fi
@@ -24,4 +24,4 @@ $run_psql -c "grant select(id,name,type) ON data_sources to redash_reader;"
$run_psql -c "grant select(id,name) ON users to redash_reader;"
$run_psql -c "grant select on events, queries, dashboards, widgets, visualizations, query_results to redash_reader;"
-$run_redash /opt/redash/current/manage.py ds new "re:dash metadata" --type "pg" --options "{\"user\": \"redash_reader\", \"password\": \"redash_reader\", \"host\": \"postgres\", \"dbname\": \"postgres\"}"
+$run_redash /opt/redash/current/manage.py ds new "Redash Metadata" --type "pg" --options "{\"user\": \"redash_reader\", \"password\": \"redash_reader\", \"host\": \"postgres\", \"dbname\": \"postgres\"}"
@@ -155,7 +155,7 @@ cd /opt/redash/current
# TODO: generate temp password and print to screen
sudo -u redash bin/run ./manage.py users create --admin --password admin "Admin" "admin"
-# Create re:dash read only pg user & setup data source
+# Create Redash read only pg user & setup data source
pg_user_exists=0
sudo -u postgres psql postgres -tAc "SELECT 1 FROM pg_roles WHERE rolname='redash_reader'" | grep -q 1 || pg_user_exists=$?
if [ $pg_user_exists -ne 0 ]; then
@@ -1,4 +1,4 @@
-description "Start re:dash Docker containers"
+description "Start Redash Docker containers"
start on filesystem and started docker
stop on runlevel [!2345]
respawn

0 comments on commit 6f3ca1e

Please sign in to comment.