Skip to content

Commit

Permalink
Merge pull request #1392 from scott/dev/2.6/prepare-2.6.0
Browse files Browse the repository at this point in the history
Update version, add new copyright notice
  • Loading branch information
scott authored Aug 20, 2019
2 parents d33f171 + 1395a09 commit dd258c0
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 1 deletion.
9 changes: 9 additions & 0 deletions UPDATING.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@ Whether you run the open source community edition or the cloud edition, start by

4. Restart the webserver.

### Helpy Pro Edition

Helpy Pro is a packaged version, which greatly simplifies the process of updating. Note that updated versions typically are not avaiable to Pro until several days after the community edition release. Update using the apt package manager:

1. `sudo apt-get update`
2. `sudo apt-get upgrade`
3. `sudo helpy run db:migrate`
4. `sudo helpy restart`

### Cloud Edition

If you are running the cloud edition, perform the following additional steps:
Expand Down
13 changes: 13 additions & 0 deletions app/themes/flat/views/layouts/_head.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
<!-- <title><%= @title_tag || AppSettings['settings.site_name'] %></title> -->
<title><%= content_for(:title) ? content_for(:title) : AppSettings['settings.site_name'] %></title>
<!--
HELPY VERSION: <%= APP_VERSION %>
========================================
Copyright (c) <%= Time.now.year %> Helpy.io, LLC, and Contributors.
Full license at https://github.com/helpyio/helpy/blob/master/LICENSE
Note: If this install is running Helpy Cloud, Bot, Pro, Chat or other
commercial or third party extensions those may be licensed differently.
See https://support.helpy.io for more information.
REMOVAL OF THIS COPYRIGHT NOTICE IS EXPRESSLY PROHIBITED BY THE ABOVE
REFERENCED LICENSE
-->

<meta http-equiv="content-type" content="text/xhtml; charset=utf-8" />
<meta http-equiv="imagetoolbar" content="no" />
Expand Down
13 changes: 13 additions & 0 deletions app/themes/light/views/layouts/_head.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
<!-- <title><%= @title_tag || AppSettings['settings.site_name'] %></title> -->
<title><%= content_for(:title) ? content_for(:title) : AppSettings['settings.site_name'] %></title>
<!--
HELPY VERSION: <%= APP_VERSION %>
========================================
Copyright (c) <%= Time.now.year %> Helpy.io, LLC, and Contributors.
Full license at https://github.com/helpyio/helpy/blob/master/LICENSE
Note: If this install is running Helpy Cloud, Bot, Pro, Chat or other
commercial or third party extensions those may be licensed differently.
See https://support.helpy.io for more information.
REMOVAL OF THIS COPYRIGHT NOTICE IS EXPRESSLY PROHIBITED BY THE ABOVE
REFERENCED LICENSE
-->

<meta http-equiv="content-type" content="text/xhtml; charset=utf-8" />
<meta http-equiv="imagetoolbar" content="no" />
Expand Down
13 changes: 13 additions & 0 deletions app/themes/nordic/views/layouts/_head.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
<!-- <title><%= @title_tag || AppSettings['settings.site_name'] %></title> -->
<title><%= content_for(:title) ? content_for(:title) : AppSettings['settings.site_name'] %></title>
<!--
HELPY VERSION: <%= APP_VERSION %>
========================================
Copyright (c) <%= Time.now.year %> Helpy.io, LLC, and Contributors.
Full license at https://github.com/helpyio/helpy/blob/master/LICENSE
Note: If this install is running Helpy Cloud, Bot, Pro, Chat or other
commercial or third party extensions those may be licensed differently.
See https://support.helpy.io for more information.
REMOVAL OF THIS COPYRIGHT NOTICE IS EXPRESSLY PROHIBITED BY THE ABOVE
REFERENCED LICENSE
-->

<meta http-equiv="content-type" content="text/xhtml; charset=utf-8" />
<meta http-equiv="imagetoolbar" content="no" />
Expand Down
13 changes: 13 additions & 0 deletions app/themes/singular/views/layouts/_head.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
<!-- <title><%= @title_tag || AppSettings['settings.site_name'] %></title> -->
<title><%= content_for(:title) ? content_for(:title) : AppSettings['settings.site_name'] %></title>
<!--
HELPY VERSION: <%= APP_VERSION %>
========================================
Copyright (c) <%= Time.now.year %> Helpy.io, LLC, and Contributors.
Full license at https://github.com/helpyio/helpy/blob/master/LICENSE
Note: If this install is running Helpy Cloud, Bot, Pro, Chat or other
commercial or third party extensions those may be licensed differently.
See https://support.helpy.io for more information.
REMOVAL OF THIS COPYRIGHT NOTICE IS EXPRESSLY PROHIBITED BY THE ABOVE
REFERENCED LICENSE
-->

<meta http-equiv="content-type" content="text/xhtml; charset=utf-8" />
<meta http-equiv="imagetoolbar" content="no" />
Expand Down
13 changes: 13 additions & 0 deletions app/views/layouts/_head.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
<!-- <title><%= @title_tag || AppSettings['settings.site_name'] %></title> -->
<title><%= content_for(:title) ? content_for(:title) : AppSettings['settings.site_name'] %></title>
<!--
HELPY VERSION: <%= APP_VERSION %>
========================================
Copyright (c) <%= Time.now.year %> Helpy.io, LLC, and Contributors.
Full license at https://github.com/helpyio/helpy/blob/master/LICENSE
Note: If this install is running Helpy Cloud, Bot, Pro, Chat or other
commercial or third party extensions those may be licensed differently.
See https://support.helpy.io for more information.
REMOVAL OF THIS COPYRIGHT NOTICE IS EXPRESSLY PROHIBITED BY THE ABOVE
REFERENCED LICENSE
-->

<meta http-equiv="content-type" content="text/xhtml; charset=utf-8" />
<meta http-equiv="imagetoolbar" content="no" />
Expand Down
2 changes: 1 addition & 1 deletion config/environment.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
Rails.application.initialize!

# Get the current tag version
VERSION = '2.5.0'
VERSION = '2.6.0'
REVISION = `git log --pretty=format:'%h' -n 1`
APP_VERSION = "#{VERSION}:#{REVISION}"

0 comments on commit dd258c0

Please sign in to comment.