Compare commits
No commits in common. "d31d2d8628ec01981cb471a77dcd11a828907434" and "8e00e5765afdfa57490f661ab1bcca31e4a01c7c" have entirely different histories.
d31d2d8628
...
8e00e5765a
|
@ -102,8 +102,8 @@ class OnlyCommand extends Command
|
||||||
$this->only_url = $this->container->getParameter("widonlyoffice_url")."/api/2.0/";
|
$this->only_url = $this->container->getParameter("widonlyoffice_url")."/api/2.0/";
|
||||||
$this->only_host = str_replace("https://","",str_replace("http://","",$this->container->getParameter("widonlyoffice_url")));
|
$this->only_host = str_replace("https://","",str_replace("http://","",$this->container->getParameter("widonlyoffice_url")));
|
||||||
|
|
||||||
//$this->only_url = "https://transnum.oo.ac-dijon.fr"."/api/2.0/";
|
$this->only_url = "https://transnum.oo.ac-dijon.fr"."/api/2.0/";
|
||||||
//$this->only_host = "transnum.oo.ac-dijon.fr";
|
$this->only_host = "transnum.oo.ac-dijon.fr";
|
||||||
|
|
||||||
$this->only_user = $this->container->getParameter("widonlyoffice_user");
|
$this->only_user = $this->container->getParameter("widonlyoffice_user");
|
||||||
$this->only_password = $this->container->getParameter("widonlyoffice_password");
|
$this->only_password = $this->container->getParameter("widonlyoffice_password");
|
||||||
|
|
|
@ -8,7 +8,7 @@ INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES
|
||||||
(-100, 'Interne', 'SIREN');
|
(-100, 'Interne', 'SIREN');
|
||||||
|
|
||||||
INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES
|
INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES
|
||||||
(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}7edyZMIwG4aTOpc6rVXCWrDljOW5K9xW
|
(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}6YNXtIHaQ6w62Z/IFo4Ux8oRFfg3LpIf
|
||||||
', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple');
|
', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple');
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -29,8 +29,7 @@ class ChatType extends AbstractType
|
||||||
'label' => "Message",
|
'label' => "Message",
|
||||||
'mapped'=> false,
|
'mapped'=> false,
|
||||||
'required' => false,
|
'required' => false,
|
||||||
'attr' => array("class" => "form-control", "style" => "margin-bottom:15px"),
|
'config' => ["height" => "100px",'filebrowserUploadRoute' => 'cadoles_portal_user_pagewidget_upload'],
|
||||||
'config' => ["height" => "100px",'filebrowserUploadRoute' => 'cadoles_portal_user_pagewidget_upload',],
|
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$builder
|
$builder
|
||||||
|
@ -39,7 +38,6 @@ class ChatType extends AbstractType
|
||||||
'label' => "Message",
|
'label' => "Message",
|
||||||
'mapped'=> false,
|
'mapped'=> false,
|
||||||
'required' => false,
|
'required' => false,
|
||||||
'attr' => array("class" => "form-control", "style" => "margin-bottom:15px"),
|
|
||||||
'config' => ["height" => "150px",'filebrowserUploadRoute' => 'cadoles_portal_user_pagewidget_upload']
|
'config' => ["height" => "150px",'filebrowserUploadRoute' => 'cadoles_portal_user_pagewidget_upload']
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
|
@ -214,6 +214,7 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
|
/*
|
||||||
if (CKEDITOR.instances["chat_message"]) CKEDITOR.instances["chat_message"].destroy();
|
if (CKEDITOR.instances["chat_message"]) CKEDITOR.instances["chat_message"].destroy();
|
||||||
if (CKEDITOR.instances["chat_messagemail"]) CKEDITOR.instances["chat_messagemail"].destroy();
|
if (CKEDITOR.instances["chat_messagemail"]) CKEDITOR.instances["chat_messagemail"].destroy();
|
||||||
|
|
||||||
|
@ -236,6 +237,7 @@
|
||||||
height: 150
|
height: 150
|
||||||
});
|
});
|
||||||
},1000);
|
},1000);
|
||||||
|
*/
|
||||||
|
|
||||||
$(".switch").bootstrapSwitch();
|
$(".switch").bootstrapSwitch();
|
||||||
$("#mymodal-sendmail").removeAttr("tabindex");
|
$("#mymodal-sendmail").removeAttr("tabindex");
|
||||||
|
|
Loading…
Reference in New Issue