Skip to content

Commit

Permalink
Merge branch 'release-4.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
rkarolis committed Mar 15, 2019
2 parents 3486a8b + 6f81aa7 commit 75baf2d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 14 deletions.
8 changes: 0 additions & 8 deletions controller/Main.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,6 @@
*/
class Main extends tao_actions_CommonModule {

/**
* initialize the Controller.
*/
public function __construct(){
parent::__construct();
}

/**
* @return PlatformThemingService
*/
Expand All @@ -57,7 +50,6 @@ protected function getPlatformService(){
*/
public function index() {


$themingConfig = $this->getPlatformService()->retrieveThemingConfig();

$values = array('themingConfig' => $themingConfig);
Expand Down
7 changes: 6 additions & 1 deletion controller/ThemeForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

namespace oat\taoThemingPlatform\controller;

use oat\tao\model\routing\AnnotationReader\security;
use oat\taoThemingPlatform\model\PlatformThemingConfig;

/**
Expand All @@ -34,9 +35,13 @@ class ThemeForm
extends \tao_helpers_form_FormContainer
{

/**
* ThemeForm constructor.
* @param array $options
* @security("hide")
*/
public function __construct($options = array())
{

parent::__construct(array(), $options);

}
Expand Down
4 changes: 2 additions & 2 deletions manifest.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
'label' => 'Platform Theming',
'description' => '',
'license' => 'GPL-2.0',
'version' => '3.0.0',
'version' => '4.0.0',
'author' => 'Open Assessment Technologies SA',
'requires' => array(
'tao' => '>=21.0.0'
'tao' => '>=27.2.0'
),
'managementRole' => 'http://www.tao.lu/Ontologies/generis.rdf#taoThemingPlatformManager',
'acl' => array(
Expand Down
3 changes: 1 addition & 2 deletions scripts/update/Updater.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ class Updater extends \common_ext_ExtensionUpdater
{
public function update($initialVersion)
{
$this->skip('0.0.0','3.0.0');
return null;
$this->skip('0.0.0','4.0.0');
}
}
2 changes: 1 addition & 1 deletion views/css/platform-customizer.css.map

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

0 comments on commit 75baf2d

Please sign in to comment.