jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 5 Packages Wiki Activity Actions

Merge branch 'feature/mapbox-links-consolidation' into develop

Browse source
This commit is contained in:
Jonny Barnes 2016-09-14 18:35:02 +01:00
commit 62b96e086a
8 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelog.md
View file

@ -1,8 +1,9 @@
# Changelog # Changelog
## Version {next} ## Version {next}
- update linked GPG key - update linked GPG key (issue#7)
- Added `integrity` values to external assets - Added `integrity` values to external assets (issue#10)
- Move mapbox links into own sub-view (issue#11)
## Version 0.0.10 (2016-09-10) ## Version 0.0.10 (2016-09-10)
- Add an artisan command for sensiolab’s security check - Add an artisan command for sensiolab’s security check

3
resources/views/admin/newnote.blade.php
View file

@ -22,8 +22,7 @@ New Note « Admin CP
@stop @stop
@section('scripts') @section('scripts')
<link rel="stylesheet" href="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.css" integrity="sha384-ZDBUvY/seENyR1fE6u4p1oMFfsKVjIlkiB6TrCdXjeZVPlYanREcmZopTV8WFZ0q" crossorigin="anonymous"> @include('templates.mapbox-links')
<script src="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.js" integrity="sha384-GgNQAMOzWcL0fePJqogHh8dCjsGKZpkBNgm3einGr0aUb9kcXvr9JeU/PDf5knja" crossorigin="anonymous"></script>
<script src="/assets/js/newnote.js"></script> <script src="/assets/js/newnote.js"></script>
<script src="/assets/bower/store2.min.js"></script> <script src="/assets/bower/store2.min.js"></script>

3
resources/views/admin/newplace.blade.php
View file

@ -19,8 +19,7 @@ New Place « Admin CP
@stop @stop
@section('scripts') @section('scripts')
<link rel="stylesheet" href="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.css" integrity="sha384-ZDBUvY/seENyR1fE6u4p1oMFfsKVjIlkiB6TrCdXjeZVPlYanREcmZopTV8WFZ0q" crossorigin="anonymous"> @include('templates.mapbox-links')
<script src="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.js" integrity="sha384-GgNQAMOzWcL0fePJqogHh8dCjsGKZpkBNgm3einGr0aUb9kcXvr9JeU/PDf5knja" crossorigin="anonymous"></script>
<script src="/assets/js/newplace.js"></script> <script src="/assets/js/newplace.js"></script>
@stop @stop

3
resources/views/allnotes.blade.php
View file

@ -19,8 +19,7 @@ Notes « Jonny Barnes
@stop @stop
@section('scripts') @section('scripts')
<link rel="stylesheet" href="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.css" integrity="sha384-ZDBUvY/seENyR1fE6u4p1oMFfsKVjIlkiB6TrCdXjeZVPlYanREcmZopTV8WFZ0q" crossorigin="anonymous"> @include('templates.mapbox-links')
<script src="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.js" integrity="sha384-GgNQAMOzWcL0fePJqogHh8dCjsGKZpkBNgm3einGr0aUb9kcXvr9JeU/PDf5knja" crossorigin="anonymous"></script>
<script src="/assets/bower/Autolinker.min.js"></script> <script src="/assets/bower/Autolinker.min.js"></script>
<script src="/assets/js/links.js"></script> <script src="/assets/js/links.js"></script>

3
resources/views/micropubnewnotepage.blade.php
View file

@ -32,8 +32,7 @@ New Note « Jonny Barnes
@stop @stop
@section('scripts') @section('scripts')
<link rel="stylesheet" href="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.css" integrity="sha384-ZDBUvY/seENyR1fE6u4p1oMFfsKVjIlkiB6TrCdXjeZVPlYanREcmZopTV8WFZ0q" crossorigin="anonymous"> @include('templates.mapbox-links')
<script src="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.js" integrity="sha384-GgNQAMOzWcL0fePJqogHh8dCjsGKZpkBNgm3einGr0aUb9kcXvr9JeU/PDf5knja" crossorigin="anonymous"></script>
<script src="/assets/bower/fetch.js"></script> <script src="/assets/bower/fetch.js"></script>
<script src="/assets/bower/store2.min.js"></script> <script src="/assets/bower/store2.min.js"></script>

3
resources/views/singlenote.blade.php
View file

@ -31,8 +31,7 @@
@stop @stop
@section('scripts') @section('scripts')
<link rel="stylesheet" href="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.css" integrity="sha384-ZDBUvY/seENyR1fE6u4p1oMFfsKVjIlkiB6TrCdXjeZVPlYanREcmZopTV8WFZ0q" crossorigin="anonymous"> @include('templates.mapbox-links')
<script src="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.js" integrity="sha384-GgNQAMOzWcL0fePJqogHh8dCjsGKZpkBNgm3einGr0aUb9kcXvr9JeU/PDf5knja" crossorigin="anonymous"></script>
<script src="/assets/bower/Autolinker.min.js"></script> <script src="/assets/bower/Autolinker.min.js"></script>
<script src="/assets/js/links.js"></script> <script src="/assets/js/links.js"></script>

3
resources/views/singleplace.blade.php
View file

@ -14,8 +14,7 @@
@stop @stop
@section('scripts') @section('scripts')
<link rel="stylesheet" href="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.css" integrity="sha384-ZDBUvY/seENyR1fE6u4p1oMFfsKVjIlkiB6TrCdXjeZVPlYanREcmZopTV8WFZ0q" crossorigin="anonymous"> @include('templates.mapbox-links')
<script src="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.js" integrity="sha384-GgNQAMOzWcL0fePJqogHh8dCjsGKZpkBNgm3einGr0aUb9kcXvr9JeU/PDf5knja" crossorigin="anonymous"></script>
<script src="/assets/js/maps.js"></script> <script src="/assets/js/maps.js"></script>
@stop @stop

2
resources/views/templates/mapbox-links.blade.php Normal file
View file

@ -0,0 +1,2 @@
<link rel="stylesheet" href="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.css" integrity="sha384-ZDBUvY/seENyR1fE6u4p1oMFfsKVjIlkiB6TrCdXjeZVPlYanREcmZopTV8WFZ0q" crossorigin="anonymous">
<script src="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.js" integrity="sha384-GgNQAMOzWcL0fePJqogHh8dCjsGKZpkBNgm3einGr0aUb9kcXvr9JeU/PDf5knja" crossorigin="anonymous"></script>