Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
185 commits
Select commit Hold shift + click to select a range
032fe5f
Update readme.md
georgemjohn Dec 16, 2015
c1f1c31
Updated for next release
georgemjohn Jan 23, 2016
4b40817
Update for 4.0
georgemjohn Feb 22, 2016
b48a947
Delete .env
georgemjohn Feb 22, 2016
cc88df4
Update composer
georgemjohn Feb 22, 2016
bcd5c52
env update
georgemjohn Feb 22, 2016
70f7180
Merge remote-tracking branch 'CMS/master'
georgemjohn Feb 22, 2016
e61bb82
Applied fixes from StyleCI
Renfos Feb 22, 2016
2b7c202
Merge pull request #53 from LavaLite/analysis-zOM0N4
Renfos Feb 22, 2016
9d33465
Composer update
georgemjohn Feb 22, 2016
865c069
Composer update
georgemjohn Feb 22, 2016
9764943
Update composer
georgemjohn Feb 22, 2016
8a59295
classmap
georgemjohn Feb 22, 2016
ad7a9fa
Update views
georgemjohn Feb 23, 2016
da5ef59
Update migration and seeds
georgemjohn Feb 23, 2016
6d30084
Seeds update
georgemjohn Feb 23, 2016
c672f17
Update read me.
georgemjohn Feb 23, 2016
9468a01
Applied fixes from StyleCI
Renfos Feb 23, 2016
2efd8de
Merge pull request #54 from LavaLite/analysis-XNA2JG
Renfos Feb 23, 2016
a589c08
Update migrations
georgemjohn Feb 24, 2016
7e82794
Update readme.md
Renfos Feb 26, 2016
f159d0a
Update header.
georgemjohn Mar 11, 2016
ad75a41
New Feature added
georgemjohn Mar 14, 2016
f6cc101
Merge branch 'master' of https://github.com/LavaLite/cms
georgemjohn Mar 14, 2016
eb59ee9
fixed untracked files
georgemjohn Mar 14, 2016
2edddfe
License updated
georgemjohn Mar 14, 2016
3f8e43b
Applied fixes from StyleCI
Renfos Mar 14, 2016
2086c79
Merge pull request #60 from LavaLite/analysis-8m4j0W
Renfos Mar 14, 2016
ff0d58d
Composer update - 5.2.23 generate error with former.
georgemjohn Mar 15, 2016
0cd450e
Version fixes
georgemjohn Mar 15, 2016
cf3a90c
Merge pull request #61 from LavaLite/4.0
Renfos Mar 15, 2016
6bd627c
Admin side date pick.
georgemjohn Mar 15, 2016
3e935f0
Merge pull request #62 from LavaLite/4.0
Renfos Mar 15, 2016
e318ada
Bug fix
georgemjohn Mar 18, 2016
f8d5942
Merge branch 'master' of https://github.com/LavaLite/cms
georgemjohn Mar 18, 2016
aca09a9
Update for next release
georgemjohn Apr 15, 2016
bde7c79
Bug fixes and updates
georgemjohn Apr 18, 2016
627ef75
Merge pull request #73 from LavaLite/develop
Renfos Apr 18, 2016
a08ef0a
Layout update
georgemjohn Apr 20, 2016
6d03c93
Enabled multiauth features
georgemjohn Apr 27, 2016
e51f625
Removed sample package
georgemjohn Apr 27, 2016
509547f
Multi auth bug fix
georgemjohn Apr 28, 2016
e10f310
Merge pull request #78 from LavaLite/develop
Renfos Apr 28, 2016
e5078cf
Update for user package.
georgemjohn May 9, 2016
09ffc80
Merge branch 'master' of https://github.com/LavaLite/cms into develop
georgemjohn May 9, 2016
056923e
Merge pull request #82 from LavaLite/develop
Renfos May 9, 2016
176f06d
Enabled JWT auth.
georgemjohn May 20, 2016
3469e9a
Update composer.
georgemjohn May 20, 2016
9e441cf
Merge pull request #85 from LavaLite/develop
Renfos May 20, 2016
e34af50
Update composer.json
Renfos May 20, 2016
6cc4b4d
Update app.php
Renfos May 20, 2016
ce02882
Add suffix for test path and rename test case
SDLyu Jun 9, 2016
ea0ad79
Merge pull request #93 from SDLyu/master
Renfos Jun 9, 2016
3bf7d27
Update for menu
georgemjohn Jun 25, 2016
349aaf9
Merge branch 'develop'
georgemjohn Jun 28, 2016
9ddf256
framework version
georgemjohn Jun 28, 2016
1877eb4
up date theme
georgemjohn Jun 28, 2016
7e3e1d6
Updated menu seeds
georgemjohn Jun 28, 2016
4aa9b23
Seed update
georgemjohn Jun 28, 2016
2332a98
Update menu seeds
georgemjohn Jun 28, 2016
2f04803
Update seeds
georgemjohn Jun 28, 2016
5898838
Modified for multiauth revision
georgemjohn Jul 2, 2016
a98fd85
Update readme.md
Renfos Jul 3, 2016
174ef00
Design updates
georgemjohn Jul 11, 2016
0fff426
Menu table seeder
georgemjohn Jul 11, 2016
32d2c50
add arabic language translation files
zayanit Jul 16, 2016
f74a3c1
remove arabic trans files from master
zayanit Jul 16, 2016
5f5c409
add arabic language translation files
zayanit Jul 16, 2016
75fa912
remove unneeded j
zayanit Jul 16, 2016
98b4c4f
remove the headers
zayanit Jul 16, 2016
8254da6
Merge pull request #106 from zayanit/ArabicTrans
Renfos Jul 17, 2016
168a599
Update for packages
georgemjohn Jul 20, 2016
e875193
Composer update
georgemjohn Jul 20, 2016
a53f287
Merge branch 'master' into develop
georgemjohn Jul 20, 2016
56bd67d
Update theme
georgemjohn Jul 21, 2016
6f05e5b
Update theme.
georgemjohn Jul 21, 2016
eb1dcc6
Update default images
georgemjohn Jul 23, 2016
a3f4aa7
Merge pull request #103 from LavaLite/develop
georgemjohn Jul 25, 2016
64caea5
Update composer
georgemjohn Jul 25, 2016
f4034e6
Update home view
georgemjohn Jul 25, 2016
1182195
Updated read me
georgemjohn Jul 25, 2016
be3d342
Ready updates
georgemjohn Jul 25, 2016
2124990
Merge pull request #108 from LavaLite/4.3
georgemjohn Jul 25, 2016
b023436
Update admin side
georgemjohn Jul 30, 2016
977b546
Update authentication
georgemjohn Sep 16, 2016
aead72a
Updated for larval 5.3
georgemjohn Dec 21, 2016
29dba9b
Updates composer
georgemjohn Dec 21, 2016
961e1e0
Merge branch '5.0'
georgemjohn Dec 21, 2016
ff67b19
Composer update
georgemjohn Dec 21, 2016
a549ba0
Uploaded table seder
georgemjohn Dec 22, 2016
6474469
Update storage folder.
georgemjohn Dec 22, 2016
17b533a
Update composer
georgemjohn Dec 22, 2016
e079b29
Compose error fix
georgemjohn Dec 22, 2016
af74d26
Merge pull request #145 from LavaLite/master
georgemjohn Dec 26, 2016
cdc4dc7
Merge pull request #146 from LavaLite/5.0
georgemjohn Dec 26, 2016
cd63207
Update composer.json
georgemjohn Dec 26, 2016
b720c46
Update readme.md
georgemjohn Dec 26, 2016
8281931
Update readme.md
georgemjohn Dec 26, 2016
35d4e04
Update composer.json
georgemjohn Dec 26, 2016
9c10dfc
Merge pull request #147 from LavaLite/5.0
georgemjohn Dec 26, 2016
7a45647
fixed typo in readme
vcgnetwork Feb 16, 2017
d46a880
Update for 5.1
georgemjohn Feb 17, 2017
0ead2a6
Composer update
georgemjohn Feb 17, 2017
1b188e6
Merge pull request #159 from vcgnetwork/master
Renfos Feb 18, 2017
2d8695f
Bugfix
georgemjohn Feb 21, 2017
99d33aa
Updated test
georgemjohn Feb 21, 2017
2917950
Update home page
georgemjohn Feb 22, 2017
2b09f06
Create .env.travis
Renfos Mar 2, 2017
4b0bf86
Delete .env.travis
Renfos Mar 2, 2017
c7b3434
Merge branch 'master' of https://github.com/LavaLite/cms
georgemjohn Mar 2, 2017
04e4908
Merge remote-tracking branch 'origin/3.0'
georgemjohn Mar 2, 2017
f7a36f2
Merge branch 'master' of https://github.com/LavaLite/cms
georgemjohn Mar 2, 2017
12cab73
Travis update
georgemjohn Mar 2, 2017
3b22804
travis update db
georgemjohn Mar 2, 2017
a95ba23
update travis
georgemjohn Mar 3, 2017
b03753b
travis db
georgemjohn Mar 3, 2017
5417f1c
update
georgemjohn Mar 3, 2017
090ea5c
update composer for test
georgemjohn Mar 3, 2017
ca9548b
Updated read
georgemjohn Mar 6, 2017
c46d470
CMS update for next release
georgemjohn Apr 7, 2017
5c27b9b
Seeder & composer update
georgemjohn Apr 7, 2017
6d2ffa2
Update composer.json
Renfos Apr 7, 2017
08250ff
Update routes.
georgemjohn Apr 25, 2017
882863a
Update table seeder
georgemjohn May 3, 2017
f4f4bae
Update db seeder
georgemjohn May 3, 2017
3412bac
Update composer to add installer.
georgemjohn May 3, 2017
cc76e73
Update composer for versions.
georgemjohn May 3, 2017
0bebf83
Merge pull request #171 from LavaLite/5.2
Renfos May 3, 2017
35efe81
Composer
georgemjohn May 3, 2017
3460f2c
Update composer
georgemjohn May 4, 2017
681df88
Composer for installation
georgemjohn May 4, 2017
8398906
Update readme.md
Renfos May 17, 2017
f8181f7
Added debugbar and select2.
georgemjohn May 18, 2017
9e4deec
Merge branch 'master' of https://github.com/LavaLite/cms
georgemjohn May 18, 2017
f2c83e8
Debug bar update
georgemjohn May 18, 2017
cc00098
Create pagination.php
Aug 19, 2017
1469fad
Create passwords.php
Aug 19, 2017
03fca2c
Create validation.php
Aug 19, 2017
3bcdc21
Update passwords.php
Aug 19, 2017
08588b6
Update validation.php
Aug 19, 2017
f135bd2
Update passwords.php
Aug 22, 2017
6ff9695
Merge pull request #192 from You85/patch-7
Renfos Aug 22, 2017
6018632
Merge pull request #191 from You85/patch-6
Renfos Aug 22, 2017
9fb9e9c
Merge pull request #190 from You85/patch-5
Renfos Aug 22, 2017
c706415
Update for Laravel 5.5
georgemjohn Oct 30, 2017
39d918a
Detached theme service provider
georgemjohn Oct 30, 2017
eeab842
Removed example service provider
georgemjohn Nov 5, 2017
f02fef4
Update for laravel 5.5
Renfos Nov 6, 2017
940693c
Updated travis config
georgemjohn Nov 6, 2017
4f52d39
Merge branch 'master' of https://github.com/LavaLite/cms
georgemjohn Nov 6, 2017
b894699
Updated test
georgemjohn Nov 6, 2017
32e720a
Bug fix on response and request objects
georgemjohn Nov 7, 2017
c705121
User client model updates
georgemjohn Nov 8, 2017
4832363
Updated seeder and added user controller
georgemjohn Nov 14, 2017
94c787e
Updated middleware
georgemjohn Nov 17, 2017
6f91858
Updated configurations
georgemjohn Nov 29, 2017
3bebfee
Updated webpack.
georgemjohn Nov 29, 2017
151d8a8
User config
georgemjohn Nov 29, 2017
9489487
Update for next release
georgemjohn Nov 29, 2017
2012125
Updated roles middleware paths
georgemjohn Nov 29, 2017
0d70da8
Update readme.md
Renfos Dec 13, 2017
4fae050
Update readme.md
Renfos Dec 13, 2017
4b32c7b
Update readme.md
Renfos Dec 13, 2017
e829cd1
Update readme.md
Renfos Dec 13, 2017
eaab591
Update readme
georgemjohn Dec 13, 2017
2af5476
Updates
georgemjohn Dec 20, 2017
c107d59
Webpack update
georgemjohn Dec 21, 2017
7d2f307
Update readme.md
Renfos Dec 27, 2017
7be79a0
Demo link
Renfos Dec 28, 2017
aff9fe8
Updated javascript packages
georgemjohn Jan 5, 2018
1b04b1b
Added dutch language
wardpauwels Jan 8, 2018
383a5bf
Merge pull request #220 from wardpauwels/master
Renfos Jan 8, 2018
0263118
Some language typos corrected
wardpauwels Jan 8, 2018
85713f6
Some language typos corrected
wardpauwels Jan 8, 2018
d4a9972
Some language typos corrected
wardpauwels Jan 8, 2018
0ac2ba8
Merge pull request #221 from wardpauwels/master
Renfos Jan 8, 2018
4fea59e
User trans auth updates.
georgemjohn Jan 25, 2018
471da94
Merge branch 'master' of https://github.com/LavaLite/cms
georgemjohn Jan 25, 2018
2d7454a
User and client modal extension bug fix
georgemjohn Jan 26, 2018
a824f92
updated laravel mix packages
georgemjohn Jan 29, 2018
439c3ec
Updated composer
georgemjohn Jan 29, 2018
f535c4f
Updated for Laravel 5.6
georgemjohn Feb 23, 2018
f3a4a1e
Added Simplified Chinese Support
kuriyamatokisaki Mar 7, 2018
c6d312d
name changed
kuriyamatokisaki Mar 17, 2018
ed4877a
Merge pull request #231 from f0rb1d/master
Renfos Mar 19, 2018
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
  •  
  •  
  •  
3 changes: 0 additions & 3 deletions .bowerrc

This file was deleted.

22 changes: 0 additions & 22 deletions .env

This file was deleted.

29 changes: 23 additions & 6 deletions .env.example
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,22 +1,39 @@
APP_NAME=Laravel
APP_ENV=local
APP_KEY=
APP_DEBUG=true
APP_KEY=SomeRandomString
APP_URL=http://localhost

DB_CONNECTION=sqlite
DB_HOST=localhost
LOG_CHANNEL=stack

DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=homestead
DB_USERNAME=homestead
DB_PASSWORD=secret

BROADCAST_DRIVER=log
CACHE_DRIVER=file
SESSION_DRIVER=file
SESSION_LIFETIME=120
QUEUE_DRIVER=sync

REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379

MAIL_DRIVER=smtp
MAIL_HOST=mailtrap.io
MAIL_HOST=smtp.mailtrap.io
MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
MAIL_ADDRESS=null
MAIL_NAME=null

PUSHER_APP_ID=
PUSHER_APP_KEY=
PUSHER_APP_SECRET=
PUSHER_APP_CLUSTER=mt1

MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
12 changes: 12 additions & 0 deletions .env.travis
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

APP_ENV=testing
APP_KEY=SomeRandomString

DB_CONNECTION=mysql
DB_USERNAME=root
DB_PASSWORD=
DB_DATABASE=homestead_test

