Merge branch 'main' of github.com:franknstayn/merchbay_laravel5 into main
This commit is contained in:
franknstayn
0
.env.example
Normal file → Executable file
0
.env.example
Normal file → Executable file
0
.gitattributes
vendored
Normal file → Executable file
0
.gitattributes
vendored
Normal file → Executable file
0
.gitignore
vendored
Normal file → Executable file
0
.gitignore
vendored
Normal file → Executable file
0
.vscode/settings.json
vendored
Normal file → Executable file
0
.vscode/settings.json
vendored
Normal file → Executable file
0
app/Commands/Command.php
Normal file → Executable file
0
app/Commands/Command.php
Normal file → Executable file
0
app/Console/Commands/Inspire.php
Normal file → Executable file
0
app/Console/Commands/Inspire.php
Normal file → Executable file
0
app/Console/Kernel.php
Normal file → Executable file
0
app/Console/Kernel.php
Normal file → Executable file
0
app/Events/Event.php
Normal file → Executable file
0
app/Events/Event.php
Normal file → Executable file
0
app/Exceptions/Handler.php
Normal file → Executable file
0
app/Exceptions/Handler.php
Normal file → Executable file
0
app/Handlers/Commands/.gitkeep
Normal file → Executable file
0
app/Handlers/Commands/.gitkeep
Normal file → Executable file
0
app/Handlers/Events/.gitkeep
Normal file → Executable file
0
app/Handlers/Events/.gitkeep
Normal file → Executable file
0
app/Http/Controllers/ApiController.php
Normal file → Executable file
0
app/Http/Controllers/ApiController.php
Normal file → Executable file
0
app/Http/Controllers/Auth/AuthController.php
Normal file → Executable file
0
app/Http/Controllers/Auth/AuthController.php
Normal file → Executable file
0
app/Http/Controllers/Auth/PasswordController.php
Normal file → Executable file
0
app/Http/Controllers/Auth/PasswordController.php
Normal file → Executable file
0
app/Http/Controllers/Controller.php
Normal file → Executable file
0
app/Http/Controllers/Controller.php
Normal file → Executable file
0
app/Http/Controllers/CustomAuthController.php
Normal file → Executable file
0
app/Http/Controllers/CustomAuthController.php
Normal file → Executable file
0
app/Http/Controllers/HomeController.php
Normal file → Executable file
0
app/Http/Controllers/HomeController.php
Normal file → Executable file
0
app/Http/Controllers/MainController.php
Normal file → Executable file
0
app/Http/Controllers/MainController.php
Normal file → Executable file
0
app/Http/Controllers/PatternsController.php
Normal file → Executable file
0
app/Http/Controllers/PatternsController.php
Normal file → Executable file
0
app/Http/Controllers/PrintPatternController.php
Normal file → Executable file
0
app/Http/Controllers/PrintPatternController.php
Normal file → Executable file
0
app/Http/Controllers/SizesController.php
Normal file → Executable file
0
app/Http/Controllers/SizesController.php
Normal file → Executable file
0
app/Http/Controllers/SportsController.php
Normal file → Executable file
0
app/Http/Controllers/SportsController.php
Normal file → Executable file
0
app/Http/Controllers/TemplatesController.php
Normal file → Executable file
0
app/Http/Controllers/TemplatesController.php
Normal file → Executable file
0
app/Http/Controllers/WelcomeController.php
Normal file → Executable file
0
app/Http/Controllers/WelcomeController.php
Normal file → Executable file
0
app/Http/Controllers/cliparts/ClipartsController.php
Normal file → Executable file
0
app/Http/Controllers/cliparts/ClipartsController.php
Normal file → Executable file
0
app/Http/Controllers/designer/DesignerController.php
Normal file → Executable file
0
app/Http/Controllers/designer/DesignerController.php
Normal file → Executable file
0
app/Http/Controllers/paypal/PaypalController.php
Normal file → Executable file
0
app/Http/Controllers/paypal/PaypalController.php
Normal file → Executable file
0
app/Http/Controllers/teamstore/TeamStoreController.php
Normal file → Executable file
0
app/Http/Controllers/teamstore/TeamStoreController.php
Normal file → Executable file
0
app/Http/Controllers/user/UserController.php
Normal file → Executable file
0
app/Http/Controllers/user/UserController.php
Normal file → Executable file
0
app/Http/Kernel.php
Normal file → Executable file
0
app/Http/Kernel.php
Normal file → Executable file
0
app/Http/Middleware/Authenticate.php
Normal file → Executable file
0
app/Http/Middleware/Authenticate.php
Normal file → Executable file
0
app/Http/Middleware/CheckTeamStorePassword.php
Normal file → Executable file
0
app/Http/Middleware/CheckTeamStorePassword.php
Normal file → Executable file
0
app/Http/Middleware/Cors.php
Normal file → Executable file
0
app/Http/Middleware/Cors.php
Normal file → Executable file
0
app/Http/Middleware/IsAdmin.php
Normal file → Executable file
0
app/Http/Middleware/IsAdmin.php
Normal file → Executable file
0
app/Http/Middleware/IsUser.php
Normal file → Executable file
0
app/Http/Middleware/IsUser.php
Normal file → Executable file
0
app/Http/Middleware/RedirectIfAuthenticated.php
Normal file → Executable file
0
app/Http/Middleware/RedirectIfAuthenticated.php
Normal file → Executable file
0
app/Http/Middleware/VerifyCsrfToken.php
Normal file → Executable file
0
app/Http/Middleware/VerifyCsrfToken.php
Normal file → Executable file
0
app/Http/Middleware/isAuthorized.php
Normal file → Executable file
0
app/Http/Middleware/isAuthorized.php
Normal file → Executable file
0
app/Http/Requests/Request.php
Normal file → Executable file
0
app/Http/Requests/Request.php
Normal file → Executable file
0
app/Http/routes.php
Normal file → Executable file
0
app/Http/routes.php
Normal file → Executable file
0
app/Models/ApiModel.php
Normal file → Executable file
0
app/Models/ApiModel.php
Normal file → Executable file
0
app/Models/MainModel.php
Normal file → Executable file
0
app/Models/MainModel.php
Normal file → Executable file
0
app/Models/PatternsModel.php
Normal file → Executable file
0
app/Models/PatternsModel.php
Normal file → Executable file
0
app/Models/PrintPatternModel.php
Normal file → Executable file
0
app/Models/PrintPatternModel.php
Normal file → Executable file
0
app/Models/SizesModel.php
Normal file → Executable file
0
app/Models/SizesModel.php
Normal file → Executable file
0
app/Models/SportsModel.php
Normal file → Executable file
0
app/Models/SportsModel.php
Normal file → Executable file
0
app/Models/TemplatesModel.php
Normal file → Executable file
0
app/Models/TemplatesModel.php
Normal file → Executable file
0
app/Models/cliparts/ClipartsModel.php
Normal file → Executable file
0
app/Models/cliparts/ClipartsModel.php
Normal file → Executable file
0
app/Models/designer/DesignerModel.php
Normal file → Executable file
0
app/Models/designer/DesignerModel.php
Normal file → Executable file
0
app/Models/paypal/PayPalModel.php
Normal file → Executable file
0
app/Models/paypal/PayPalModel.php
Normal file → Executable file
0
app/Models/teamstore/TeamStoreModel.php
Normal file → Executable file
0
app/Models/teamstore/TeamStoreModel.php
Normal file → Executable file
0
app/Models/user/UserModel.php
Normal file → Executable file
0
app/Models/user/UserModel.php
Normal file → Executable file
0
app/Providers/AppServiceProvider.php
Normal file → Executable file
0
app/Providers/AppServiceProvider.php
Normal file → Executable file
0
app/Providers/BusServiceProvider.php
Normal file → Executable file
0
app/Providers/BusServiceProvider.php
Normal file → Executable file
0
app/Providers/ConfigServiceProvider.php
Normal file → Executable file
0
app/Providers/ConfigServiceProvider.php
Normal file → Executable file
0
app/Providers/EventServiceProvider.php
Normal file → Executable file
0
app/Providers/EventServiceProvider.php
Normal file → Executable file
0
app/Providers/RouteServiceProvider.php
Normal file → Executable file
0
app/Providers/RouteServiceProvider.php
Normal file → Executable file
0
app/Services/Registrar.php
Normal file → Executable file
0
app/Services/Registrar.php
Normal file → Executable file
0
app/Traits/CaptchaTrait.php
Normal file → Executable file
0
app/Traits/CaptchaTrait.php
Normal file → Executable file
0
app/User.php
Normal file → Executable file
0
app/User.php
Normal file → Executable file
0
bootstrap/app.php
Normal file → Executable file
0
bootstrap/app.php
Normal file → Executable file
0
bootstrap/autoload.php
Normal file → Executable file
0
bootstrap/autoload.php
Normal file → Executable file
0
composer.json
Normal file → Executable file
0
composer.json
Normal file → Executable file
560
composer.lock
generated
Normal file → Executable file
560
composer.lock
generated
Normal file → Executable file
File diff suppressed because it is too large
Load Diff
0
config/app.php
Normal file → Executable file
0
config/app.php
Normal file → Executable file
0
config/auth.php
Normal file → Executable file
0
config/auth.php
Normal file → Executable file
0
config/cache.php
Normal file → Executable file
0
config/cache.php
Normal file → Executable file
0
config/compile.php
Normal file → Executable file
0
config/compile.php
Normal file → Executable file
0
config/database.php
Normal file → Executable file
0
config/database.php
Normal file → Executable file
0
config/filesystems.php
Normal file → Executable file
0
config/filesystems.php
Normal file → Executable file
0
config/laravel-analytics.php
Normal file → Executable file
0
config/laravel-analytics.php
Normal file → Executable file
0
config/mail.php
Normal file → Executable file
0
config/mail.php
Normal file → Executable file
0
config/queue.php
Normal file → Executable file
0
config/queue.php
Normal file → Executable file
0
config/services.php
Normal file → Executable file
0
config/services.php
Normal file → Executable file
0
config/session.php
Normal file → Executable file
0
config/session.php
Normal file → Executable file
0
config/site_config.php
Normal file → Executable file
0
config/site_config.php
Normal file → Executable file
0
config/view.php
Normal file → Executable file
0
config/view.php
Normal file → Executable file
0
database/.gitignore
vendored
Normal file → Executable file
0
database/.gitignore
vendored
Normal file → Executable file
0
database/migrations/.gitkeep
Normal file → Executable file
0
database/migrations/.gitkeep
Normal file → Executable file
0
database/migrations/2019_01_25_152539_create_session_table.php
Normal file → Executable file
0
database/migrations/2019_01_25_152539_create_session_table.php
Normal file → Executable file
0
database/migrations/2020_11_17_214014_create_api_models_table.php
Normal file → Executable file
0
database/migrations/2020_11_17_214014_create_api_models_table.php
Normal file → Executable file
0
database/seeds/.gitkeep
Normal file → Executable file
0
database/seeds/.gitkeep
Normal file → Executable file
0
database/seeds/DatabaseSeeder.php
Normal file → Executable file
0
database/seeds/DatabaseSeeder.php
Normal file → Executable file
0
gulpfile.js
Normal file → Executable file
0
gulpfile.js
Normal file → Executable file
0
package.json
Normal file → Executable file
0
package.json
Normal file → Executable file
0
phpspec.yml
Normal file → Executable file
0
phpspec.yml
Normal file → Executable file
0
phpunit.xml
Normal file → Executable file
0
phpunit.xml
Normal file → Executable file
0
public/.htaccess
Normal file → Executable file
0
public/.htaccess
Normal file → Executable file
0
public/api/usaCities.json
Normal file → Executable file
0
public/api/usaCities.json
Normal file → Executable file
0
public/assets/css/bootstrap-theme.css
vendored
Normal file → Executable file
0
public/assets/css/bootstrap-theme.css
vendored
Normal file → Executable file
0
public/assets/css/bootstrap-theme.css.map
Normal file → Executable file
0
public/assets/css/bootstrap-theme.css.map
Normal file → Executable file
0
public/assets/css/bootstrap-theme.min.css
vendored
Normal file → Executable file
0
public/assets/css/bootstrap-theme.min.css
vendored
Normal file → Executable file
0
public/assets/css/bootstrap-theme.min.css.map
Normal file → Executable file
0
public/assets/css/bootstrap-theme.min.css.map
Normal file → Executable file
0
public/assets/css/bootstrap.css
vendored
Normal file → Executable file
0
public/assets/css/bootstrap.css
vendored
Normal file → Executable file
0
public/assets/css/bootstrap.css.map
Normal file → Executable file
0
public/assets/css/bootstrap.css.map
Normal file → Executable file
0
public/assets/css/bootstrap.min.css
vendored
Normal file → Executable file
0
public/assets/css/bootstrap.min.css
vendored
Normal file → Executable file
0
public/assets/css/bootstrap.min.css.map
Normal file → Executable file
0
public/assets/css/bootstrap.min.css.map
Normal file → Executable file
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user