Skip to content

Commit

Permalink
Updated Gitter links to Slack
Browse files Browse the repository at this point in the history
  • Loading branch information
BlythMeister committed Jul 27, 2018
1 parent e3ace9d commit ce8b473
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 12 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Gallifrey
=========

[![Gitter](https://img.shields.io/badge/Gitter-Join%20Chat-green.svg?style=flat)](https://gitter.im/BlythMeister/Gallifrey)
[![Slack](https://img.shields.io/badge/slack-join-green.svg?logo=slack&style=flat)](https://join.slack.com/t/gallifreyapp/shared_invite/enQtNDA2MDU3OTYwNDgyLTc3YjBjOTc2MDkxNWM3MWYxNDgwNTMyMWI5ZmRhYmZiZWRlOGVkMGQwZDFlOTJlN2I4ZGI5MmExZGY5ZmM2YjI)
[![Build status](https://ci.appveyor.com/api/projects/status/r7pncss5a8qg3jj0/branch/master?svg=true)](https://ci.appveyor.com/project/BlythMeister/gallifrey/branch/master)
[![Release](https://img.shields.io/github/release/BlythMeister/Gallifrey.svg?style=flat)](https://github.com/BlythMeister/Gallifrey/releases/latest)
[![Issues](https://img.shields.io/github/issues/BlythMeister/Gallifrey.svg?style=flat)](https://github.com/BlythMeister/Gallifrey/issues)
Expand Down Expand Up @@ -34,7 +34,7 @@ Support
=========

You can get app support via [twitter](https://twitter.com/GallifreyApp) or via [email](mailto:support@GallifreyApp.co.uk).
There is also a Gitter chat room (https://gitter.im/BlythMeister/Gallifrey).
There is also a [Slack workspace](https://join.slack.com/t/gallifreyapp/shared_invite/enQtNDA2MDU3OTYwNDgyLTc3YjBjOTc2MDkxNWM3MWYxNDgwNTMyMWI5ZmRhYmZiZWRlOGVkMGQwZDFlOTJlN2I4ZGI5MmExZGY5ZmM2YjI).
We are using GitHub issues to maintain a backlog and track bugs, so feel free to raise issues there (https://github.com/BlythMeister/Gallifrey/issues)

Contributions
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ skip_commits:
- docs/*
- '**/*.html'
- '**/*.md'
version: '3.11.0.{build}'
version: '3.11.1.{build}'
skip_tags: true
image: Visual Studio 2017
clone_folder: c:\project\gallifrey
Expand Down
1 change: 1 addition & 0 deletions docs/_includes/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ <h4>About Us</h4>
<a href="https://www.twitter.com/GallifreyApp" class="fab fa-twitter" target="_blank"></a>
<a href="https://github.com/BlythMeister/Gallifrey" class="fab fa-github" target="_blank"></a>
<a href="mailto:support@GallifreyApp.co.uk" class="far fa-envelope" target="_blank"></a>
<a href="https://join.slack.com/t/gallifreyapp/shared_invite/enQtNDA2MDU3OTYwNDgyLTc3YjBjOTc2MDkxNWM3MWYxNDgwNTMyMWI5ZmRhYmZiZWRlOGVkMGQwZDFlOTJlN2I4ZGI5MmExZGY5ZmM2YjI" class="far fa-slack" target="_blank"></a>
</div>
</div>
<div class="middleItem">
Expand Down
5 changes: 5 additions & 0 deletions docs/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,11 @@ body {
color: #FFFFFF;
}

.far.fa-slack {
background: #000000;
color: #FFFFFF;
}

a.fa:hover {
opacity: 0.7;
text-decoration: none;
Expand Down
2 changes: 1 addition & 1 deletion docs/help/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: Proving support on Twitter, Email and through GitHub we are here to

You can get app support via <a href="https://twitter.com/GallifreyApp" target="_blank">twitter</a> or via <a href="mailto:support@GallifreyApp.co.uk" target="_blank">email</a>.

If you would like to chat to someone to get assistance, we have a public <a href="https://gitter.im/BlythMeister/Gallifrey" target="_blank">gitter</a> channel you can use.
If you would like to chat to someone to get assistance, we have a public <a href="https://join.slack.com/t/gallifreyapp/shared_invite/enQtNDA2MDU3OTYwNDgyLTc3YjBjOTc2MDkxNWM3MWYxNDgwNTMyMWI5ZmRhYmZiZWRlOGVkMGQwZDFlOTJlN2I4ZGI5MmExZGY5ZmM2YjI" target="_blank">slack</a> workspace you can use.

We are using GitHub issues to maintain a backlog and track bugs, so feel free to raise issues there <a href="https://github.com/BlythMeister/Gallifrey/issues" target="_blank">https://github.com/BlythMeister/Gallifrey/issues</a>

Expand Down
7 changes: 7 additions & 0 deletions src/Gallifrey.UI.Modern/ChangeLog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,13 @@
<Other>Update Exceptionless API Key</Other>
</Others>
</Version>
<Version Number="3.11.1.0" Name="">
<Features>
<Feature>Updated Gitter links to Slack</Feature>
</Features>
<Bugs />
<Others/>
</Version>
<!--
Template for VNext if not present above
<Version Number="0.0.0.0" Name="Pre-Release">
Expand Down
2 changes: 1 addition & 1 deletion src/Gallifrey.UI.Modern/MainViews/BottomBar.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<DockPanel HorizontalAlignment="Stretch" Background="{DynamicResource AccentColorBrush}">
<TextBlock Foreground="{DynamicResource IdealForegroundColorBrush}" Margin="5,0,0,0" VerticalAlignment="Center">
Contact Us By <Hyperlink NavigateUri="https://twitter.com/GallifreyApp" Foreground="{DynamicResource IdealForegroundColorBrush}" RequestNavigate="Hyperlink_RequestNavigate">Twitter</Hyperlink>, <Hyperlink NavigateUri="https://gitter.im/BlythMeister/Gallifrey" Foreground="{DynamicResource IdealForegroundColorBrush}" RequestNavigate="Hyperlink_RequestNavigate">Gitter</Hyperlink> Or <Hyperlink NavigateUri="mailto:support@gallifreyapp.co.uk?subject=Gallifrey App Contact" Foreground="{DynamicResource IdealForegroundColorBrush}" RequestNavigate="Hyperlink_RequestNavigate">E-Mail</Hyperlink>. Raise Or Fix A Bug On <Hyperlink NavigateUri="https://github.com/BlythMeister/Gallifrey" Foreground="{DynamicResource IdealForegroundColorBrush}" RequestNavigate="Hyperlink_RequestNavigate">GitHub</Hyperlink>.
Contact Us By <Hyperlink NavigateUri="https://twitter.com/GallifreyApp" Foreground="{DynamicResource IdealForegroundColorBrush}" RequestNavigate="Hyperlink_RequestNavigate">Twitter</Hyperlink>, <Hyperlink NavigateUri="https://join.slack.com/t/gallifreyapp/shared_invite/enQtNDA2MDU3OTYwNDgyLTc3YjBjOTc2MDkxNWM3MWYxNDgwNTMyMWI5ZmRhYmZiZWRlOGVkMGQwZDFlOTJlN2I4ZGI5MmExZGY5ZmM2YjI" Foreground="{DynamicResource IdealForegroundColorBrush}" RequestNavigate="Hyperlink_RequestNavigate">Slack</Hyperlink> Or <Hyperlink NavigateUri="mailto:support@gallifreyapp.co.uk?subject=Gallifrey App Contact" Foreground="{DynamicResource IdealForegroundColorBrush}" RequestNavigate="Hyperlink_RequestNavigate">E-Mail</Hyperlink>. Raise Or Fix A Bug On <Hyperlink NavigateUri="https://github.com/BlythMeister/Gallifrey" Foreground="{DynamicResource IdealForegroundColorBrush}" RequestNavigate="Hyperlink_RequestNavigate">GitHub</Hyperlink>.
</TextBlock>
<TextBlock HorizontalAlignment="Right" Margin="0,0,5,0" Foreground="{DynamicResource IdealForegroundColorBrush}" VerticalAlignment="Center">
Please Help Support Gallifrey By <Hyperlink NavigateUri="https://www.gallifreyapp.co.uk/donations" Foreground="{DynamicResource IdealForegroundColorBrush}" RequestNavigate="Hyperlink_RequestNavigate">Donating</Hyperlink>
Expand Down
4 changes: 2 additions & 2 deletions src/Gallifrey.UI.Modern/MainViews/ControlButtons.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@
</Button.ToolTip>
<iconPacks:PackIconMaterial Kind="At" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Button>
<Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="GitterButton">
<Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="SlackButton">
<Button.ToolTip>
<TextBlock>
Chat With Users Or Ask For Help On Gitter<LineBreak/>CTRL + F4
Chat With Users Or Ask For Help On Slack<LineBreak/>CTRL + F4
</TextBlock>
</Button.ToolTip>
<iconPacks:PackIconMaterial Kind="Message" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
Expand Down
6 changes: 3 additions & 3 deletions src/Gallifrey.UI.Modern/MainViews/ControlButtons.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -281,10 +281,10 @@ private void PayPalButton(object sender, RoutedEventArgs e)
Process.Start(new ProcessStartInfo("https://www.gallifreyapp.co.uk/donations"));
}

private void GitterButton(object sender, RoutedEventArgs e)
private void SlackButton(object sender, RoutedEventArgs e)
{
ModelHelpers.Gallifrey.TrackEvent(TrackingType.ContactClick);
Process.Start(new ProcessStartInfo("https://gitter.im/BlythMeister/Gallifrey"));
Process.Start(new ProcessStartInfo("https://join.slack.com/t/gallifreyapp/shared_invite/enQtNDA2MDU3OTYwNDgyLTc3YjBjOTc2MDkxNWM3MWYxNDgwNTMyMWI5ZmRhYmZiZWRlOGVkMGQwZDFlOTJlN2I4ZGI5MmExZGY5ZmM2YjI"));
}

private void GitHubButton(object sender, RoutedEventArgs e)
Expand All @@ -311,7 +311,7 @@ private void ModelHelpersOnRemoteButtonTrigger(object sender, RemoteButtonTrigge
case RemoteButtonTrigger.Info: InfoButton(this, null); break;
case RemoteButtonTrigger.Twitter: TwitterButton(this, null); break;
case RemoteButtonTrigger.Email: EmailButton(this, null); break;
case RemoteButtonTrigger.Gitter: GitterButton(this, null); break;
case RemoteButtonTrigger.Slack: SlackButton(this, null); break;
case RemoteButtonTrigger.GitHub: GitHubButton(this, null); break;
case RemoteButtonTrigger.PayPal: PayPalButton(this, null); break;

Expand Down
2 changes: 1 addition & 1 deletion src/Gallifrey.UI.Modern/MainViews/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ private void MainWindow_KeyDown(object sender, KeyEventArgs e)
case Key.F1: trigger = RemoteButtonTrigger.Info; break;
case Key.F2: trigger = RemoteButtonTrigger.Twitter; break;
case Key.F3: trigger = RemoteButtonTrigger.Email; break;
case Key.F4: trigger = RemoteButtonTrigger.Gitter; break;
case Key.F4: trigger = RemoteButtonTrigger.Slack; break;
case Key.F5: trigger = RemoteButtonTrigger.GitHub; break;
case Key.F6: trigger = RemoteButtonTrigger.PayPal; break;
default: return;
Expand Down
2 changes: 1 addition & 1 deletion src/Gallifrey.UI.Modern/Models/RemoteButtonTrigger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public enum RemoteButtonTrigger
Email,
GitHub,
PayPal,
Gitter,
Slack,
AddToFill,
Save
}
Expand Down

0 comments on commit ce8b473

Please sign in to comment.