Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CDN update #1647

Closed
wants to merge 5 commits into from
Closed

CDN update #1647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5db6abf
CDN Bootstrap, jquery and Font Awesome
DoctorAlchemy Apr 28, 2017
936e6b3
CDN Bootstrap, and Font Awesome (Backstage)
DoctorAlchemy Apr 28, 2017
cf62208
CDN Bootstrap, and jquery (Backstage)
DoctorAlchemy Apr 28, 2017
673696c
Update Copyright to 2017 (Backstage)
DoctorAlchemy Apr 28, 2017
2f6820a
Bootstrap, jquery and Font Awesome version update
DoctorAlchemy Apr 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions backstage/about.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* Copyright (C) 2013-2016 Luna
* Copyright (C) 2013-2017 Luna
* Based on code by FluxBB copyright (C) 2008-2012 FluxBB
* Based on code by Rickard Andersson copyright (C) 2002-2008 PunBB
* Licensed under GPLv2 (http://getluna.org/license.php)
Expand Down Expand Up @@ -106,7 +106,7 @@
</section>
</div>
<div class="panel-footer">
<p><?php printf(__('Luna is developed by the %s. Copyright %s. Released under the GPLv2 license.', 'luna'), '<a href="http://getluna.org/">Luna Group</a>', '2013-2016') ?></p>
<p><?php printf(__('Luna is developed by the %s. Copyright %s. Released under the GPLv2 license.', 'luna'), '<a href="http://getluna.org/">Luna Group</a>', '2013-2017') ?></p>
</div>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions backstage/footer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* Copyright (C) 2013-2016 Luna
* Copyright (C) 2013-2017 Luna
* Based on code by FluxBB copyright (C) 2008-2012 FluxBB
* Based on code by Rickard Andersson copyright (C) 2002-2008 PunBB
* Licensed under GPLv2 (http://getluna.org/license.php)
Expand Down Expand Up @@ -43,8 +43,8 @@
?>
<span class="pull-right"><?php printf(__('Powered by %s', 'luna'), ' <a href="http://getluna.org/">Luna '.$luna_config['o_cur_version'].'</a>') ?> '<i><?php echo Version::LUNA_CODE_NAME ?></i>' &middot; <?php echo Version::LUNA_CORE_VERSION ?></span>
</footer>
<script src="../vendor/js/jquery.min.js"></script>
<script src="../vendor/js/bootstrap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.4/jquery.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
<script src="../vendor/js/colours.min.js"></script>
<script language="javascript">
var flat_palette = [
Expand Down
6 changes: 3 additions & 3 deletions backstage/header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* Copyright (C) 2013-2016 Luna
* Copyright (C) 2013-2017 Luna
* Based on code by FluxBB copyright (C) 2008-2012 FluxBB
* Based on code by Rickard Andersson copyright (C) 2002-2008 PunBB
* Licensed under GPLv2 (http://getluna.org/license.php)
Expand Down Expand Up @@ -84,8 +84,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
<link rel="stylesheet" href="../vendor/css/bootstrap.min.css">
<link rel="stylesheet" href="../vendor/css/font-awesome.min.css">
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+ <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
<link rel="stylesheet" type="text/css" href="css/style.css" />
<link rel="stylesheet" type="text/css" href="css/accents/<?php echo $luna_user['accent'] ?>.css" />
<?php
Expand Down
10 changes: 5 additions & 5 deletions backstage/update.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,15 +183,15 @@
<td><?php echo $luna_config['o_database_revision']; ?></td>
</tr>
<tr>
<td><?php _e('Bootstrap version', 'luna') ?></td>
<td>3.3.6</td>
<td><?php _e('Bootstrap CDN version', 'luna') ?></td>
<td>3.3.7</td>
</tr>
<tr>
<td><?php _e('Font Awesome version', 'luna') ?></td>
<td>4.6.3</td>
<td><?php _e('Font Awesome CDN version', 'luna') ?></td>
<td>4.7.0</td>
</tr>
<tr>
<td><?php _e('jQuery version', 'luna') ?></td>
<td><?php _e('jQuery CDN version', 'luna') ?></td>
<td>2.2.4</td>
</tr>
</tbody>
Expand Down
10 changes: 5 additions & 5 deletions themes/Fifteen/views/header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<html class="<?php echo check_style_mode() ?>">
<head>
<?php load_meta(); ?>
<link rel="stylesheet" type="text/css" href="vendor/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/css/font-awesome.min.css">
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
<link rel="stylesheet" type="text/css" href="vendor/css/prism.css">
<?php load_css(); ?>
<script src="vendor/js/jquery.min.js"></script>
<script src="vendor/js/bootstrap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.4/jquery.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
<script src="vendor/js/prism.js"></script>
<style>
<?php if ($luna_config['o_use_custom_css']) {
Expand Down Expand Up @@ -40,4 +40,4 @@
</div>
</div>
</div>
</div>
</div>