Merge branch '2.9' into master

.bowerrc

@@ -0,0 +1,3 @@
+{
+    "directory": "components"
+}

.gitignore

@@ -10,9 +10,6 @@
 # Mac OS X crap
 .DS_Store
 
-# CodeKit configuration
-codekit-config.json
-
 # Builds
 build/*
 
@@ -36,5 +33,8 @@ components/*
 # Composer related stuff
 vendor/*
 
+# Bower related stuff
+components/*
+
 # node.js modules for development
 node_modules/*

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.3
   - 5.4
   - 5.5
 

CHANGELOG

@@ -6,15 +6,29 @@ CHANGELOG
 This is a log of major user-visible changes in each phpMyFAQ release.
 
 Version 3.0.0-dev - 2014-
-- changed PHP requirement to PHP 5.4.4 and later (Thorsten)
 - added Symfony HTTP Foundation 2.3.0 (Alexander M. Turek, Thorsten)
 - added Twig 1.123.1 as new template engine (Alexander M. Turek, Thorsten)
 - added support for Bower (Thorsten)
-- updated bundled Symfony ClassLoader to version 2.3.0 (Thorsten)
-- updated bundled Font Awesome to version 3.2.1 (Thorsten)
 - dropped support for ext/mysql (Thorsten)
 
-Version 2.8.2 -2013-07-
+Version 2.9.0-dev 2014-
+- changed PHP requirement to PHP 5.4.4 and later (Thorsten)
+- added frontend dependency management using Bower (Thorsten)
+- updated bundled Symfony ClassLoader to version 2.3.7 (Thorsten)
+
+Version 2.8.4 - 2013-11-
+- updated Chinese (Traditional) translation
+
+Version 2.8.3 - 2013-11-18
+- fixed missing permission check on Image Manager (Thorsten)
+- improved HTML / CSS code (Michael Meister)
+- updated Brazilian Portuguese translation
+- updated Japanese translation
+- updated Spanish translation
+- updated Swedish translation
+- fixed some minor bugs (Thorsten)
+
+Version 2.8.2 - 2013-07-25
 - added French Canada translation (Jacqueline Gazaille Tétreault)
 - improved attachment upload dialog with HTML5 File API (Thorsten)
 - updated Finnish translation (Pasi Pajukoski)

README.md

@@ -81,10 +81,6 @@ Mozilla Public License 2.0, see LICENSE for more information.
 
 Licensed under the terms of the GNU Lesser General Public License
 
-**[TinyMCE Ajax File Manager](http://www.phpletter.com/Our-Projects/Tinymce-Ajax-File-Manager-Project/)**
-
-Licensed under the terms of the Mozilla Public License
-
 **[SyntaxHighlighter](http://alexgorbatchev.com/wiki/SyntaxHighlighter)**
 
 Licensed under the terms of the GNU Lesser General Public License

bower.json

@@ -3,13 +3,17 @@
   "version": "3.0.0-dev",
   "main": "phpmyfaq.js",
   "ignore": [
+    "**/.*",
+    "node_modules",
     "components"
   ],
   "dependencies": {
-    "modernizr":    "2.6.2",
-    "bootstrap":    "3.0.0",
-    "font-awesome": "3.2.1",
-    "sparkline":    "2.1.1",
-    "jquery":       "2.0.0"
+    "modernizr": "~2.6.3",
+    "bootstrap": "~3.0.2",
+    "rbootstrap": "~3.0.0",
+    "font-awesome": "~4.0.3",
+    "sparkline": "~2.1.2",
+    "tinymce": "~4.0.10",
+    "jquery": "1.10.2"
   }
 }

composer.json

@@ -47,30 +47,16 @@
                     "reference": "master"
                 }
             }
-        },
-        {
-            "type": "package",
-            "package": {
-                "name":    "jnaqsh/bootstrap",
-                "version": "master",
-                "source": {
-                    "url":       "https://github.com/jnaqsh/bootstrap.git",
-                    "type":      "git",
-                    "reference": "master"
-                }
-            }
         }
     ],
     "require": {
-        "php":                     ">=5.3.3",
+        "php":                     ">=5.4.4",
         "symfony/class-loader":    ">=2.3",
         "symfony/http-foundation": ">=2.3",
         "twig/twig":               "*",
         "phpseclib":               "master@dev",
         "tcpdf":                   "master@dev",
-        "twitteroauth":            "master@dev",
-        "twitter/bootstrap":       "2.3.*",
-        "jnaqsh/bootstrap":        "master@dev"
+        "twitteroauth":            "master@dev"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*",