Skip to content

Cdn via https #2

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

Open
pjwickman wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Cdn via https #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
659f821
setting up citizen connect
May 11, 2016
9b8c524
use a CDN that allows https
May 11, 2016
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
7 changes: 7 additions & 0 deletions .htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
RewriteEngine Off
RewriteBase /

# Secure!
RewriteCond %{HTTPS} !=on
RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]

Binary file modified api/data.sqlite
View file
Open in desktop
Binary file not shown.
12 changes: 6 additions & 6 deletions config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,26 @@
]
},
"app": {
"title": "Damage Reporter",
"title": "Mapfeeder Connect",
"description": "",
"author": ""
},
"navbar": {
"icon": "",
"title": "Building Damage Reporter"
"title": "Mapfeeder Connect"
},
"twitter": {
"via": "fulcrumapp",
"tweet": "Check it out!"
},
"text": {
"newItem": "Damage Report",
"newItem": "Submit An Issue",
"downloadFileName": "damage"
},
"about": {
"showAtStartup": false,
"title": "Post Storm Building Damage Reporter",
"text": "This is a simple citizen-driven app for quick reporting of visible damage to a building after a storm or other disaster. Assess the severity of the damage while including photos, documenting damage type, and more. Documenting structural hazards is critical for the safety of first responders on the scene assisting with cleanup and humanitarian aid."
"title": "Post Issue",
"text": "This is a simple citizen-driven app for quick reporting of issues they find in their city."
},
"sidebar": {
"titleField": "Timestamp",
Expand All @@ -44,7 +44,7 @@
"titleField": "Damage Severity",
"cluster": true,
"layer": {
"name": "Damage Reports"
"name": "Issues"
},
"icon": {
"iconUrl": "assets/img/markers/cb0d0c.png",
Expand Down
4 changes: 2 additions & 2 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function generateFormToken($form) {
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/fancybox/2.1.5/jquery.fancybox.min.css">
<link rel="stylesheet" href="//cdn.leafletjs.com/leaflet-0.7.3/leaflet.css">
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css">
<link rel="stylesheet" href="//api.tiles.mapbox.com/mapbox.js/plugins/leaflet-markercluster/v0.4.0/MarkerCluster.css">
<link rel="stylesheet" href="//api.tiles.mapbox.com/mapbox.js/plugins/leaflet-markercluster/v0.4.0/MarkerCluster.Default.css">
<link rel="stylesheet" href="assets/css/app.css">
Expand Down Expand Up @@ -266,7 +266,7 @@ function generateFormToken($form) {
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/fancybox/2.1.5/jquery.fancybox.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/list.js/1.1.1/list.min.js"></script>
<script src="//cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.js"></script>
<script src="//api.tiles.mapbox.com/mapbox.js/plugins/leaflet-markercluster/v0.4.0/leaflet.markercluster.js"></script>
<script src="//api.tiles.mapbox.com/mapbox.js/plugins/leaflet-locatecontrol/v0.24.0/L.Control.Locate.js"></script>
<script src="assets/js/app.js"></script>
Expand Down