From kde-commits  Sun Nov 02 21:02:12 2014
From: Ingo Malchow <imalchow () kde ! org>
Date: Sun, 02 Nov 2014 21:02:12 +0000
To: kde-commits
Subject: [websites/reservoir/develop] /: integrate new extension for having json based configs
Message-Id: <E1Xl2Hs-0000uf-9f () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=141496214129293

Git commit 0a6674fe6e252637b7a1b3545cb298b5c1e53d3b by Ingo Malchow.
Committed on 02/11/2014 at 20:57.
Pushed by imalchow into branch 'develop'.

integrate new extension for having json based configs
during a discussion with bcooksley it was made clear that it would be nice =
to have configs inside the site repos. So be it.

M  +1    -0    app/config/app.php
M  +2    -1    composer.json
M  +47   -2    composer.lock
A  +0    -0    public/themes/neverland/views/setting.json

http://commits.kde.org/websites/reservoir/0a6674fe6e252637b7a1b3545cb298b5c=
1e53d3b

diff --git a/app/config/app.php b/app/config/app.php
index 2f8663d..8f1d618 100644
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -123,6 +123,7 @@ return array(
 		'Illuminate\Workbench\WorkbenchServiceProvider',
 		'Teepluss\Theme\ThemeServiceProvider',
 		'Xinax\LaravelGettext\LaravelGettextServiceProvider',
+		'Philf\Setting\SettingServiceProvider',
 =

 	),
 =

diff --git a/composer.json b/composer.json
index fb78e93..edce84f 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,8 @@
 	"require": {
 		"laravel/framework": "4.2.*",
 		"teepluss/theme": "dev-master",
-		"xinax/laravel-gettext": "1.x"
+		"xinax/laravel-gettext": "1.x",
+		"philf/setting": "dev-master"
 	},
 	"autoload": {
 		"classmap": [
diff --git a/composer.lock b/composer.lock
index d71ec38..ff7ce58 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.m=
d#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "e858ff0b67decdf1081e3d1d2477da0f",
+    "hash": "f6f47f974294852abbd756a2279e846e",
     "packages": [
         {
             "name": "classpreloader/classpreloader",
@@ -567,6 +567,50 @@
             "time": "2014-08-05 08:00:32"
         },
         {
+            "name": "philf/setting",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Phil-F/Setting.git",
+                "reference": "52e6336d8c511cd8027e90a461019df9a127ffd9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Phil-F/Setting/zipbal=
l/52e6336d8c511cd8027e90a461019df9a127ffd9",
+                "reference": "52e6336d8c511cd8027e90a461019df9a127ffd9",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/support": "~4",
+                "php": ">=3D5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "3.7.*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Philf\\Setting": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Phil Foulston",
+                    "email": "info@weztec.com"
+                }
+            ],
+            "description": "Persistent configuration settings for Laravel =
- Create, Read, Update and Delete settings stored in files using JSON",
+            "keywords": [
+                "config",
+                "laravel"
+            ],
+            "time": "2014-07-20 10:36:44"
+        },
+        {
             "name": "phpseclib/phpseclib",
             "version": "0.3.8",
             "source": {
@@ -1790,7 +1834,8 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "teepluss/theme": 20
+        "teepluss/theme": 20,
+        "philf/setting": 20
     },
     "prefer-stable": false,
     "platform": [],
diff --git a/public/themes/neverland/views/setting.json b/public/themes/nev=
erland/views/setting.json
new file mode 100644
index 0000000..e69de29