Fix paths after legacy rename
This commit is contained in:
parent
ca21225fb9
commit
c4c89eae19
23 changed files with 47 additions and 47 deletions
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
// This file generated by Propel 1.5.2 convert-conf target
|
||||
// from XML runtime conf file /home/james/src/airtime/airtime_mvc/build/runtime-conf.xml
|
||||
// from XML runtime conf file /home/james/src/airtime/legacy/build/runtime-conf.xml
|
||||
|
||||
/* The original name of this file is airtime-conf.php but since we need to make custom changes
|
||||
* to it I've renamed it so that our changes aren't removed everytime we regenerate a database schema.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
// This file generated by Propel 1.7.0 convert-conf target
|
||||
// from XML runtime conf file /vagrant/airtime_mvc/build/runtime-conf.xml
|
||||
// from XML runtime conf file /vagrant/legacy/build/runtime-conf.xml
|
||||
$conf = array (
|
||||
'datasources' =>
|
||||
array (
|
||||
|
|
|
@ -17,7 +17,7 @@ class Config {
|
|||
"rootDir" => self::$rootDir
|
||||
);
|
||||
|
||||
//In the unit testing environment, LIBRETIME_CONF_DIR will our local airtime.conf in airtime_mvc/application/test/conf:
|
||||
//In the unit testing environment, LIBRETIME_CONF_DIR will our local airtime.conf in legacy/application/test/conf:
|
||||
$filename = isset($_SERVER['AIRTIME_CONF']) ? $_SERVER['AIRTIME_CONF'] : LIBRETIME_CONF_DIR . "/airtime.conf";
|
||||
|
||||
$values = parse_ini_file($filename, true);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#Note: project.home is automatically generated by the propel-install script.
|
||||
#Any manual changes to this value will be overwritten.
|
||||
project.home = /vagrant/airtime_mvc
|
||||
project.home = /vagrant/legacy
|
||||
project.build = ${project.home}/build
|
||||
|
||||
#Database driver
|
||||
|
|
|
@ -10,7 +10,7 @@ function getContent() {
|
|||
var isPreRelease = getIsPreRelease();
|
||||
|
||||
var msg = "";
|
||||
// See file airtime_mvc/application/views/helpers/VersionNotify.php for more info
|
||||
// See file legacy/application/views/helpers/VersionNotify.php for more info
|
||||
if(isUpToDate()) {
|
||||
msg = $.i18n._("You are running the latest version");
|
||||
} else {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Before you overwrite jquery.contextMenu.js, note that we have changed a few lines
|
||||
in this file.
|
||||
|
||||
denise@denise-DX4860:~/airtime/airtime_mvc/public/js/contextmenu$ diff -u jquery.contextMenu_orig.js jquery.contextMenu.js
|
||||
denise@denise-DX4860:~/airtime/legacy/public/js/contextmenu$ diff -u jquery.contextMenu_orig.js jquery.contextMenu.js
|
||||
--- jquery.contextMenu_orig.js 2012-04-20 10:15:59.943215571 -0400
|
||||
+++ jquery.contextMenu.js 2012-04-20 10:00:18.911178927 -0400
|
||||
@@ -306,6 +306,15 @@
|
||||
|
|
|
@ -4,7 +4,7 @@ in this file.
|
|||
Running a diff between the original column filter plugin (dataTables.columnFilter_orig.js) and
|
||||
our modified one (dataTables.columnFilter.js):
|
||||
|
||||
denise@denise-DX4860:~/airtime/airtime_mvc/public/js/datatables/plugin$ diff -u dataTables.columnFilter_orig.js dataTables.columnFilter.js
|
||||
denise@denise-DX4860:~/airtime/legacy/public/js/datatables/plugin$ diff -u dataTables.columnFilter_orig.js dataTables.columnFilter.js
|
||||
--- dataTables.columnFilter_orig.js 2012-10-17 11:41:05.000000000 -0400
|
||||
+++ dataTables.columnFilter.js 2012-11-22 12:20:03.997107451 -0500
|
||||
@@ -103,7 +103,8 @@
|
||||
|
|
|
@ -3,7 +3,7 @@ in this file.
|
|||
|
||||
Running a diff between the original fullcalendar.js and our modified one:
|
||||
|
||||
denise@denise-DX4860:~/airtime/airtime_mvc/public/js/fullcalendar$ diff -u fullcalendar_orig.js fullcalendar.js
|
||||
denise@denise-DX4860:~/airtime/legacy/public/js/fullcalendar$ diff -u fullcalendar_orig.js fullcalendar.js
|
||||
--- fullcalendar_orig.js 2013-10-08 16:03:35.442375219 -0400
|
||||
+++ fullcalendar.js 2013-10-08 16:53:02.586338519 -0400
|
||||
@@ -227,7 +227,7 @@
|
||||
|
|
|
@ -3,7 +3,7 @@ in this file.
|
|||
|
||||
Running a diff between the original serverbrowser.js and our modified one:
|
||||
|
||||
denise@denise-DX4860:~/airtime/airtime_mvc/public/js/serverbrowse$ diff -u serverbrowser_orig.js serverbrowser.js
|
||||
denise@denise-DX4860:~/airtime/legacy/public/js/serverbrowse$ diff -u serverbrowser_orig.js serverbrowser.js
|
||||
--- serverbrowser_orig.js 2012-11-28 11:42:43.250237696 -0500
|
||||
+++ serverbrowser.js 2012-11-28 11:44:57.738242930 -0500
|
||||
@@ -65,14 +65,14 @@
|
||||
|
|
|
@ -2,7 +2,7 @@ Before overwriting jquery.tipsy.js, please note we have changed a few lines to
|
|||
support manual triggering with live tipsy tooltips
|
||||
|
||||
|
||||
denise@denise-DX4860:~/airtime/airtime_mvc/public/js/tipsy$ diff -u jquery.tipsy_orig.js jquery.tipsy.js
|
||||
denise@denise-DX4860:~/airtime/legacy/public/js/tipsy$ diff -u jquery.tipsy_orig.js jquery.tipsy.js
|
||||
--- jquery.tipsy_orig.js 2012-12-13 12:03:48.780751104 -0500
|
||||
+++ jquery.tipsy.js 2012-12-13 12:08:15.564761493 -0500
|
||||
@@ -173,12 +173,10 @@
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?php
|
||||
set_include_path(__DIR__.'/../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path());
|
||||
set_include_path(__DIR__.'/../../legacy/library' . PATH_SEPARATOR . get_include_path());
|
||||
|
||||
#require_once('Zend/Loader/Autoloader.php');
|
||||
class AirtimeInstall
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue