Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Translation into Spanish #770

Closed
wants to merge 189 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
189 commits
Select commit Hold shift + click to select a range
8c616df
Replaced `illuminate/cache` with `userfrosting/cache` component
lcharette Feb 24, 2017
edcd9f3
Moved the cache creation to a helper class for easier reuse later.
lcharette Feb 24, 2017
5cdd14c
That's better...
lcharette Feb 24, 2017
9fa0f4f
Implement session based caching and cache based ufAlerts
lcharette Feb 24, 2017
e3590fe
Added user cache
lcharette Feb 24, 2017
008c818
Implement the namespace registery and global flush function to flush …
lcharette Feb 25, 2017
e15d0fc
Refactor `MessageStream`. Provide config switch for the new cache bas…
lcharette Feb 27, 2017
b8a012f
`Cache` should be default storage
lcharette Feb 27, 2017
8a8cee0
Replaced cache namespace with tags
lcharette Mar 4, 2017
9920921
Moved session cache to it's own service.
lcharette Mar 4, 2017
5478486
Reworked alerts and cache
lcharette Mar 4, 2017
58730bf
Flush old session cache when the session id is regenerated or the ses…
lcharette Mar 5, 2017
df691b1
Merge branch 'develop' into feature-cache
lcharette Mar 5, 2017
48733ba
Merge 4.0.13
alexweissman Mar 20, 2017
7e3c39a
Refactoring composer setup
lcharette Mar 29, 2017
46fa2be
Moved `sprinkles.json` to directory root
lcharette Mar 29, 2017
50fc2b3
Packagist doesn't like uppercase
lcharette Mar 29, 2017
01f7e86
Merge branch 'hotfix' into develop
lcharette Mar 29, 2017
e1e8ac0
Start of version 4.1.x !
lcharette Mar 29, 2017
04d4267
first pass at refactoring initialization system
alexweissman Apr 3, 2017
0ac2b51
load routes in main UF class
alexweissman Apr 4, 2017
5fcebf5
factor out error message from SprinkleManager
alexweissman Apr 4, 2017
0787f57
core is now just an ordinary Sprinkle!
alexweissman Apr 4, 2017
853b4fe
factor out Sprinkle boot code
alexweissman Apr 4, 2017
5a43ab3
Fix CLI error rendering
alexweissman Apr 4, 2017
2f0bc20
cleanup and docblocks
alexweissman Apr 4, 2017
35c3694
Merge branch 'feature-installer' into develop
alexweissman Apr 4, 2017
6661096
Merge branch 'feature-event-driven' into develop
alexweissman Apr 4, 2017
8571217
Update composer.json
lcharette Apr 4, 2017
e1d8654
Merge branch 'hotfix' into develop
lcharette Apr 7, 2017
f9e9f24
fix path to sprinkles
alexweissman Apr 9, 2017
f6e63cf
Moved sessions table migration to core sprinkle.
Silic0nS0ldier Apr 26, 2017
fcf8883
Merge branch 'master' into develop
lcharette May 3, 2017
3ee27bf
Built the new Bakery
lcharette May 4, 2017
1ce3874
Moved the Bakery in the system
lcharette May 5, 2017
8b96b1d
Continued work on the Bakery
lcharette May 6, 2017
c57d0fe
Wrong `Builder`
lcharette May 6, 2017
5732e6a
Reworked `Migration` class to inject `$schema` in the construction is…
lcharette May 6, 2017
1afb3a7
Fix some comments and messages
lcharette May 6, 2017
75e5e83
New migration CLI tool
lcharette May 11, 2017
474559c
Reworked migration tool. Can now safely run migration up and save the…
lcharette May 13, 2017
b122f33
Merge branch 'hotfix' into develop
alexweissman May 13, 2017
ab4e90d
Forgot to incremet the batch number
lcharette May 13, 2017
a84f7fd
Rollback command
lcharette May 13, 2017
680922d
Moved `testDB` to a Trait
lcharette May 13, 2017
e139435
Move arg processing to main Bakery
lcharette May 13, 2017
8238f83
Add migrate:reset and migrate:refresh
lcharette May 13, 2017
12fbf96
Inject `io` into the migration class. Fix issue with installed depend…
lcharette May 14, 2017
02c6991
Added the root account creation migration
lcharette May 14, 2017
59fe345
Switched to the right io function
lcharette May 14, 2017
badd8e2
ASCII title
lcharette May 14, 2017
b2e6b79
Added .env setup
lcharette May 14, 2017
95e75b6
Updated compsoer.json
lcharette May 14, 2017
21595e3
Merge branch 'feature-tests' into develop
lcharette May 14, 2017
d87dcc2
Fix issue with registering the same stream twice
lcharette May 14, 2017
4b272a0
Reworked `testDB`
lcharette May 14, 2017
0cbb056
Reworked `setupEnv`. Now it makes more sense
lcharette May 14, 2017
16c84de
When first installing, the sprinkle.json needs to be created
lcharette May 14, 2017
ab80f2f
update composer.json
lcharette May 14, 2017
5d55c70
Sprinkles list on the dashboard can't show the version from the Versi…
lcharette May 15, 2017
ecbfaae
[CLI Installer] Ask question for the db driver
lcharette May 16, 2017
efaef93
Implement SMTP question in the installer
lcharette May 18, 2017
14464d6
Merge branch 'hotfix' into develop
alexweissman May 20, 2017
550001d
Fix bad error
lcharette May 22, 2017
d3e1baf
Merge branch 'master' into develop
lcharette May 22, 2017
30f44f6
Merge branch 'hotfix' into develop
lcharette May 22, 2017
e6836e5
Merge branch 'hotfix' into develop
lcharette May 22, 2017
e3ebb1d
Merge branch 'hotfix' into develop
lcharette May 26, 2017
d09de83
rework error-handling system
alexweissman May 30, 2017
d0db5f3
move mail error message to errors.php
alexweissman May 30, 2017
2d493bd
Merge branch 'feature-error-handling' into develop
alexweissman May 30, 2017
8dfbe2a
changelog
alexweissman May 30, 2017
50f0320
implement renderer inspired by Whoops (#674)
alexweissman May 30, 2017
a5cd4e3
changelog!
alexweissman May 30, 2017
092b7d2
Merge remote-tracking branch 'origin/feature-tablesorter-listable' in…
alexweissman May 30, 2017
298ee10
Fix issue with duplicate query logs when using multiple databases
alexweissman May 30, 2017
f96401d
Refactored the CLI to use Symfony app instead of depending on Composer
lcharette May 31, 2017
5d4ebbe
[Bakery] Allows empty password; Added default SMTP values
lcharette May 31, 2017
4a61cbf
Missing comment block
lcharette Jun 1, 2017
97e0c15
Fix broken `projectRoot` on php 5
lcharette Jun 1, 2017
35bcaba
Separated setup from debug command
lcharette Jun 1, 2017
8fe4c4e
Added test command
lcharette Jun 1, 2017
b978aee
Updated / added translations
splitt3r Jun 1, 2017
47c891d
Merge remote-tracking branch 'origin/hotfix' into develop
alexweissman Jun 1, 2017
b585ca6
Factor custom Builder methods out of Model, and reorganize models int…
alexweissman Jun 2, 2017
43f15c0
Begin unit tests for Sprunje
alexweissman Jun 2, 2017
1b6d471
oops fix namespaces for Relations in Model
alexweissman Jun 3, 2017
6eecbf1
Merged ufTable rebase.
Silic0nS0ldier Jun 3, 2017
0b5601f
Added fruther trasnlations
splitt3r Jun 3, 2017
2a86ee6
tests with PHPUnit's native mocking
alexweissman Jun 3, 2017
7ce73d7
Typo
lcharette Jun 3, 2017
2c19b64
Rename UFMigration back to Migration
alexweissman Jun 3, 2017
8931f82
Fixed strict mode violation.
Silic0nS0ldier Jun 3, 2017
d107ece
Merge branch 'develop' of https://github.com/userfrosting/UserFrostin…
Silic0nS0ldier Jun 3, 2017
c67621e
Added code that went missing during port.
Silic0nS0ldier Jun 4, 2017
b33c0e6
update path for migrations in bakery
alexweissman Jun 5, 2017
3f1060f
derp
alexweissman Jun 5, 2017
8f8c090
double-derp
alexweissman Jun 5, 2017
e723199
more namespace fixes
alexweissman Jun 5, 2017
50b2639
Translating that paginator
lcharette Jun 7, 2017
1a769b0
[uf-table] Removed `selectOptionsUrl`. Listables are loaded along wit…
lcharette Jun 9, 2017
1a89efe
Merge branch 'master' into develop
Silic0nS0ldier Jun 9, 2017
63c923a
re-implement "Display message when there are no results in `ufTable`"
alexweissman Jun 9, 2017
a2c77bc
Translator facade
alexweissman Jun 9, 2017
4c68caa
move ufTable labels into data-* attributes, for easy translation in Twig
alexweissman Jun 9, 2017
1266c51
translate status selections in UserSprunje
alexweissman Jun 9, 2017
e3d0d3b
naming conventions for CSS classes in ufTable
alexweissman Jun 9, 2017
6292729
Reapply filters after filter-select is modified
lcharette Jun 10, 2017
5b36a74
Removed the search field from the dashboard layout
lcharette Jun 10, 2017
d4a8833
Updated the changelog
lcharette Jun 10, 2017
47ec97b
Refactor groups and user routes
lcharette Jun 11, 2017
21b5e18
Fix missing translation
lcharette Jun 11, 2017
7cd4b6e
Add `pretend` option for the `migrate` cli commands
lcharette Jun 11, 2017
b5cdb56
[Bakery] Clear cache command
lcharette Jun 12, 2017
7dea9d1
Merged branch `feature-cache`
lcharette Jun 13, 2017
c14e237
Leave session as the default alert stream
lcharette Jun 13, 2017
801a17a
Renamed config, deleted CacheHelper, updated cli
lcharette Jun 13, 2017
e40b6c4
Cleanup Bakery
lcharette Jun 13, 2017
5f41a42
Dynamically load Bakery commands
lcharette Jun 13, 2017
a85b9dd
`Bake` is clearing cache now
lcharette Jun 13, 2017
ce52751
Renamed `Assets` to `BuildAssets` to avoid breaking the convention. A…
lcharette Jun 13, 2017
e87021f
fix indentation in ufTable
alexweissman Jun 13, 2017
4c3d36a
update config, i18n, assets, fortress, support components
alexweissman Jun 13, 2017
073bbfa
Implemented ifx (#708)
alexweissman Jun 14, 2017
5621af1
Set dataType for ajax requests
alexweissman Jun 14, 2017
3a29d44
Base sprinkles.json should be in BAkery
lcharette Jun 15, 2017
3053e96
Moved the ACSII Title to the Bake command
lcharette Jun 15, 2017
38b8b3c
Refresh db config after setting up .env
lcharette Jun 15, 2017
66093c4
Made error message clearer
lcharette Jun 15, 2017
b7cec10
remove copyright notices
alexweissman Jun 15, 2017
2ff4407
common log file (see #709)
alexweissman Jun 15, 2017
38d0ff5
Rename bundle.config.json -> asset-bundles.json
alexweissman Jun 15, 2017
584039a
move licenses
alexweissman Jun 15, 2017
12ddf85
Remove the root sprinkle
alexweissman Jun 16, 2017
3d0629c
blacklist routes from CSRF middleware
alexweissman Jun 16, 2017
bcb978f
Automatically build assets when `UF_MODE` is set to production
lcharette Jun 16, 2017
eb837d6
Updated BuildAssets command
lcharette Jun 17, 2017
0362ff4
Changed `bundle.config.json` to `asset-bundles.json` in gulpfile
lcharette Jun 17, 2017
33708dc
reorganize assets
alexweissman Jun 17, 2017
d03c8e8
remove unused dependencies
alexweissman Jun 17, 2017
3e1d4cd
Fix extras stream
alexweissman Jun 17, 2017
0c37ab3
minor fixes to ufAlerts, ufForm
alexweissman Jun 17, 2017
622d926
convert request schema from json to yaml
alexweissman Jun 17, 2017
f1ac612
change exception member variables to comply with style guide
alexweissman Jun 18, 2017
0fffe9e
apply hotfix from 4.0.23
alexweissman Jun 18, 2017
dd72be0
The big one. Templates reorganized.
alexweissman Jun 18, 2017
ffb2eb4
move request schema
alexweissman Jun 18, 2017
4f0c6ff
update package versions
alexweissman Jun 18, 2017
11f12d2
bump project version to 4.1
alexweissman Jun 19, 2017
ddccfd5
oops, forgot the -alpha
alexweissman Jun 19, 2017
b4c3a86
fix version in Composer...
alexweissman Jun 19, 2017
3b136e2
remove version attribute from composer
alexweissman Jun 19, 2017
61cbc65
Merge branch 'master' into hotfix
lcharette Jun 20, 2017
04aa95a
Throw warning when a class doesn't exist while doing a rollback
lcharette Jun 20, 2017
ae71c61
That error page doesn't exist anymore
lcharette Jun 20, 2017
d7e207b
That comment woudn't apply when using bake. The standalone command ne…
lcharette Jun 20, 2017
e2ea66d
Update error messages (en only so far)
alexweissman Jun 20, 2017
300efb4
add SPRINKLES_DIR path constant
alexweissman Jun 20, 2017
d6f2374
temp fix for #742
alexweissman Jun 22, 2017
e604d5c
Add fr message
lcharette Jun 23, 2017
2c2d2eb
Fix FR translation
lcharette Jun 25, 2017
eec32b5
Terrible indentation is terrible
lcharette Jun 25, 2017
5b77d54
Fix issue #688
lcharette Jun 25, 2017
329568f
Add more translations and update German translations
alexweissman Jun 26, 2017
9815a44
Update Arabic translations
alexweissman Jun 26, 2017
d054306
Fix bad placeholders
alexweissman Jun 26, 2017
7034d86
bump version
alexweissman Jun 26, 2017
c15373f
Fix for PostgreSQL setup
Jun 26, 2017
0f2df7e
Add Italian translations
alexweissman Jun 27, 2017
3da33a2
Add data-priority to other tables (#752)
alexweissman Jun 29, 2017
8b151b8
Fix Bakery errors show in HTML (#751)
lcharette Jun 29, 2017
569fbef
Pass the verbose argument to phpUnit
lcharette Jun 30, 2017
52b863e
table_search block
alexweissman Jun 30, 2017
890dfc9
merge in changes from 4.0.24
alexweissman Jul 1, 2017
bea4ff0
minor formatting
alexweissman Jul 3, 2017
7396a2c
Use `this.slug` to avoid conflict with helper names (#748)
alexweissman Jul 3, 2017
ecf6c27
Added missing french translations, more default validation messages
lcharette Jul 4, 2017
4a2bd59
Updated type in `composer.json`
lcharette Jul 4, 2017
7326a0d
Uses config for the default charset
lcharette Jul 4, 2017
efe9c41
Fix issue #759
lcharette Jul 7, 2017
6ca53e0
Added missing german translations. (#761)
Jul 7, 2017
b3ea577
Merge branch 'master' into hotfix
Silic0nS0ldier Jul 7, 2017
87e6e71
Fix migrate:rollback not running down the migration in the correct order
lcharette Jul 11, 2017
eda2a63
Version bump
lcharette Jul 11, 2017
4b8948f
bump min version of fortress
alexweissman Jul 11, 2017
89120ab
implement Bakery support for SQLite
alexweissman Jul 11, 2017
c9f60a8
Minor fixes to Bakery prompts
alexweissman Jul 11, 2017
c1e6e1d
Fix for PostgreSQL charset in Bakery (#745)
alexweissman Jul 11, 2017
599a420
update README
alexweissman Jul 11, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
Expand All @@ -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
Expand Down Expand Up @@ -58,3 +58,5 @@ public/css/min/*

# Ignore personal config files (v0.3.x)
app/config-userfrosting.php

app/database/userfrosting.db
67 changes: 65 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,68 @@
# Change Log

## v4.1.4-alpha
- Permissions rows get duplicated when upgrading from 4.0 to 4.1 (fix #759)
- Fix migrate:rollback not running down the migration in the correct order
- Updated type in `composer.json` for default sprinkles
- Added missing french translations & more default validation messages
- Bump Fortress version (fix #766)
- Support SQLite in Bakery setup
- Fix for PostgreSQL charset in Bakery (#745)

## v4.1.3-alpha
- Add Italian translations
- Add `data-priority` attributes to built-in tables (#752)
- Use `this.slug` to avoid conflict with helper names (#748)
- Add block `table_search` to `table-paginated.html.twig`

## v4.1.2-alpha
- Remove call to setFilters that was causing problems with pagination (#688)
- Update German translations and factor out some hardcoded text (#725)
- Update French translations
- Update Arabic translations (#733, #734, #735)

## v4.1.1-Alpha
- Fixed missing template in ExceptionHandler and `notFoundHandler`
- Migration rollback will throw a warning if a class is not found instead of aborting
- Temporary fix for trouble with `npm install` in Windows (#742)

## v4.1.0-Alpha
- 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.24-Alpha
- Fixes to nginx config file, and add location block for LE acme challenge
- Fix JS errors when `#alerts-page` is not present on a page
Expand Down Expand Up @@ -34,7 +97,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`.
Expand Down Expand Up @@ -172,4 +235,4 @@
- Etc.

## v4.0.0-Alpha
- Initial release of UserFrosting V4
- Initial release of UserFrosting V4
2 changes: 1 addition & 1 deletion licenses/UserFrosting.md → LICENSE.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
18 changes: 12 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# UserFrosting 4.0
# UserFrosting 4.1

[http://www.userfrosting.com](http://www.userfrosting.com)
[https://www.userfrosting.com](https://www.userfrosting.com)

If you simply want to show that you like this project, or want to remember it for later, you should **star**, not **fork**, this repository. Forking is only for when you are ready to create your own copy of the code to work on.

Expand All @@ -10,9 +10,9 @@ If you simply want to show that you like this project, or want to remember it fo

## By [Alex Weissman](https://alexanderweissman.com)

Copyright (c) 2017, free to use in personal and commercial software as per the [license](licenses/UserFrosting.md).
Copyright (c) 2017, free to use in personal and commercial software as per the [license](LICENSE.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

Expand All @@ -29,13 +29,13 @@ UserFrosting is a secure, modern user management system written in PHP and built

## Installation

Please see our [installation guide](https://learn.userfrosting.com/basics/installation).
Please see our [installation guide](https://learn.userfrosting.com/installation).

## Troubleshooting

If you are having trouble installing UserFrosting, please [join us in chat](https://chat.userfrosting.com).

If you are generally confused about the structure and layout of the code, or it doesn't look like the kind of PHP code that you're used to, please [start from the beginning](https://learn.userfrosting.com/basics/overview).
If you are generally confused about the structure and layout of the code, or it doesn't look like the kind of PHP code that you're used to, please [start from the beginning](https://learn.userfrosting.com/background).

## Mission Objectives

Expand All @@ -54,6 +54,12 @@ UserFrosting seeks to balance modern programming principles, like DRY and MVC, w

### [API documentation](http://api.userfrosting.com)

### [Change log](CHANGELOG.md)

## 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
Expand Down
47 changes: 0 additions & 47 deletions app/composer.json

This file was deleted.

27 changes: 19 additions & 8 deletions app/defines.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace UserFrosting;

// Some standard defines
define('UserFrosting\VERSION', '4.0.24-alpha');
define('UserFrosting\VERSION', '4.1.4-alpha');
define('UserFrosting\DS', '/');
define('UserFrosting\PHP_MIN_VERSION', '5.6');
define('UserFrosting\DEBUG_CONFIG', false);
Expand All @@ -18,20 +18,31 @@
// The directory containing APP_DIR. Usually, this will contain the entire website.
define('UserFrosting\ROOT_DIR', realpath(__DIR__ . '/..'));

// Composer's vendor directory
define('UserFrosting\VENDOR_DIR', APP_DIR . '/vendor');

define('UserFrosting\APP_DIR_NAME', basename(__DIR__));
define('UserFrosting\ASSET_DIR_NAME', 'assets');
define('UserFrosting\BUILD_DIR_NAME', 'build');
define('UserFrosting\CACHE_DIR_NAME', 'cache');
define('UserFrosting\EXTRA_DIR_NAME', 'extra');
define('UserFrosting\DB_DIR_NAME', 'database');
define('UserFrosting\SESSION_DIR_NAME', 'sessions');
define('UserFrosting\SPRINKLES_DIR_NAME', 'sprinkles');
define('UserFrosting\LOG_DIR_NAME', 'logs');
define('UserFrosting\VENDOR_DIR_NAME', 'vendor');

// Full path to Composer's vendor directory
define('UserFrosting\VENDOR_DIR', APP_DIR . DS . VENDOR_DIR_NAME);

// Full path to Sprinkles directory
define('UserFrosting\SPRINKLES_DIR', APP_DIR . DS . SPRINKLES_DIR_NAME);

// Full path to database directory (SQLite only)
define('UserFrosting\DB_DIR', APP_DIR . DS . DB_DIR_NAME);

// Names of directories within Sprinkles
define('UserFrosting\ASSET_DIR_NAME', 'assets');
define('UserFrosting\EXTRA_DIR_NAME', 'extra');
define('UserFrosting\CONFIG_DIR_NAME', 'config');
define('UserFrosting\LOCALE_DIR_NAME', 'locale');
define('UserFrosting\LOG_DIR_NAME', 'logs');
define('UserFrosting\ROUTE_DIR_NAME', 'routes');
define('UserFrosting\SCHEMA_DIR_NAME', 'schema');
define('UserFrosting\SRC_DIR_NAME', 'src');
define('UserFrosting\SPRINKLES_DIR_NAME', 'sprinkles');
define('UserFrosting\TEMPLATE_DIR_NAME', 'templates');
define('UserFrosting\FACTORY_DIR_NAME', 'factories');
25 changes: 0 additions & 25 deletions app/helpers.php

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"require": {

},
"base": [
"core",
"account",
"admin"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"bundle": {
"js/pages/account-settings": {
"scripts": [
"local/pages/js/account-settings.js"
"userfrosting/js/pages/account-settings.js"
],
"options": {
"result": {
Expand All @@ -14,7 +14,7 @@
},
"js/pages/forgot-password": {
"scripts": [
"local/pages/js/forgot-password.js"
"userfrosting/js/pages/forgot-password.js"
],
"options": {
"result": {
Expand All @@ -26,7 +26,7 @@
},
"js/pages/resend-verification": {
"scripts": [
"local/pages/js/resend-verification.js"
"userfrosting/js/pages/resend-verification.js"
],
"options": {
"result": {
Expand All @@ -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": {
Expand All @@ -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": {
Expand All @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/forgot-password
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/register
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/resend-verification
*/
Expand Down
Loading