Merge with 1.11.x

Author: jmontoyaa

.gitignore

@@ -1,9 +1,8 @@
 # Cache directories
-!app/cache/.htaccess
-
 /app/bootstrap.php.cache
 /app/cache/*
 !app/cache/.gitkeep
+!app/cache/.htaccess
 /app/config/parameters.yml
 /app/logs/*
 !app/logs/.gitkeep

app/AppKernel.php

@@ -37,6 +37,9 @@ public function registerBundles()
             new Knp\Bundle\MarkdownBundle\KnpMarkdownBundle(),
             // Data grid
             new APY\DataGridBundle\APYDataGridBundle(),
+            new Chamilo\FaqBundle\ChamiloFaqBundle(),
+            new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
+            new A2lix\TranslationFormBundle\A2lixTranslationFormBundle(),
 
             // Sonata
             new Sonata\EasyExtendsBundle\SonataEasyExtendsBundle(),
@@ -50,7 +53,6 @@ public function registerBundles()
             new Sonata\NotificationBundle\SonataNotificationBundle(),
             new Sonata\DatagridBundle\SonataDatagridBundle(),
             new Sonata\MediaBundle\SonataMediaBundle(),
-            //new Sonata\TranslationBundle\SonataTranslationBundle(),
             new Sonata\PageBundle\SonataPageBundle(),
 
             new Spy\TimelineBundle\SpyTimelineBundle(),
@@ -85,6 +87,7 @@ public function registerBundles()
             new Ivory\CKEditorBundle\IvoryCKEditorBundle(),
             new FM\ElfinderBundle\FMElfinderBundle(),
             new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
+            new Knp\DoctrineBehaviors\Bundle\DoctrineBehaviorsBundle(),
 
             // User
             new FOS\UserBundle\FOSUserBundle(),

app/Migrations/Schema/V111/Version20160330103045.php

@@ -0,0 +1,48 @@
+<?php
+/* For licensing terms, see /license.txt */
+
+namespace Application\Migrations\Schema\V111;
+
+use Application\Migrations\AbstractMigrationChamilo;
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Class Version20160331103600
+ */
+class Version20160331103600 extends AbstractMigrationChamilo
+{
+    /**
+     * @param Schema $schema
+     *
+     * @throws \Doctrine\DBAL\Schema\SchemaException
+     */
+    public function up(Schema $schema)
+    {
+        $this->addSettingCurrent(
+            'teacher_can_select_course_template',
+            null,
+            'radio',
+            'Course',
+            'true',
+            'TeacherCanSelectCourseTemplateTitle',
+            'TeacherCanSelectCourseTemplateComment',
+            null,
+            '',
+            1,
+            true,
+            false,
+            [
+                ['value' => 'true', 'text' => 'Yes'],
+                ['value' => 'false', 'text' => 'No'],
+            ]
+        );
+    }
+
+    /**
+     * @param Schema $schema
+     */
+    public function down(Schema $schema)
+    {
+        
+    }
+}

app/Migrations/Schema/V111/Version20160331103600.php