CACHE_DRIVER=array
SESSION_DRIVER=array
QUEUE_DRIVER=sync
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
* text=auto
*.css linguist-vendored
*.less linguist-vendored
*.scss linguist-vendored
18 changes: 13 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
.env
*.zip
._*
/vendor
/node_modules
/public/uploads
/public/themes
/.idea
/framework
Homestead.json
Homestead.yaml

composer.develop.json
composer.develop.lock
composer.lock
.DS_Store
._**
*.tmp
*.zip
.env
package-lock.json
31 changes: 31 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
language: php

php:
- 7.0

services:
- mysql

before_script:
# - mkdir bootstrap/cache
#- mkdir storage
#- mkdir storage/app
#- mkdir storage/framework
#- mkdir storage/framework/sessions
#- mkdir storage/framework/cache
#- mkdir storage/framework/views
- chmod 777 -R storage
- chmod 777 -R bootstrap/cache
#- chown -R www-data:www-data storage
- cp .env.travis .env
- mysql -e 'create database homestead_test;'
- composer self-update
- composer install --no-interaction
- php artisan key:generate
- php artisan vendor:publish --tag=config
- php artisan vendor:publish --tag=public
- php artisan optimize
- php artisan migrate --seed

script:
- vendor/bin/phpunit
23 changes: 23 additions & 0 deletions app/Client.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?php

