Compare commits

...

10 Commits

Author SHA1 Message Date
Author Name d56dc27fe1 Feat : Update js with assetic 2018-10-31 14:13:19 +01:00
Maxime Thévenot 2ee49175ef Conf : update parameters preprod according to server 2018-10-31 14:10:58 +01:00
Maxime Thévenot 6f0379c7aa Feat : update carrousel to not loop with less than 3 item 2018-10-31 12:18:57 +01:00
Maxime Thévenot 2491b253c6 Fix : update css for select visibility 2018-10-11 11:25:45 +02:00
Thomas MONCHICOURT df3bb979e9 Merge branch 'feat/choose-thumbnail' into develop 2018-10-03 16:51:04 +02:00
Thomas MONCHICOURT ef5f0e81da Fix : birthdate null 2018-10-03 12:17:40 +02:00
Thomas MONCHICOURT 88ceb319af Merge branch 'master' into develop 2018-10-03 11:32:36 +02:00
Thomas MONCHICOURT f314a614fe Fix: probleme set date anniversaire Facebook 2018-10-03 11:26:50 +02:00
Thomas MONCHICOURT f098e4b6b8 Merge branch 'develop' 2018-09-26 10:46:39 +02:00
Thomas MONCHICOURT d0fd19d760 Fix : style dashboard 2018-09-25 16:35:08 +02:00
12 changed files with 36 additions and 13 deletions
@@ -8,7 +8,8 @@ parameters:
database_port: '5432'
database_name: database
database_user: user
database_password: 7C|Uk2B[.>"6{QO{
#database_password: 7C|Uk2B[.>"6{QO{
database_password: b|RN:iR<g,TNMqM6
#Mongo
mongodb_server: "mongodb://tt-website.mongo.preprod:27017"
#Prestashop
@@ -371,9 +371,16 @@ class User extends BaseUser
*
* @return User
*/
public function setBirthday($birthday = null)
public function setBirthday($birthday = null, $isSocial = false)
{
$birthday = \DateTime::createFromFormat('d/m/Y', $birthday);
if($birthday != null){
if($isSocial){
$birthday = \DateTime::createFromFormat('m/d/Y', $birthday);
} else {
$birthday = \DateTime::createFromFormat('d/m/Y', $birthday);
}
}
$this->birthday = $birthday;
return $this;
@@ -148,7 +148,7 @@ class FOSUBUserProvider extends BaseFOSUBProvider
} else {
$userPhoto = 'https://graph.facebook.com/'.$data['id'].'/picture?height=200';
if(isset($data['birthday'])){
$birthday = \DateTime::createFromFormat ('m/d/Y', $data['birthday']);
$birthday = $data['birthday'];
} else {
$birthday = null;
}
+1 -1
View File
@@ -194,7 +194,7 @@ $(document).ready(function () {
margin: marginValue,
// stagePadding: paddingValue,
nav: true,
loop: true,
loop: $('.territory-carousel > .item').length <= 2 ? false : true,
center:true,
navText: ['<span class="left-arrow"></span>', '<span class="right-arrow"></span>']
});
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+10
View File
@@ -2808,6 +2808,16 @@
.hover-none a:hover {
color: #ffffff; }
.chip a {
color: rgba(0, 0, 0, 0.6); }
#liste-jobs .card .card-action .chip a {
color: rgba(0, 0, 0, 0.6);
text-transform: initial;
text-decoration: none;
text-align: center;
margin: 0; }
.color-white {
color: #FFFFFF; }
+4 -3
View File
@@ -15195,6 +15195,9 @@ h6 {
.bg-white.button-plus:after {
background: url(/img/decroche-white.png) top center no-repeat; }
select {
display: block; }
.btn, .btn-large {
-webkit-border-radius: 0px;
-moz-border-radius: 0px;
@@ -16124,7 +16127,7 @@ span.titleVideo {
display: flex;
flex-direction: column;
justify-content: space-around;
height: 200px; }
height: 250px; }
.tooltip_templates {
display: none; }
@@ -16952,5 +16955,3 @@ tbody td {
border-top: 1px solid #F2F3F5; }
#talent-show .talent-border-left {
border-left: 1px solid #F2F3F5; }
/*# sourceMappingURL=styles.css.map */
+1 -1
View File
@@ -194,7 +194,7 @@ $(document).ready(function () {
margin: marginValue,
// stagePadding: paddingValue,
nav: true,
loop: true,
loop: $('.territory-carousel > .item').length <= 2 ? false : true,
center:true,
navText: ['<span class="left-arrow"></span>', '<span class="right-arrow"></span>']
});
@@ -433,5 +433,5 @@
display: flex;
flex-direction: column;
justify-content: space-around;
height: 200px;
height: 250px;
}
@@ -211,6 +211,10 @@ h6 {
}
}
select{
display: block;
}