Skip to content

Commit

Permalink
Merge pull request #1077 from causefx/develop
Browse files Browse the repository at this point in the history 
1.90 release
  • Loading branch information
@causefx
causefx authored Feb 26, 2019
2 parents b62756f + c88a8cc commit 5cc8332
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 10 deletions.
25 changes: 25 additions & 0 deletions .idea/php.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions config/configDefaults.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"homePageAuthNeeded" => false,
"homepageCustomHTML1" => "",
"homepageCustomHTML1Auth" => false,
"git_branch" => "master",
"git_branch" => "v1-master",
"git_check" => true,
"speedTest" => false,
"smtpHostType" => "tls",
Expand Down Expand Up @@ -146,7 +146,7 @@
"homepageOrdertransmisson" => '15',
'requestedUserOnly' => 'true',
'emailTemplateCSS' => '',
'emailTempateLogo' => 'https://raw.githubusercontent.com/causefx/Organizr/master/images/organizr-logo-h.png',
'emailTempateLogo' => 'https://raw.githubusercontent.com/causefx/Organizr/v1-master/images/organizr-logo-h.png',
'emailTemplateResetPassword' => '
<h2>Hey there {user}!</h2><br />
Looks like you forgot your password. Well, I got you... Here is your new password: {password}<br />
Expand Down
13 changes: 11 additions & 2 deletions functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// ===================================
// Define Version
define('INSTALLEDVERSION', '1.80');
define('INSTALLEDVERSION', '1.90');
// ===================================
$debugOrganizr = true;
if($debugOrganizr == true && file_exists('debug.php')){ require_once('debug.php'); }
Expand Down Expand Up @@ -2549,7 +2549,16 @@ function deleteDatabase() {
}

// Upgrade the installation
function upgradeInstall($branch = 'master') {
function upgradeInstall($branch = 'v1-master') {
if ($branch == 'master'){
$branch = 'v1-master';
}
if ($branch == 'develop'){
$branch = 'v1-develop';
}
if ($branch == 'cero-dev'){
$branch = 'v1-develop';
}
function downloadFile($url, $path){
ini_set('max_execution_time',0);
$folderPath = "upgrade/";
Expand Down
12 changes: 6 additions & 6 deletions settings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -819,9 +819,9 @@ function submitTabs(form) {
'Admin' => 'admin',
);
$branchTypes = array(
'Master' => 'master',
'Develop' => 'develop',
'Pre-Develop' => 'cero-dev',
'Master' => 'v1-master',
'Develop' => 'v1-develop',
'Pre-Develop' => 'v1-develop',
);
$refreshSeconds = array(
'1 sec' => '1000',
Expand Down Expand Up @@ -2733,7 +2733,7 @@ function submitTabs(form) {

<div class="panel-body">

<p><?php echo $language->translate("TRANSLATIONS_ABOUT");?> <a href="https://github.com/causefx/Organizr/tree/develop/lang" target="_blank">Github Develop Branch</a></p>
<p><?php echo $language->translate("TRANSLATIONS_ABOUT");?> <a href="https://github.com/causefx/Organizr/tree/v1-develop/lang" target="_blank">Github Develop Branch</a></p>

</div>

Expand Down Expand Up @@ -4115,10 +4115,10 @@ function checkGithub() {

$(infoTabNew).html("<br/><h4><strong><?php echo $language->translate("WHATS_NEW");?> " + githubVersion + "</strong></h4><strong><?php echo $language->translate("TITLE");?>: </strong>" + githubName + " <br/><strong><?php echo $language->translate("CHANGES");?>: </strong>" + githubDescription);
<?php if (extension_loaded("ZIP")){?>
$(infoTabDownload).html("<br/><form style=\"display:initial;\" id=\"upgradeOrg\" method=\"post\" onsubmit=\"performUpdate(); ajax_request(\'POST\', \'upgradeInstall\'); return false;\"><input type=\"hidden\" name=\"action\" value=\"upgrade\" /><button class=\"btn waves btn-labeled btn-success text-uppercase waves-effect waves-float\" type=\"submit\"><span class=\"btn-label\"><i class=\"fa fa-refresh\"></i></span><?php echo $language->translate("AUTO_UPGRADE");?></button></form> <a href='https://github.com/causefx/Organizr/archive/master.zip' target='_blank' type='button' class='btn waves btn-labeled btn-success text-uppercase waves-effect waves-float'><span class='btn-label'><i class='fa fa-download'></i></span>Organizr v." + githubVersion + "</a>");
$(infoTabDownload).html("<br/><form style=\"display:initial;\" id=\"upgradeOrg\" method=\"post\" onsubmit=\"performUpdate(); ajax_request(\'POST\', \'upgradeInstall\'); return false;\"><input type=\"hidden\" name=\"action\" value=\"upgrade\" /><button class=\"btn waves btn-labeled btn-success text-uppercase waves-effect waves-float\" type=\"submit\"><span class=\"btn-label\"><i class=\"fa fa-refresh\"></i></span><?php echo $language->translate("AUTO_UPGRADE");?></button></form> <a href='https://github.com/causefx/Organizr/archive/v1-master.zip' target='_blank' type='button' class='btn waves btn-labeled btn-success text-uppercase waves-effect waves-float'><span class='btn-label'><i class='fa fa-download'></i></span>Organizr v." + githubVersion + "</a>");
$( "p[id^='upgrade']" ).toggle();
<?php }else{ ?>
$(infoTabDownload).html("<br/><a href='https://github.com/causefx/Organizr/archive/master.zip' target='_blank' type='button' class='btn waves btn-labeled btn-success text-uppercase waves-effect waves-float'><span class='btn-label'><i class='fa fa-download'></i></span>Organizr v." + githubVersion + "</a>");
$(infoTabDownload).html("<br/><a href='https://github.com/causefx/Organizr/archive/v1-master.zip' target='_blank' type='button' class='btn waves btn-labeled btn-success text-uppercase waves-effect waves-float'><span class='btn-label'><i class='fa fa-download'></i></span>Organizr v." + githubVersion + "</a>");
$( "p[id^='upgrade']" ).toggle();
<?php } ?>
}else if(currentVersion === githubVersion){
Expand Down

0 comments on commit 5cc8332

Please sign in to comment.