Merge branch '2.3/develop' into 2.3/master

anodyne · May 16, 2014 · 08e13d3 · 08e13d3
2 parents cf53e5d + 4041d00
commit 08e13d3
Show file tree

Hide file tree

Showing 14 changed files with 248 additions and 72 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Changelog
 
-## 2.3.1
+## 2.3.2 (10 May 2014)
+
+### Nova Core
+
+* Updated the email from the contact form and the email to the GM from the docking form to include recipient information. Despite the name and email address are in the headers, we're including those as well as the sender's IP address.
+* Updated the included head files to allow for using Nova on a secure domain.
+* Fixed wrong language key being used for the word "sim" in a couple of places.
+
+## 2.3.1 (02 February 2014)
 
 ### Bug Fixes
 

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Anodyne Production's next-generation RPG management system combines popular feat
 
 ## Current Version
 
-2.3.1
+2.3.2
 
 ## Bug Tracker
 

diff --git a/nova/modules/assets/include_head_admin.php b/nova/modules/assets/include_head_admin.php
@@ -8,6 +8,8 @@
  * @copyright	2013 Anodyne Productions
  */
 
+$modFolder = base_url().MODFOLDER.'/';
+
 $faceboxcss = ( ! is_file(APPPATH.'views/'.$current_skin.'/admin/css/jquery.facebox.css'))
 	? base_url().MODFOLDER.'/assets/js/css/jquery.facebox.css'
 	: base_url().APPFOLDER.'/views/'.$current_skin.'/admin/css/jquery.facebox.css';
@@ -21,65 +23,65 @@
 	: base_url().APPFOLDER.'/views/'.$current_skin.'/admin/css/jquery.chosen.css';
 
 ?><style type="text/css">
-			@import url('<?php echo base_url().MODFOLDER;?>/assets/js/css/jquery.ui.core.css');
+			@import url('<?php echo $modFolder;?>assets/js/css/jquery.ui.core.css');
 			@import url('<?php echo $faceboxcss;?>');
 			@import url('<?php echo $uiTheme;?>');
-			@import url('<?php echo base_url().MODFOLDER;?>/assets/js/css/jquery.chosen.structure.css');
+			@import url('<?php echo $modFolder;?>assets/js/css/jquery.chosen.structure.css');
 		</style>
 
