-
Notifications
You must be signed in to change notification settings - Fork 500
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #399 from FrozenNode/dev
Merge 4.8.0 into master
- Loading branch information
Showing
26 changed files
with
1,113 additions
and
672 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
{ | ||
"name": "frozennode/administrator", | ||
"description": "A database interface package for Laravel", | ||
"homepage": "http://administrator.frozennode.com", | ||
"keywords": ["administrator", "admin", "database", "laravel-administrator", "laravel", "cms"], | ||
"license": "MIT", | ||
"authors": [ | ||
|
@@ -9,11 +10,14 @@ | |
"email": "[email protected]" | ||
} | ||
], | ||
"support": { | ||
"issues": "https://github.com/FrozenNode/Laravel-Administrator/issues" | ||
}, | ||
"require": { | ||
"php": ">=5.3.0" | ||
"php": ">=5.3.0", | ||
"laravel/framework": ">=4.0.0" | ||
}, | ||
"require-dev": { | ||
"laravel/framework": ">=4.0.0", | ||
"mockery/mockery": "0.8.0" | ||
}, | ||
"autoload": { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,7 +19,6 @@ public function up() | |
$table->decimal('salary', 10, 2); | ||
$table->timestamps(); | ||
}); | ||
|
||
} | ||
|
||
/** | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -114,6 +114,6 @@ | |
} | ||
} | ||
} | ||
@media @desktop-xl { | ||
@media @desktopXl { | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.