Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
136e85dd14 | |||
2fc3338d0f | |||
aba39575fa |
@ -1,17 +1,3 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
closeNow
|
||||
|
||||
|
||||
|
||||
listSitePolls
|
||||
|
||||
|
||||
<?php
|
||||
/**
|
||||
* app/plugins/feedback/models/feedback.php
|
||||
@ -87,3 +73,16 @@ class Feedback extends DatabaseModel {
|
||||
return self::$db->lastId();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// closeNow
|
||||
|
||||
|
||||
|
||||
// listSitePolls
|
18
composer.lock
generated
18
composer.lock
generated
@ -60,11 +60,11 @@
|
||||
},
|
||||
{
|
||||
"name": "thetempusproject/bedrock",
|
||||
"version": "1.0.3",
|
||||
"version": "1.0.5",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://git.thetempusproject.com/the-tempus-project/bedrock",
|
||||
"reference": "f80f7bed6bb6c399ce8ea2426ebe1e118cc30a9c"
|
||||
"reference": "79f21773c66a4b87e6a172cab3da23029c2441fd"
|
||||
},
|
||||
"require": {
|
||||
"php": ">=8.1.0",
|
||||
@ -101,15 +101,15 @@
|
||||
"framework",
|
||||
"mvc"
|
||||
],
|
||||
"time": "2024-08-09T05:35:47+00:00"
|
||||
"time": "2024-08-09T21:18:24+00:00"
|
||||
},
|
||||
{
|
||||
"name": "thetempusproject/canary",
|
||||
"version": "1.0.2",
|
||||
"version": "1.0.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://git.thetempusproject.com/the-tempus-project/canary",
|
||||
"reference": "8dff31b4eefa3efeb9f81d2e6b6ef3e9f8c9f27b"
|
||||
"reference": "289f35cf6b0bcacc4eaba056a11906426c6068fa"
|
||||
},
|
||||
"require": {
|
||||
"php": ">=8.1.0"
|
||||
@ -144,7 +144,7 @@
|
||||
"thetempusproject",
|
||||
"tools"
|
||||
],
|
||||
"time": "2024-08-09T06:18:45+00:00"
|
||||
"time": "2024-08-09T21:13:37+00:00"
|
||||
},
|
||||
{
|
||||
"name": "thetempusproject/hermes",
|
||||
@ -191,11 +191,11 @@
|
||||
},
|
||||
{
|
||||
"name": "thetempusproject/houdini",
|
||||
"version": "1.0.4",
|
||||
"version": "1.0.5",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://git.thetempusproject.com/the-tempus-project/houdini",
|
||||
"reference": "34babdb2dc508450d14a0764bf81b032a6861a58"
|
||||
"reference": "cbaba96d5ee2a3038b8c8b3e34c4b834de03b8f5"
|
||||
},
|
||||
"require": {
|
||||
"php": ">=8.1.0",
|
||||
@ -231,7 +231,7 @@
|
||||
"thetempusproject",
|
||||
"tools"
|
||||
],
|
||||
"time": "2024-08-09T06:20:26+00:00"
|
||||
"time": "2024-08-09T21:16:21+00:00"
|
||||
},
|
||||
{
|
||||
"name": "twbs/bootstrap",
|
||||
|
11
install.php
11
install.php
@ -207,6 +207,9 @@ class Install extends Controller {
|
||||
],
|
||||
],
|
||||
'database' => [
|
||||
'dbEnabled' => [
|
||||
'value' => true,
|
||||
],
|
||||
'dbHost' => [
|
||||
'value' => Input::postNull( 'dbHost' ),
|
||||
],
|
||||
@ -254,7 +257,7 @@ class Install extends Controller {
|
||||
// Apache should have the htaccess now, and Nginx should have been configured this way out of the box
|
||||
if ( Route::testRouting() ) {
|
||||
Session::flash( 'success', 'Routing is working as expected.' );
|
||||
$this->nextStep( 'models', true );
|
||||
return $this->nextStep( 'models', true );
|
||||
} else {
|
||||
Issues::add( 'error', 'Could not verify url routing' );
|
||||
}
|
||||
@ -291,7 +294,7 @@ class Install extends Controller {
|
||||
Issues::add( 'error', [ 'There was an error with the Installation.' => $this->installer->getErrors() ] );
|
||||
} else {
|
||||
Session::flash( 'success', [ 'Models Have been installed successfully.' => $this->installer->getErrors() ] );
|
||||
$this->nextStep( 'plugins', true );
|
||||
return $this->nextStep( 'plugins', true );
|
||||
}
|
||||
} elseif ( Input::exists( 'submit' ) ) {
|
||||
Issues::add( 'error', [ 'There was an error with your form.' => Check::userErrors() ] );
|
||||
@ -326,7 +329,7 @@ class Install extends Controller {
|
||||
Issues::add( 'error', ['There was an error with the Installation.' => $this->installer->getErrors()] );
|
||||
} else {
|
||||
Session::flash( 'success', [ 'Plugins Have been installed successfully.' => $this->installer->getErrors() ] );
|
||||
$this->nextStep( 'resources', true );
|
||||
return $this->nextStep( 'resources', true );
|
||||
}
|
||||
} elseif ( Input::exists( 'submit' ) ) {
|
||||
Issues::add( 'error', ['There was an error with your form.' => Check::userErrors()] );
|
||||
@ -361,7 +364,7 @@ class Install extends Controller {
|
||||
Issues::add( 'error', ['There was an error with the Installation.' => $this->installer->getErrors()] );
|
||||
} else {
|
||||
Session::flash( 'success', ['Resources have been installed successfully.' => $this->installer->getErrors()] );
|
||||
$this->nextStep( 'user', true );
|
||||
return $this->nextStep( 'user', true );
|
||||
}
|
||||
} elseif ( Input::exists( 'submit' ) ) {
|
||||
Issues::add( 'error', ['There was an error with your form.' => Check::userErrors()] );
|
||||
|
Reference in New Issue
Block a user