@@ -1,12 +1,12 @@
 {
   "name": "blueimp-load-image",
   "homepage": "https://github.com/blueimp/JavaScript-Load-Image",
-  "version": "2.6.0",
-  "_release": "2.6.0",
+  "version": "2.6.1",
+  "_release": "2.6.1",
   "_resolution": {
     "type": "version",
-    "tag": "v2.6.0",
-    "commit": "e6864b8a8be83ff88a1596899fc96c6d6cde19c0"
+    "tag": "v2.6.1",
+    "commit": "e96ea2ce372c84b26d6cb6556ca2d8d2b32c163e"
   },
   "_source": "git://github.com/blueimp/JavaScript-Load-Image.git",
   "_target": ">=1.13.0",

app/Resources/public/assets/blueimp-load-image/.bower.json

@@ -0,0 +1,6 @@
+module.exports = require('./js/load-image')
+
+require('./js/load-image-exif')
+require('./js/load-image-exif-map')
+require('./js/load-image-meta')
+require('./js/load-image-orientation')

app/Resources/public/assets/blueimp-load-image/index.js

@@ -18,7 +18,7 @@
   'use strict'
   if (typeof define === 'function' && define.amd) {
     // Register as an anonymous AMD module:
-    define(['load-image', 'load-image-exif'], factory)
+    define(['./load-image', './load-image-exif'], factory)
   } else if (typeof module === 'object' && module.exports) {
     factory(require('./load-image'), require('./load-image-exif'))
   } else {

app/Resources/public/assets/blueimp-load-image/js/load-image-exif-map.js

@@ -15,7 +15,7 @@
   'use strict'
   if (typeof define === 'function' && define.amd) {
     // Register as an anonymous AMD module:
-    define(['load-image', 'load-image-meta'], factory)
+    define(['./load-image', './load-image-meta'], factory)
   } else if (typeof module === 'object' && module.exports) {
     factory(require('./load-image'), require('./load-image-meta'))
   } else {

app/Resources/public/assets/blueimp-load-image/js/load-image-exif.js

@@ -19,7 +19,7 @@
   'use strict'
   if (typeof define === 'function' && define.amd) {
     // Register as an anonymous AMD module:
-    define(['load-image'], factory)
+    define(['./load-image'], factory)
   } else if (typeof module === 'object' && module.exports) {
     factory(require('./load-image'))
   } else {

app/Resources/public/assets/blueimp-load-image/js/load-image-meta.js

@@ -15,7 +15,7 @@
   'use strict'
   if (typeof define === 'function' && define.amd) {
     // Register as an anonymous AMD module:
-    define(['load-image'], factory)
+    define(['./load-image'], factory)
   } else if (typeof module === 'object' && module.exports) {
     factory(require('./load-image'))
   } else {

app/Resources/public/assets/blueimp-load-image/js/load-image-orientation.js

@@ -1,6 +1,7 @@
 {
   "name": "blueimp-load-image",
-  "version": "2.6.0",
+  "version": "2.6.1",
+  "main": "index.js",
   "title": "JavaScript Load Image",
   "description": "JavaScript Load Image is a library to load images provided as File or Blob objects or via URL. It returns an optionally scaled and/or cropped HTML img or canvas element. It also provides a method to parse image meta data to extract Exif tags and thumbnails and to restore the complete image header after resizing.",
   "keywords": [
@@ -35,7 +36,7 @@
     "uglify-js": "2.6.1"
   },
   "scripts": {
-    "test": "standard js/*.js test/*.js && mocha-phantomjs test/index.html",
+    "test": "standard *.js js/*.js test/*.js && mocha-phantomjs test/index.html",
     "build": "cd js && uglifyjs load-image.js load-image-orientation.js load-image-meta.js load-image-exif.js load-image-exif-map.js -c -m -o load-image.all.min.js --source-map load-image.all.min.js.map",
     "preversion": "npm test",
     "version": "npm run build && git add -A js",

app/Resources/public/assets/blueimp-load-image/js/load-image.all.min.js

@@ -0,0 +1,44 @@
+{
+  "name": "bootstrap",
+  "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
+  "keywords": [
+    "css",
+    "js",
+    "less",
+    "mobile-first",
+    "responsive",
+    "front-end",
+    "framework",
+    "web"
+  ],
+  "homepage": "http://getbootstrap.com",
+  "license": "MIT",
+  "moduleType": "globals",
+  "main": [
+    "less/bootstrap.less",
+    "dist/js/bootstrap.js"
+  ],
+  "ignore": [
+    "/.*",
+    "_config.yml",
+    "CNAME",
+    "composer.json",
+    "CONTRIBUTING.md",
+    "docs",
+    "js/tests",
+    "test-infra"
+  ],
+  "dependencies": {
+    "jquery": "1.9.1 - 2"
+  },
+  "version": "3.3.6",
+  "_release": "3.3.6",
+  "_resolution": {
+    "type": "version",
+    "tag": "v3.3.6",
+    "commit": "81df608a40bf0629a1dc08e584849bb1e43e0b7a"
+  },
+  "_source": "git://github.com/twbs/bootstrap.git",
+  "_target": "3.*",
+  "_originalSource": "bootstrap"
+}

app/Resources/public/assets/blueimp-load-image/js/load-image.all.min.js.map

@@ -0,0 +1,5 @@
+Bootstrap uses [GitHub's Releases feature](https://github.com/blog/1547-release-your-software) for its changelogs.
+
+See [the Releases section of our GitHub project](https://github.com/twbs/bootstrap/releases) for changelogs for each release version of Bootstrap.
+
+Release announcement posts on [the official Bootstrap blog](http://blog.getbootstrap.com) contain summaries of the most noteworthy changes made in each release.