namespace App;

use Litepie\User\Models\Client as BaseClient;

class Client extends BaseClient
{
/**
* Configuartion for the model.
*
* @var array
*/
protected $config = 'users.client.model';

/**
* Configuartion for the model.
*
* @var array
*/
protected $role = 'client';

}
33 changes: 0 additions & 33 deletions app/Console/Commands/Inspire.php

This file was deleted.

21 changes: 17 additions & 4 deletions app/Console/Kernel.php
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,30 @@ class Kernel extends ConsoleKernel
* @var array
*/
protected $commands = [
\App\Console\Commands\Inspire::class,
//
];

/**
* Define the application's command schedule.
*
* @param \Illuminate\Console\Scheduling\Schedule $schedule
* @param \Illuminate\Console\Scheduling\Schedule $schedule
* @return void
*/
protected function schedule(Schedule $schedule)
{
$schedule->command('inspire')
->hourly();
// $schedule->command('inspire')
// ->hourly();
}

/**
* Register the commands for the application.
*
* @return void
*/
protected function commands()
{
$this->load(__DIR__.'/Commands');

require base_path('routes/console.php');
}
}
8 changes: 0 additions & 8 deletions app/Events/Event.php

This file was deleted.

35 changes: 21 additions & 14 deletions app/Exceptions/Handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,43 +8,50 @@
class Handler extends ExceptionHandler
{
/**
* A list of the exception types that should not be reported.
* A list of the exception types that are not reported.
*
* @var array
*/
protected $dontReport = [
\Symfony\Component\HttpKernel\Exception\HttpException::class,
//
];

/**
* A list of the inputs that are never flashed for validation exceptions.
*
* @var array
*/
protected $dontFlash = [
'password',
'password_confirmation',
];

/**
* Report or log an exception.
*
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
*
* @param \Exception $e
*
* @param \Exception $exception
* @return void
*/
public function report(Exception $e)
public function report(Exception $exception)
{
return parent::report($e);
parent::report($exception);
}

/**
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Exception $e
*
* @param \Illuminate\Http\Request $request
* @param \Exception $exception
* @return \Illuminate\Http\Response
*/
public function render($request, Exception $e)
public function render($request, Exception $exception)
{
if ($e instanceof \Lavalite\User\Exceptions\RoleDeniedException) {
if ($exception instanceof \Litepie\Roles\Exceptions\RoleDeniedException) {
// you can for example flash message, redirect...
return redirect()->back();
return redirect(guard_url('locked'))->with('message', $exception->getMessage());
}

return parent::render($request, $e);
return parent::render($request, $exception);
}
}
30 changes: 30 additions & 0 deletions app/Http/Controllers/ActionController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php

namespace App\Http\Controllers;

use Litepie\User\Traits\RoutesAndGuards;
use Litepie\Theme\ThemeAndViews;

class ActionController extends Controller
{
use RoutesAndGuards, ThemeAndViews;

public function __construct()
{
if (!empty(app('auth')->getDefaultDriver())) {
$this->middleware('auth:' . app('auth')->getDefaultDriver());
}

$this->setTheme();
}

/**
* Show reports homepage.
*
* @return \Illuminate\Http\Response
*/
public function reports()
{
return $this->theme->of('admin::general.reports')->render();
}
}
Loading