Merge branch '2.0'

* 2.0:
  Update php-cs-fixer configuration file to use v2
  Adding changelog item for adminlte theme
  Preparing 2.4.0 changelog for adminlte theme
  Updating and compiling assets
  Migrate Adminlte theme to laravel mix
  Preparing 2.4 changelog for media
  Creating a @thumbnail blade directive
  Preparing the user changelog
  Show build status on 2.0 branch
  Move build icon at start
  Using a flat badge
  Adding back a proper readme file

# Conflicts:
#	Themes/Adminlte/assets/vendor/jquery-ui/external/jquery-1.7.0/MIT-LICENSE.txt
#	Themes/Adminlte/assets/vendor/jquery-ui/external/jquery-1.7.1/MIT-LICENSE.txt
#	Themes/Adminlte/changelog.yml
#	public/themes/adminlte/vendor/sisyphus/vendor/jasmine/MIT.LICENSE
#	readme.md

.php_cs → .php_cs.dist

@@ -1,53 +1,52 @@
 <?php
 
-$finder = Symfony\CS\Finder\DefaultFinder::create()
-    ->exclude('public')
-    ->exclude('vendor')
-    ->exclude('storage')
-    ->exclude('app')
-    ->exclude('bootstrap')
-    ->exclude('tests')
-    ->notPath('server.php')
+$finder = PhpCsFixer\Finder::create()
     ->in(__DIR__)
+    ->exclude([
+        'public',
+        'vendor',
+        'storage',
+        'app',
+        'bootstrap',
+        'tests',
+        'node_modules',
+    ])
+    ->notPath('server.php')
 ;
 
-return Symfony\CS\Config\Config::create()
-    ->setUsingCache(true)
-    ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
-    ->fixers(array(
+return PhpCsFixer\Config::create()
+    ->setFinder($finder)
+    ->setRules([
+        '@PSR2' => true,
         // Concatenation should be used with at least one whitespace around.
-        'concat_with_spaces',
+        'concat_space' => ['spacing' => 'one'],
         // Unused use statements must be removed.
-        'ordered_use',
+        'ordered_imports' => true,
         // Removes extra empty lines.
-        'extra_empty_lines',
-        // Removes line breaks between use statements.
-        'remove_lines_between_uses',
+        'no_extra_consecutive_blank_lines' => true,
         // An empty line feed should precede a return statement.
-        'return',
+        'blank_line_before_return' => true,
         // Unused use statements must be removed.
-        'unused_use',
+        'no_unused_imports' => true,
         // Remove trailing whitespace at the end of blank lines.
-        'whitespacy_lines',
+        'no_whitespace_in_blank_line' => true,
         // There MUST be one blank line after the namespace declaration.
-        'line_after_namespace',
+        'blank_line_after_namespace' => true,
         // There should be exactly one blank line before a namespace declaration.
-        'single_blank_line_before_namespace',
+        'single_blank_line_before_namespace' => true,
         // Each namespace use MUST go on its own line and there MUST be one blank line after the use statements block.
-        'single_line_after_imports',
+        'single_line_after_imports' => true,
         // Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline.
-        'blankline_after_open_tag',
+        'blank_line_after_opening_tag' => true,
         // Remove duplicated semicolons.
-        'duplicate_semicolon',
+        'no_empty_statement' => true,
         // PHP multi-line arrays should have a trailing comma.
-        'multiline_array_trailing_comma',
+        'trailing_comma_in_multiline_array' => true,
         // There should be no empty lines after class opening brace.
-        'no_blank_lines_after_class_opening',
+        'no_blank_lines_after_class_opening' => true,
         // There should not be blank lines between docblock and the documented element.
-        'no_empty_lines_after_phpdocs',
+        'no_blank_lines_after_phpdoc' => true,
         // Phpdocs should start and end with content, excluding the very first and last line of the docblocks.
-        'phpdoc_trim',
-        // Removes line breaks between use statements.
-        'remove_lines_between_uses',
-    ))
-    ->finder($finder);
+        'phpdoc_trim' => true,
+    ])
+;

Themes/Adminlte/assets/vendor/jquery-ui/external/jquery-1.7.0/MIT-LICENSE.txt~2.0

@@ -0,0 +1,20 @@
+Copyright (c) 2011 John Resig, http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Themes/Adminlte/assets/vendor/jquery-ui/external/jquery-1.7.0/MIT-LICENSE.txt~HEAD

@@ -0,0 +1,20 @@
+Copyright (c) 2011 John Resig, http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Themes/Adminlte/assets/vendor/jquery-ui/external/jquery-1.7.1/MIT-LICENSE.txt~2.0

@@ -0,0 +1,20 @@
+Copyright (c) 2011 John Resig, http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Themes/Adminlte/assets/vendor/jquery-ui/external/jquery-1.7.1/MIT-LICENSE.txt~HEAD

@@ -0,0 +1,20 @@
+Copyright (c) 2011 John Resig, http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Themes/Adminlte/changelog.yml

@@ -3,6 +3,7 @@ versions:
     "2.4.0@unreleased":
         changed:
             - Moved to using laravel.mix
+            - Dependencies are now handled by NPM instead of Bower
     "2.0.0":
         added:
             - Manual notifications partial, to remove laracasts/flash