Skip to content

Commit

Permalink
Merge pull request #235 from EllisLab/bug/remove-ellislab-from-installer
Browse files Browse the repository at this point in the history
  • Loading branch information
obfuscode committed Apr 27, 2020
2 parents 1f0eaad + b2f8f9c commit 1857b92
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 13 deletions.
4 changes: 2 additions & 2 deletions system/ee/installer/language/english/channel_entry_lang.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Thank you for choosing ExpressionEngine! This entry contains helpful resources to help you <a href="https://docs.expressionengine.com/latest/intro/getting_the_most.html">get the most from ExpressionEngine</a> and the EllisLab Community.
Thank you for choosing ExpressionEngine! This entry contains helpful resources to help you <a href="https://docs.expressionengine.com/latest/intro/getting_the_most.html">get the most from ExpressionEngine</a> and the ExpressionEngine Community.

<strong>Learning resources:</strong>

Expand All @@ -10,4 +10,4 @@

Welcome to our community,

<span style="font-size:16px;">The EllisLab Team</span>
<span style="font-size:16px;">The ExpressionEngine Team</span>
4 changes: 2 additions & 2 deletions system/ee/installer/language/english/installer_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

// Share Analytics
'share_analytics' => 'I want to share analytics with the ExpressionEngine Development Team',
'share_analytics_desc' => 'EllisLab asks users to help improve ExpressionEngine by occasionally <a href="' . DOC_URL . 'cp/settings/security-privacy.html#share-analytics-with-the-expressionengine-development-team" rel="external noreferrer">providing analytics, diagnostic, and usage information</a>.',
'share_analytics_desc' => 'Packet Tide asks users to help improve ExpressionEngine by occasionally <a href="' . DOC_URL . 'cp/settings/security-privacy.html#share-analytics-with-the-expressionengine-development-team" rel="external noreferrer">providing analytics, diagnostic, and usage information</a>.',

'start_installation' => 'Install',

Expand Down Expand Up @@ -137,7 +137,7 @@
'would_you_recommend' => 'How likely is it that you will recommend ExpressionEngine to a colleague or friend?',
'unlikely' => 'Unlikely',
'highly_likely' => 'Highly Likely',
'additional_comments' => 'What could ExpressionEngine or EllisLab do to delight you?',
'additional_comments' => 'What could ExpressionEngine or Packet Tide do to delight you?',

);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<footer class="row">
<section class="w-8">
<p>&copy;{current_time format='%Y'}, all rights reserved. Built with <a href="https://ellislab.com/" rel="external">ExpressionEngine&reg;</a></p>
<p>&copy;{current_time format='%Y'}, all rights reserved. Built with <a href="https://expressionengine.com/" rel="external">ExpressionEngine&reg;</a></p>
</section>
<section class="w-8">
{!-- appears in both header and footer, so a snippet is used to keep it DRY --}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ <h1><a href="{homepage}"><b>{site_name}</b> Website</a></h1>
<section class="footer-content">
{!-- appears in both header and footer, so a snippet is used to keep it DRY --}
{snp_main_nav}
<p>&copy;{current_time format='%Y'}, all rights reserved. Built with <a href="https://ellislab.com/" rel="external">ExpressionEngine&reg;</a></p>
<p>&copy;{current_time format='%Y'}, all rights reserved. Built with <a href="https://expressionengine.com/" rel="external">ExpressionEngine&reg;</a></p>
</section>
</footer>
</section>
Expand Down
13 changes: 7 additions & 6 deletions system/ee/installer/updates/ud_6_00_00.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<?php
/**
* ExpressionEngine (https://expressionengine.com)
*
* @link https://expressionengine.com/
* @copyright Copyright (c) 2003-2017, EllisLab, Inc. (https://ellislab.com)
* @license https://expressionengine.com/license
*/
* This source file is part of the open source project
* ExpressionEngine (https://expressionengine.com)
*
* @link https://expressionengine.com/
* @copyright Copyright (c) 2003-2020, Packet Tide, LLC (https://packettide.com)
* @license https://expressionengine.com/license Licensed under Apache License, Version 2.0
*/

namespace EllisLab\ExpressionEngine\Updater\Version_6_0_0;

Expand Down
2 changes: 1 addition & 1 deletion system/ee/installer/views/container.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</div>
<section class="bar">
<p class="left"><a href="https://expressionengine.com/" rel="external"><b>ExpressionEngine</b></a></p>
<p class="right">&copy;<?=date('Y')?> <a href="https://ellislab.com/" rel="external">EllisLab</a> Corp.</p>
<p class="right">&copy;<?=date('Y')?> <a href="https://packettide.com/" rel="external">Packet Tide</a>, LLC</p>
</section>
</section>

Expand Down

0 comments on commit 1857b92

Please sign in to comment.