File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1818 ],
1919 "require" : {
2020 "php" : " ~5.6|~7.0" ,
21- "corecmf/core" : " 1.1 .*" ,
22- "corecmf/socialite" : " ^1.1 " ,
23- "corecmf/storage" : " ^1.1 "
21+ "corecmf/core" : " 1.3 .*" ,
22+ "corecmf/socialite" : " ^1.3.* " ,
23+ "corecmf/storage" : " ^1.3.* "
2424 },
2525 "require-dev" : {
2626 "phpunit/phpunit" : " ~4.0||~5.0||~6.0" ,
4343 },
4444 "extra" : {
4545 "branch-alias" : {
46- "dev-master" : " 1.0-dev"
46+ "dev-master" : " 1.3. 0-dev"
4747 }
4848 },
4949 "config" : {
Original file line number Diff line number Diff line change 55use Illuminate \Http \Request ;
66
77use App \Http \Controllers \Controller ;
8- use CoreCMF \Core \Http \Models \Package ;
8+ use CoreCMF \Core \App \Models \Package ;
99use CoreCMF \Admin \App \Models \Config ;
1010use CoreCMF \Admin \App \Http \Validator \ModelRules ;
1111use CoreCMF \Core \Support \Package \Manage as packageManage ;
Original file line number Diff line number Diff line change 55use Illuminate \Http \Request ;
66use App \Http \Controllers \Controller ;
77
8- use CoreCMF \Core \Http \Models \Permission ;
8+ use CoreCMF \Core \App \Models \Permission ;
99use CoreCMF \Admin \App \Models \Config ;
1010use CoreCMF \Admin \App \Http \Validator \PermissionRules ;
1111class PermissionController extends Controller
Original file line number Diff line number Diff line change 44
55use Illuminate \Http \Request ;
66use App \Http \Controllers \Controller ;
7- use CoreCMF \Core \Http \Models \Role ;
7+ use CoreCMF \Core \App \Models \Role ;
88use CoreCMF \Admin \App \Models \Config ;
9- use CoreCMF \Core \Http \Models \Permission ;
9+ use CoreCMF \Core \App \Models \Permission ;
1010use CoreCMF \Admin \App \Http \Validator \RoleRules ;
1111
1212class RoleController extends Controller
Original file line number Diff line number Diff line change 88use App \Http \Requests ;
99use App \Http \Controllers \Controller ;
1010
11- use CoreCMF \Core \Http \Models \Upload ;
11+ use CoreCMF \Core \App \Models \Upload ;
1212
1313class UploadController extends Controller
1414{
Original file line number Diff line number Diff line change 55use Illuminate \Http \Request ;
66
77use App \Http \Controllers \Controller ;
8- use CoreCMF \Core \Http \Models \User ;
9- use CoreCMF \Core \Http \Models \Role ;
8+ use CoreCMF \Core \App \Models \User ;
9+ use CoreCMF \Core \App \Models \Role ;
1010use CoreCMF \Admin \App \Models \Config ;
1111use CoreCMF \Admin \App \Http \Validator \UserRules ;
1212
Original file line number Diff line number Diff line change 55use Closure ;
66use Route ;
77use App \Http \Controllers \Controller ;
8- use CoreCMF \Core \Http \Models \Permission ;
8+ use CoreCMF \Core \App \Models \Permission ;
99
1010class CheckRole
1111{
Original file line number Diff line number Diff line change 33namespace CoreCMF \Admin \App \Models ;
44
55use Illuminate \Database \Eloquent \Model ;
6- use CoreCMF \Core \Http \Models \Upload ;
6+ use CoreCMF \Core \App \Models \Upload ;
77
88class Config extends Model
99{
You can’t perform that action at this time.
0 commit comments