merge branch 'dev'

enviroCar · Dec 3, 2013 · e4c23de · e4c23de
2 parents f45c0ca + 59dfd5e
commit e4c23de
Show file tree

Hide file tree

Showing 72 changed files with 1,251 additions and 424 deletions.
diff --git a/LICENSE b/LICENSE
@@ -29,9 +29,12 @@ This project uses Twitter Bootstrap, which is licensed under Apache 2.0 License
 This project uses OpenLayers, Licensed under MIT
 This project makes use of Google Charts, which underly the Google APIs Terms
 This project makes use of httplanguage.php licensed as CC0
+This project makes use of CanvasJS Charts under the Creative Commons Attribution-NonCommercial 3.0 License
+This project makes use of jqBootstrapValidation which is licensed under the MIT license
+
 
 _Fonts_
-This project uses the fonts Raleway an News Cycle which are SIL Open Fonts Licencse 1.1
+This project uses the font Droid Sans which is under the Apache License, version 2.0
 
 _Icons_
 Route icon: http://thenounproject.com/noun/route/#icon-No14382 (CC0)

diff --git a/PhpConsole.php b/PhpConsole.php
diff --git a/about.php b/about.php
@@ -1,4 +1,21 @@
-<?
+<?php
+/*
+* This file is part of enviroCar.
+* 
+* enviroCar is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* enviroCar is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with enviroCar.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 require_once('./assets/includes/authentification.php');
 
 $logged_in = false; 

diff --git a/assets/css/custom.css b/assets/css/custom.css
@@ -1,3 +1,20 @@
+/*
+* This file is part of enviroCar.
+* 
+* enviroCar is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* enviroCar is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with enviroCar.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 html{
 	height: 100%;
 	overflow-y: scroll; 

diff --git a/assets/css/dashboard.css b/assets/css/dashboard.css
@@ -1,3 +1,20 @@
+/*
+* This file is part of enviroCar.
+* 
+* enviroCar is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* enviroCar is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with enviroCar.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 .row-narrow, #tracks-list {
 	margin-left: 0px;
 	padding: 0px;