-		<script type="text/javascript" src="http://code.jquery.com/jquery-1.8.2.min.js"></script>
-		<script type="text/javascript" src="<?php echo base_url().MODFOLDER.'/assets/js/jquery.lazy.js';?>"></script>
-		<script type="text/javascript" src="<?php echo base_url().MODFOLDER.'/assets/js/jquery.ui.core.min.js';?>"></script>
-		<script type="text/javascript" src="<?php echo base_url().MODFOLDER.'/assets/js/jquery.ui.widget.min.js';?>"></script>
-		<script type="text/javascript" src="<?php echo base_url().MODFOLDER.'/assets/js/reflection.js';?>"></script>
-		<script type="text/javascript" src="<?php echo base_url().MODFOLDER.'/assets/js/jquery.facebox.js';?>"></script>
+		<script type="text/javascript" src="//code.jquery.com/jquery-1.8.2.min.js"></script>
+		<script type="text/javascript" src="<?php echo $modFolder.'assets/js/jquery.lazy.js';?>"></script>
+		<script type="text/javascript" src="<?php echo $modFolder.'assets/js/jquery.ui.core.min.js';?>"></script>
+		<script type="text/javascript" src="<?php echo $modFolder.'assets/js/jquery.ui.widget.min.js';?>"></script>
+		<script type="text/javascript" src="<?php echo $modFolder.'assets/js/reflection.js';?>"></script>
+		<script type="text/javascript" src="<?php echo $modFolder.'assets/js/jquery.facebox.js';?>"></script>
 		<script type="text/javascript">
 			$(document).ready(function(){
 				$.lazy({					
-					src: '<?php echo base_url().MODFOLDER;?>/assets/js/jquery.ui.tabs.min.js',
+					src: '<?php echo $modFolder;?>assets/js/jquery.ui.tabs.min.js',
 					name: 'tabs',
 					cache: true
 				});
 
 				$.lazy({					
-					src: '<?php echo base_url() . MODFOLDER;?>/assets/js/jquery.prettyPhoto.js',
+					src: '<?php echo $modFolder;?>assets/js/jquery.prettyPhoto.js',
 					name: 'prettyPhoto',
 					dependencies: {
-						css: ['<?php echo base_url() . MODFOLDER;?>/assets/js/css/jquery.prettyPhoto.css']
+						css: ['<?php echo $modFolder;?>assets/js/css/jquery.prettyPhoto.css']
 					},
 					cache: true
 				});
 
 				$.lazy({					
-					src: '<?php echo base_url() . MODFOLDER;?>/assets/js/jquery.ui.sortable.min.js',
+					src: '<?php echo $modFolder;?>assets/js/jquery.ui.sortable.min.js',
 					name: 'sortable',
 					dependencies: {
-						js: ['<?php echo base_url() . MODFOLDER;?>/assets/js/jquery.ui.mouse.min.js']
+						js: ['<?php echo $modFolder;?>assets/js/jquery.ui.mouse.min.js']
 					},
 					cache: true
 				});
 
 				$.lazy({					
-					src: '<?php echo base_url() . MODFOLDER;?>/assets/js/jquery.ui.slider.min.js',
+					src: '<?php echo $modFolder;?>assets/js/jquery.ui.slider.min.js',
 					name: 'slider',
 					dependencies: {
-						css: ['<?php echo base_url() . MODFOLDER;?>/assets/js/css/jquery.ui.slider.css'],
-						js: ['<?php echo base_url() . MODFOLDER;?>/assets/js/jquery.ui.mouse.min.js']
+						css: ['<?php echo $modFolder;?>assets/js/css/jquery.ui.slider.css'],
+						js: ['<?php echo $modFolder;?>assets/js/jquery.ui.mouse.min.js']
 					},
 					cache: true
 				});
 
 				$.lazy({					
-					src: '<?php echo base_url() . MODFOLDER;?>/assets/js/jquery.ui.accordion.min.js',
+					src: '<?php echo $modFolder;?>assets/js/jquery.ui.accordion.min.js',
 					name: 'accordion',
 					dependencies: {
-						css: ['<?php echo base_url() . MODFOLDER;?>/assets/js/css/jquery.ui.accordion.css']
+						css: ['<?php echo $modFolder;?>assets/js/css/jquery.ui.accordion.css']
 					},
 					cache: true
 				});
 
 				$.lazy({					
-					src: '<?php echo base_url().MODFOLDER;?>/assets/js/jquery.chosen.min.js',
+					src: '<?php echo $modFolder;?>assets/js/jquery.chosen.min.js',
 					name: 'chosen',
 					dependencies: {
 						css: ['<?php echo $chosencss;?>']
@@ -88,20 +90,20 @@
 				});
 
 				$.lazy({
-					src: '<?php echo base_url() . MODFOLDER;?>/assets/js/bootstrap-twipsy.js',
+					src: '<?php echo $modFolder;?>assets/js/bootstrap-twipsy.js',
 					name: 'twipsy',
 					dependencies: {
-						css: ['<?php echo base_url() . MODFOLDER;?>/assets/js/css/bootstrap.css']
+						css: ['<?php echo $modFolder;?>assets/js/css/bootstrap.css']
 					},
 					cache: true
 				});
 
 				$.lazy({
-					src: '<?php echo base_url() . MODFOLDER;?>/assets/js/bootstrap-popover.js',
+					src: '<?php echo $modFolder;?>assets/js/bootstrap-popover.js',
 					name: 'popover',
 					dependencies: {
-						js: ['<?php echo base_url() . MODFOLDER;?>/assets/js/bootstrap-twipsy.js'],
-						css: ['<?php echo base_url() . MODFOLDER;?>/assets/js/css/bootstrap.css']
+						js: ['<?php echo $modFolder;?>assets/js/bootstrap-twipsy.js'],
+						css: ['<?php echo $modFolder;?>assets/js/css/bootstrap.css']
 					},
 					cache: true
 				});
@@ -120,7 +122,7 @@
 					return false;
 				});
 
-				$.facebox.settings.loadingImage = '<?php echo base_url() . MODFOLDER;?>/assets/js/images/facebox-loading.gif';
+				$.facebox.settings.loadingImage = '<?php echo $modFolder;?>assets/js/images/facebox-loading.gif';
 
 				$('.reflect').reflect({ opacity: '0.3' });
 			});

