Merge branch 'master' into hotfix

Author: lcharette

.gitignore

@@ -11,8 +11,8 @@ _meta/*
 app/.env
 
 # Ignore composer-generated files
-app/composer.lock
-app/composer.phar
+composer.lock
+composer.phar
 
 # Ignore log, cache, and sessions directories
 app/cache/*
@@ -28,7 +28,7 @@ app/sessions/*
 /app/sprinkles/*/assets/vendor/
 
 # Ignore sprinkles.json config file
-app/sprinkles/sprinkles.json
+app/sprinkles.json
 
 # Ignore sample site sprinkle
 app/sprinkles/site-dev

CHANGELOG.md

@@ -1,7 +1,43 @@
 # Change Log
 
-## v4.0.23-Alpha
+## v4.1.0
+- Switch from pagination "plugin" to "widget" for Tablesorter.  Allows us to update to the latest version of TS (fix #688, #715)
+- Implement `WhoopsRenderer` for pretty debug pages.  See (#674)
+- Refactor error handling.  Move responsibility for displayErrorDetails to handlers, and factor our ErrorRenderers.  Addresses (#702)
+- Move `composer.json` to root directory to allow installing UF via composer create-project
+- Move `sprinkles.json` to app directory to make it easier to find
+- Eliminate the `root` theme Sprinkle.  Custom styling for the root user is now handled with some Twig logic in the `admin` Sprinkle (#726)
+- Rename bundle.config.json -> asset-bundles.json (#726)
+- Reorganize assets (#726)
+- Heavily reorganize templates (#726)
+- Move request schema from `schema/` to `schema/requests/` (#726)
+- Factor out "system" classes from core Sprinkle
+- Refactor overall application lifecycle; move main lifecycle into UserFrosting\System\UserFrosting
+- SprinkleManager now better focused on a single responsibility
+- Sprinkle initializer classes now use events to hook into application lifecycle
+- Support for allowing Sprinkles to register middleware (#617)
+- Automatically load Sprinkle service providers (see #636)
+- Get rid of "implicit loading" for core Sprinkle - core is now just an ordinary Sprinkle like any other.
+- The `sprinkles://` stream now represents a virtual filesystem for the root directory of each loaded sprinkle, rather than the `sprinkles/` directory itself.
+- Separate out `localePathBuilder` from the `translator` service.  Makes it easier to add/remove paths before actually loading the translations.
+- Only present locale options with non-null names.
+- Rebased ufTable and ufModal with new jQuery plugin template. (part of #646)
+- Removed the search bar from the Dashboard layout
+- Added Tablesorter pagination translation
+- New Translator Facade
+- New CLI tool (Bakery). 
+- New migration system based on bakery CLI
+- Listable sprunjing
+- Refactor groups and user routes (Fix #721)
+- Added the `config` alert stream to save ufAlerts to the cache instead of sessions. Fix #633. The old `session` is still the default alertStream in 4.1.
+- Added support for the Redis cache driver and refactored the cache config values.
+- Added user and session cache.
+- Common log file for db queries, auth checks, smtp, errors, and debug messages (#709).
+- Use YAML as default format for request schema (#690)
+
+See [http://learn.userfrosting.com/upgrading/40-to-41](Upgrading 4.0.x to 4.1.x documentation) for complete list of changes and breaking changes.
 
+## v4.0.23-Alpha
 - Set module dependency versions to ~4.0.0 instead of ^4.0.0 (since 4.1.x will introduce breaking changes)
 - Fix bug in ufCollection
 
@@ -29,7 +65,7 @@
 - New custom relationships 'BelongsToManyThrough', 'BelongsToManyUnique', 'BelongsToManyConstrained', 'HasManySyncable', 'MorphManySyncable'
 - Change implementation of User::permissions() to use BelongsToManyThrough
 - New ufForm options: setting reqParams, encType, submittingText
-- ufCollection now triggers a check for virgin rows when _any_ control is touched 
+- ufCollection now triggers a check for virgin rows when _any_ control is touched
 - Fix issue with Sprunje when generating CSV with empty child collections (#697)
 - Authorizer now correctly interprets string literals (#482)
 - Authorizer now correctly interprets numeric types in access conditions.  **Caution**: this causes the `equals()` callback to return true in situations where it would have (incorrectly) returned false before.  For example, `equals(self.group_id,2)` would have returned false for users in group 2, because it was interpreting `2` as a string and then performing its strict comparison.  It now (correctly) returns true.  Notice that `equals(self.group_id,'2')`, on the other hand, will now return `false`.

licenses/UserFrosting.md LICENSE.mdlicenses/UserFrosting.md renamed to LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2016 by Alexander Weissman (https://alexanderweissman.com)
+Copyright (c) 2017 by Alexander Weissman (https://alexanderweissman.com)
 
 UserFrosting is 100% free and open-source.
 

README.md

@@ -1,4 +1,4 @@
-# UserFrosting 4.0
+# UserFrosting 4.1
 
 [http://www.userfrosting.com](http://www.userfrosting.com)
 
@@ -12,7 +12,7 @@ If you simply want to show that you like this project, or want to remember it fo
 
 Copyright (c) 2017, free to use in personal and commercial software as per the [license](licenses/UserFrosting.md).
 
-UserFrosting is a secure, modern user management system written in PHP and built on top of the [Slim Microframework](http://www.slimframework.com/), [Twig](http://twig.sensiolabs.org/) templating engine, and [Eloquent](https://laravel.com/docs/5.2/eloquent#introduction) ORM.
+UserFrosting is a secure, modern user management system written in PHP and built on top of the [Slim Microframework](http://www.slimframework.com/), [Twig](http://twig.sensiolabs.org/) templating engine, and [Eloquent](https://laravel.com/docs/5.4/eloquent#introduction) ORM.
 
 ## Features
 
@@ -54,6 +54,10 @@ UserFrosting seeks to balance modern programming principles, like DRY and MVC, w
 
 ### [API documentation](http://api.userfrosting.com)
 
+## Running tests
+
+Run `php bakery test` from the root project directory. Any tests included in `sprinkles/*/tests` will be run.
+
 ## About the Developers
 
 ### Alexander Weissman

app/composer.json

@@ -3,7 +3,7 @@
 namespace UserFrosting;
 
 // Some standard defines
-define('UserFrosting\VERSION', '4.0.23-alpha');
+define('UserFrosting\VERSION', '4.1.0-alpha');
 define('UserFrosting\DS', '/');
 define('UserFrosting\PHP_MIN_VERSION', '5.6');
 define('UserFrosting\DEBUG_CONFIG', false);
@@ -35,3 +35,4 @@
 define('UserFrosting\SRC_DIR_NAME', 'src');
 define('UserFrosting\SPRINKLES_DIR_NAME', 'sprinkles');
 define('UserFrosting\TEMPLATE_DIR_NAME', 'templates');
+define('UserFrosting\FACTORY_DIR_NAME', 'factories');

app/defines.php

@@ -1,6 +1,10 @@
 {
+    "require": {
+
+    },
     "base": [
+        "core",
         "account",
         "admin"
     ]
-}
+}

app/helpers.php

@@ -2,7 +2,7 @@
     "bundle": {
         "js/pages/account-settings": {
             "scripts": [
-                "local/pages/js/account-settings.js"
+                "userfrosting/js/pages/account-settings.js"
             ],
             "options": {
                 "result": {
@@ -14,7 +14,7 @@
         },
         "js/pages/forgot-password": {
             "scripts": [
-                "local/pages/js/forgot-password.js"
+                "userfrosting/js/pages/forgot-password.js"
             ],
             "options": {
                 "result": {
@@ -26,7 +26,7 @@
         },
         "js/pages/resend-verification": {
             "scripts": [
-                "local/pages/js/resend-verification.js"
+                "userfrosting/js/pages/resend-verification.js"
             ],
             "options": {
                 "result": {
@@ -38,7 +38,7 @@
         },
         "js/pages/set-or-reset-password": {
             "scripts": [
-                "local/pages/js/set-or-reset-password.js"
+                "userfrosting/js/pages/set-or-reset-password.js"
             ],
             "options": {
                 "result": {
@@ -51,8 +51,8 @@
         "js/pages/register": {
             "scripts": [
                 "vendor/speakingurl/speakingurl.min.js",
-                "local/core/js/uf-captcha.js",
-                "local/pages/js/register.js"
+                "userfrosting/js/uf-captcha.js",
+                "userfrosting/js/pages/register.js"
             ],
             "options": {
                 "result": {
@@ -65,7 +65,7 @@
         "js/pages/sign-in": {
             "scripts": [
                 "vendor/urijs/src/URI.js",
-                "local/pages/js/sign-in.js"
+                "userfrosting/js/pages/sign-in.js"
             ],
             "options": {
                 "result": {

app/sprinkles/sprinkles.example.json app/sprinkles.example.jsonapp/sprinkles/sprinkles.example.json renamed to app/sprinkles.example.json

@@ -2,7 +2,7 @@
  * Page-specific Javascript file.  Should generally be included as a separate asset bundle in your page template.
  * example: {{ assets.js('js/pages/sign-in-or-register') | raw }}
  *
- * This script depends on validation rules specified in components/page.js.twig.
+ * This script depends on validation rules specified in pages/partials/page.js.twig.
  *
  * Target page: account/settings
  */