Merged release/0.2 into master

christheyounger · Sep 22, 2016 · 6ecbd46 · 6ecbd46
2 parents 21d87c6 + cc3f983
commit 6ecbd46
Show file tree

Hide file tree

Showing 22 changed files with 1,319 additions and 856 deletions.
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -16,6 +16,7 @@ public function registerBundles()
             new Symfony\Bundle\AsseticBundle\AsseticBundle(),
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
+            new FOS\RestBundle\FOSRestBundle(),
             new FOS\UserBundle\FOSUserBundle(),
             new JMS\SerializerBundle\JMSSerializerBundle(),
             new Darkbluesun\GoldfishBundle\DarkbluesunGoldfishBundle(),

diff --git a/app/check.php b/app/check.php
@@ -6,7 +6,7 @@
 $symfonyRequirements = new SymfonyRequirements();
 $iniPath = $symfonyRequirements->getPhpIniConfigPath();
 
-echo_title('Symfony2 Requirements Checker');
+echo_title('Symfony Requirements Checker');
 
 echo '> PHP is using the following php.ini file:'.PHP_EOL;
 if ($iniPath) {
@@ -42,9 +42,9 @@
 }
 
 if ($checkPassed) {
-    echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects');
+    echo_block('success', 'OK', 'Your system is ready to run Symfony projects');
 } else {
-    echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects');
+    echo_block('error', 'ERROR', 'Your system is not ready to run Symfony projects');
 
     echo_title('Fix the following mandatory requirements', 'red');
 

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -85,6 +85,10 @@ fos_user:
         form:
             type: goldfish_user_profile
 
+fos_rest:
+    routing_loader:
+        default_format: json
+
 # Swiftmailer Configuration
 swiftmailer:
     transport: "%mailer_transport%"

diff --git a/bower.json b/bower.json
@@ -17,7 +17,7 @@
     "angular-smart-table": "^2.1.8"
   },
   "resolutions": {
-    "angular": "1.4.8",
+    "angular": "~1.4.6",
     "angular-route": "~1.4.6"
   }
 }
diff --git a/composer.json b/composer.json
@@ -21,6 +21,7 @@
         "incenteev/composer-parameter-handler": "~2.0",
         "jms/serializer-bundle": "^1.1",
         "cspoo/swiftmailer-mailgun-bundle": "dev-master",
+        "friendsofsymfony/rest-bundle": "^2.1",
         "friendsofsymfony/user-bundle": "~2.0@dev"
     },
     "require-dev": {