diff --git a/nova/modules/assets/include_head_login.php b/nova/modules/assets/include_head_login.php
@@ -7,7 +7,7 @@
  * @author		Anodyne Productions
  * @copyright	2013 Anodyne Productions
  */
-?><script type="text/javascript" src="http://code.jquery.com/jquery-1.8.2.min.js"></script>
+?><script type="text/javascript" src="//code.jquery.com/jquery-1.8.2.min.js"></script>
 		<script type="text/javascript" src="<?php echo base_url().MODFOLDER.'/assets/js/jquery.countdown.js';?>"></script>
 		<script type="text/javascript">
 			$(document).ready(function(){

diff --git a/nova/modules/assets/include_head_main.php b/nova/modules/assets/include_head_main.php
@@ -8,6 +8,8 @@
  * @copyright	2013 Anodyne Productions
  */
 
+$modFolder = base_url().MODFOLDER.'/';
+
 $faceboxcss = ( ! is_file(APPPATH.'views/'.$current_skin.'/main/css/jquery.facebox.css'))
 	? base_url().MODFOLDER.'/assets/js/css/jquery.facebox.css'
 	: base_url().APPFOLDER.'/views/'.$current_skin.'/main/css/jquery.facebox.css';
@@ -17,39 +19,39 @@
 	: base_url().APPFOLDER.'/views/'.$current_skin.'/main/css/jquery.ui.theme.css';
 
 ?><style type="text/css">
-			@import url("<?php echo base_url() . MODFOLDER .'/assets/js/css/jquery.ui.core.css';?>");
+			@import url("<?php echo $modFolder.'assets/js/css/jquery.ui.core.css';?>");
 			@import url('<?php echo $faceboxcss;?>');
 			@import url('<?php echo $uiTheme;?>');
 		</style>
 
-		<script type="text/javascript" src="http://code.jquery.com/jquery-1.8.2.min.js"></script>
-		<script type="text/javascript" src="<?php echo base_url().MODFOLDER .'/assets/js/jquery.lazy.js';?>"></script>
-		<script type="text/javascript" src="<?php echo base_url().MODFOLDER .'/assets/js/jquery.ui.core.min.js';?>"></script>
-		<script type="text/javascript" src="<?php echo base_url().MODFOLDER .'/assets/js/jquery.ui.widget.min.js';?>"></script>
-		<script type="text/javascript" src="<?php echo base_url().MODFOLDER .'/assets/js/reflection.js';?>"></script>
-		<script type="text/javascript" src="<?php echo base_url().MODFOLDER .'/assets/js/jquery.facebox.js';?>"></script>
+		<script type="text/javascript" src="//code.jquery.com/jquery-1.8.2.min.js"></script>
+		<script type="text/javascript" src="<?php echo $modFolder.'assets/js/jquery.lazy.js';?>"></script>
+		<script type="text/javascript" src="<?php echo $modFolder.'assets/js/jquery.ui.core.min.js';?>"></script>
+		<script type="text/javascript" src="<?php echo $modFolder.'assets/js/jquery.ui.widget.min.js';?>"></script>
+		<script type="text/javascript" src="<?php echo $modFolder.'assets/js/reflection.js';?>"></script>
+		<script type="text/javascript" src="<?php echo $modFolder.'assets/js/jquery.facebox.js';?>"></script>
 		<script type="text/javascript">
 			$(document).ready(function(){
 				$.lazy({					
-					src: '<?php echo base_url().MODFOLDER;?>/assets/js/jquery.ui.tabs.min.js',
+					src: '<?php echo $modFolder;?>assets/js/jquery.ui.tabs.min.js',
 					name: 'tabs',
 					cache: true
 				});
 
 				$.lazy({					
-					src: '<?php echo base_url() . MODFOLDER;?>/assets/js/jquery.prettyPhoto.js',
+					src: '<?php echo $modFolder;?>assets/js/jquery.prettyPhoto.js',
 					name: 'prettyPhoto',
 					dependencies: {
-						css: ['<?php echo base_url() . MODFOLDER;?>/assets/js/css/jquery.prettyPhoto.css']
+						css: ['<?php echo $modFolder;?>assets/js/css/jquery.prettyPhoto.css']
 					},
 					cache: true
 				});
 
 				$.lazy({
-					src: '<?php echo base_url() . MODFOLDER;?>/assets/js/bootstrap-twipsy.js',
+					src: '<?php echo $modFolder;?>assets/js/bootstrap-twipsy.js',
 					name: 'twipsy',
 					dependencies: {
-						css: ['<?php echo base_url() . MODFOLDER;?>/assets/js/css/bootstrap.css']
+						css: ['<?php echo $modFolder;?>assets/js/css/bootstrap.css']
 					},
 					cache: true
 				});
@@ -68,7 +70,7 @@
 					return false;
 				});
 
-				$.facebox.settings.loadingImage = '<?php echo base_url() . MODFOLDER;?>/assets/js/images/facebox-loading.gif';
+				$.facebox.settings.loadingImage = '<?php echo $modFolder;?>assets/js/images/facebox-loading.gif';
 
 				$('.reflect').reflect({ opacity: '0.3' });
 			});

diff --git a/nova/modules/assets/include_head_wiki.php b/nova/modules/assets/include_head_wiki.php
@@ -14,6 +14,8 @@
 // grab the type of parsing
 $parse = $this->config->item('parsetype');
 
+$modFolder = base_url().MODFOLDER.'/';
+
 $faceboxcss = ( ! is_file(APPPATH.'views/'.$current_skin.'/wiki/css/jquery.facebox.css'))
 	? base_url().MODFOLDER.'/assets/js/css/jquery.facebox.css'
 	: base_url().APPFOLDER.'/views/'.$current_skin.'/wiki/css/jquery.facebox.css';
@@ -23,11 +25,11 @@
 	: base_url().APPFOLDER.'/views/'.$current_skin.'/wiki/css/jquery.ui.theme.css';
 
 ?><style type="text/css">
-			@import url("<?php echo base_url().MODFOLDER.'/assets/js/css/jquery.ui.core.css';?>");
+			@import url("<?php echo $modFolder.'assets/js/css/jquery.ui.core.css';?>");
 			@import url('<?php echo $faceboxcss;?>');
 			@import url('<?php echo $uiTheme;?>');
-			@import url("<?php echo base_url().MODFOLDER.'/assets/js/markitup/skins/simple/style.css';?>");
-			@import url("<?php echo base_url().MODFOLDER.'/assets/js/markitup/sets/'. $parse .'/style.css';?>");
+			@import url("<?php echo $modFolder.'assets/js/markitup/skins/simple/style.css';?>");
+			@import url("<?php echo $modFolder.'assets/js/markitup/sets/'. $parse .'/style.css';?>");
 
 			ul, ol { margin: 1em; padding: .5em; }
 			ul li, ol li { margin: 2px; }
@@ -38,36 +40,36 @@
 			.panel-handle ul li, .panel-handle ol li { margin: 0; }
 		</style>
 
-		<script type="text/javascript" src="http://code.jquery.com/jquery-1.8.2.min.js"></script>
-		<script type="text/javascript" src="<?php echo base_url().MODFOLDER.'/assets/js/jquery.lazy.js';?>"></script>
-		<script type="text/javascript" src="<?php echo base_url().MODFOLDER.'/assets/js/jquery.ui.core.min.js';?>"></script>
-		<script type="text/javascript" src="<?php echo base_url().MODFOLDER.'/assets/js/jquery.ui.widget.min.js';?>"></script>
-		<script type="text/javascript" src="<?php echo base_url().MODFOLDER.'/assets/js/jquery.facebox.js';?>"></script>
-		<script type="text/javascript" src="<?php echo base_url().MODFOLDER.'/assets/js/markitup/jquery.markitup.js';?>"></script>
-		<script type="text/javascript" src="<?php echo base_url().MODFOLDER.'/assets/js/markitup/sets/'.$parse.'/set.js';?>"></script>
+		<script type="text/javascript" src="//code.jquery.com/jquery-1.8.2.min.js"></script>
+		<script type="text/javascript" src="<?php echo $modFolder.'assets/js/jquery.lazy.js';?>"></script>
+		<script type="text/javascript" src="<?php echo $modFolder.'assets/js/jquery.ui.core.min.js';?>"></script>
+		<script type="text/javascript" src="<?php echo $modFolder.'assets/js/jquery.ui.widget.min.js';?>"></script>
+		<script type="text/javascript" src="<?php echo $modFolder.'assets/js/jquery.facebox.js';?>"></script>
+		<script type="text/javascript" src="<?php echo $modFolder.'assets/js/markitup/jquery.markitup.js';?>"></script>
+		<script type="text/javascript" src="<?php echo $modFolder.'assets/js/markitup/sets/'.$parse.'/set.js';?>"></script>
 		<script type="text/javascript">
 			$(document).ready(function(){
 				$.lazy({
-					src: '<?php echo base_url().MODFOLDER;?>/assets/js/jquery.ui.tabs.min.js',
+					src: '<?php echo $modFolder;?>assets/js/jquery.ui.tabs.min.js',
 					name: 'tabs',
 					cache: true
 				});
 
 				$.lazy({
-					src: '<?php echo base_url() . MODFOLDER;?>/assets/js/bootstrap-twipsy.js',
+					src: '<?php echo $modFolder;?>assets/js/bootstrap-twipsy.js',
 					name: 'twipsy',
 					dependencies: {
-						css: ['<?php echo base_url() . MODFOLDER;?>/assets/js/css/bootstrap.css']
+						css: ['<?php echo $modFolder;?>assets/js/css/bootstrap.css']
 					},
 					cache: true
 				});
 
 				$.lazy({
-					src: '<?php echo base_url() . MODFOLDER;?>/assets/js/bootstrap-popover.js',
+					src: '<?php echo $modFolder;?>assets/js/bootstrap-popover.js',
 					name: 'popover',
 					dependencies: {
-						js: ['<?php echo base_url() . MODFOLDER;?>/assets/js/bootstrap-twipsy.js'],
-						css: ['<?php echo base_url() . MODFOLDER;?>/assets/js/css/bootstrap.css']
+						js: ['<?php echo $modFolder;?>assets/js/bootstrap-twipsy.js'],
+						css: ['<?php echo $modFolder;?>assets/js/css/bootstrap.css']
 					},
 					cache: true
 				});
@@ -86,7 +88,7 @@
 					return false;
 				});
 
-				$.facebox.settings.loadingImage = '<?php echo base_url().MODFOLDER;?>/assets/js/images/facebox-loading.gif';
+				$.facebox.settings.loadingImage = '<?php echo $modFolder;?>assets/js/images/facebox-loading.gif';
 
 				$('.markitup').markItUp(mySettings);
 			});

diff --git a/nova/modules/assets/install/data.php b/nova/modules/assets/install/data.php
@@ -2244,7 +2244,7 @@
 		'sys_install_date' => now(),
 		'sys_version_major' => 2,
 		'sys_version_minor' => 3,
-		'sys_version_update' => 1)
+		'sys_version_update' => 2)
 );
 
 $tour_fields = array(
-Original file line number
+Diff line change
@@ Expand Up @@
     ## Current Version
-.3.1
+.3.2
     ## Bug Tracker
@@ Expand Down @@