Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Huaoe
|
1a4e81963e | ||
|
Huaoe
|
5ae61ff2c7 | ||
|
Huaoe
|
995bb0b43e | ||
|
Huaoe
|
4c841aaafa | ||
|
Huaoe
|
49abf8d86f | ||
|
Huaoe
|
e3ca74f09b | ||
|
Huaoe
|
6818e82c92 | ||
|
Huaoe
|
2ea95f529e | ||
|
Huaoe
|
6cec286886 | ||
|
Huaoe
|
f38d22d70d |
@@ -1,9 +1,7 @@
|
||||
fos_elastica:
|
||||
clients:
|
||||
default: { host: %elastic_host%, port: %elastic_port% }
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
|
||||
indexes:
|
||||
tags:
|
||||
types:
|
||||
@@ -143,4 +141,4 @@ fos_elastica:
|
||||
model: AppBundle\Entity\User
|
||||
provider: ~
|
||||
finder: ~
|
||||
>>>>>>> origin/master
|
||||
|
||||
|
||||
@@ -8,8 +8,8 @@ parameters:
|
||||
database_port: '5432'
|
||||
database_name: database
|
||||
database_user: user
|
||||
#database_password: 7C|Uk2B[.>"6{QO{
|
||||
database_password: b|RN:iR<g,TNMqM6
|
||||
database_password: 7C|Uk2B[.>"6{QO{
|
||||
#database_password: b|RN:iR<g,TNMqM6
|
||||
#Mongo
|
||||
mongodb_server: "mongodb://tt-website.mongo.preprod:27017"
|
||||
#Prestashop
|
||||
|
||||
@@ -14,8 +14,10 @@ use FOS\UserBundle\Event\GetResponseUserEvent;
|
||||
use FOS\UserBundle\Model\UserInterface;
|
||||
use AppBundle\Entity\Company;
|
||||
use AppBundle\Exception\ResourceValidationException;
|
||||
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
|
||||
|
||||
class SecurityController extends FOSRestController
|
||||
|
||||
{
|
||||
|
||||
/**
|
||||
@@ -207,6 +209,7 @@ class SecurityController extends FOSRestController
|
||||
// https://graph.facebook.com/debug_token?
|
||||
// input_token=EAAhJAcmfVSoBAFESNEQPJFv4fOqY5G6pSUwU3BOVzmhfoP9DTu827RUelrUQHFJshZBHsHZAlZA22MvfZArsZAlJBvZBWgbuJAJQjbMcgr9dwtHZBWZCI61nsvSBbsjiA8RgonGu0zcMD8GZCJDoZA26fZAgmURRgJUprfZCOvEzZBFgfUo1UjIHhiqey&access_token=2332071840142634|afb8bbca72bd8c517c64f81e998e4f12
|
||||
|
||||
//TODO: à mettre en config
|
||||
$req = 'https://graph.facebook.com/debug_token?input_token=' . ($token) . '&access_token=1800752833559014|454de729b1e58f506f94c8b50ca5c011';//PROD PREPROD
|
||||
//'&access_token=2332071840142634|afb8bbca72bd8c517c64f81e998e4f12'; //DEV
|
||||
|
||||
|
||||
@@ -6,16 +6,15 @@ use Doctrine\Common\Collections\ArrayCollection;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
use FOS\UserBundle\Model\User as BaseUser;
|
||||
use Symfony\Component\HttpFoundation\File\UploadedFile;
|
||||
<<<<<<< HEAD
|
||||
|
||||
use JMS\Serializer\Annotation\ExclusionPolicy;
|
||||
use JMS\Serializer\Annotation\Expose;
|
||||
use Hateoas\Configuration\Annotation as Hateoas;
|
||||
use JMS\Serializer\Annotation\Groups;
|
||||
use JMS\Serializer\Annotation\Type;
|
||||
|
||||
=======
|
||||
use AppBundle\Utils\Traits\CareerJsonTrait;
|
||||
>>>>>>> origin/master
|
||||
|
||||
/**
|
||||
* @ORM\Entity(repositoryClass="AppBundle\Repository\UserRepository")
|
||||
* @ORM\Table(name="fos_user")
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
../doctrine/dbal/bin/doctrine-dbal
|
||||
+4
-4
@@ -1,5 +1,5 @@
|
||||
XSym
|
||||
0028
|
||||
6ad9c04ba34037260849b181387a137a
|
||||
../doctrine/orm/bin/doctrine
|
||||
|
||||
0034
|
||||
9c0044dbf9d81c454fd8aeca68e706da
|
||||
../doctrine/dbal/bin/doctrine-dbal
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
XSym
|
||||
0044
|
||||
2a11eaeab3acf944b97bb7a15e6c72bf
|
||||
../symfony/phpunit-bridge/bin/simple-phpunit
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
@@ -121,7 +121,7 @@
|
||||
|
||||
.fix-search{
|
||||
position: fixed;
|
||||
top: 89px;
|
||||
top: 60px;
|
||||
width: 100%;
|
||||
-webkit-transition: all 0.5s;
|
||||
-moz-transition: all 0.5s;
|
||||
|
||||
Reference in New Issue
Block a user