aheathershaw/blue-twilight
1
0
Fork 0
Code Issues 32 Pull Requests Releases 15 Wiki Activity

Merge social media login #98

Merged
aheathershaw merged 9 commits from feature/5-social-media-sso into master 2018-08-18 08:57:23 +01:00
Conversation 0 Commits 9 Files Changed 19 +7 -7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5926bbcb33 - Show all commits

8
resources/lang/en/admin.php
View File

@ -7,12 +7,12 @@ return [
'about' => [ 'about' => [
'current_version' => 'You are running version', 'current_version' => 'You are running version',
'date_published_label' => 'Release date:', 'date_published_label' => 'Release date:',
'github_link' => 'Github Project Website', 'intro' => 'Blue Twilight is an <a href="https://andysh.uk/software/" target="_blank">App by Andy</a>.',
'intro' => 'Blue Twilight is an <a href="https://www.andyheathershaw.uk/software/" target="_blank">App by Andy</a>.', 'intro_2' => 'It is made with <i class="fa fa-heart text-red"></i> in the UK by software developer <a href="https://andysh.uk" target="_blank">Andy Heathershaw</a>.',
'intro_2' => 'It is made with <i class="fa fa-heart text-red"></i> in the UK by software developer <a href="https://www.andyheathershaw.uk" target="_blank">Andy Heathershaw</a>.', 'latest_version_loading' => 'Checking for the latest release...',
'latest_version_loading' => 'Checking for the latest release on Github...',
'licence_header' => 'Licence', 'licence_header' => 'Licence',
'links_header' => 'Useful Links', 'links_header' => 'Useful Links',
'project_website_link' => 'Project Website',
'title' => 'About Blue Twilight', 'title' => 'About Blue Twilight',
'up_to_date' => 'Good job - your installation of Blue Twilight is up-to-date!', 'up_to_date' => 'Good job - your installation of Blue Twilight is up-to-date!',
'update_available' => 'An update is available to Blue Twilight.', 'update_available' => 'An update is available to Blue Twilight.',

6
resources/views/themes/base/admin/about.blade.php
View File

@ -27,9 +27,9 @@
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">@lang('admin.about.links_header')</a> <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">@lang('admin.about.links_header')</a>
<div class="dropdown-menu"> <div class="dropdown-menu">
<a class="dropdown-item" href="https://showmy.photos" target="_blank">@lang('admin.about.website_link')</a> <a class="dropdown-item" href="https://andysh.uk/software/blue-twilight-php-photo-gallery/" target="_blank">@lang('admin.about.website_link')</a>
<a class="dropdown-item" href="https://www.andyheathershaw.uk/software/blue-twilight-php-photo-gallery/manual/" target="_blank">@lang('admin.about.user_guide_link')</a> <a class="dropdown-item" href="https://andysh.uk/software/blue-twilight-php-photo-gallery/manual/" target="_blank">@lang('admin.about.user_guide_link')</a>
<a class="dropdown-item" href="https://github.com/pandy06269/blue-twilight" target="_blank">@lang('admin.about.github_link')</a> <a class="dropdown-item" href="https://apps.andysh.uk/aheathershaw/blue-twilight" target="_blank">@lang('admin.about.project_website_link')</a>
</div> </div>
</li> </li>
</ul> </ul>