Skip to content

Commit 086e2db

Browse files
committed
Merge branch 'master' into reorder-buttons
2 parents bc48d42 + bbf23c6 commit 086e2db

File tree

218 files changed

+20834
-14836
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+20834
-14836
lines changed

.github/ci-reporter.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Set to false to create a new comment instead of updating the app's first one
2+
updateComment: false
3+
4+
# Use a custom string, or set to false to disable
5+
before: "✨ Good work on this PR so far! ✨ Unfortunately, the [ build]() is failing as of . Here's the output:"
6+
7+
# Use a custom string, or set to false to disable
8+
after: "I'm sure you can fix it! If you need help, don't hesitate to ask a maintainer of the project!"

.github/release-drafter.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Release Drafter
2+
3+
on:
4+
push:
5+
# branches to consider in the event; optional, defaults to all
6+
branches:
7+
- master
8+
9+
jobs:
10+
update_release_draft:
11+
runs-on: ubuntu-latest
12+
steps:
13+
# Drafts your next Release notes as Pull Requests are merged into "master"
14+
- uses: release-drafter/release-drafter@v5
15+
env:
16+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
17+
18+
name-template: 'v$NEXT_PATCH_VERSION 🌈'
19+
tag-template: 'v$NEXT_PATCH_VERSION'
20+
categories:
21+
- title: '🚀 Features'
22+
labels:
23+
- 'feature'
24+
- 'enhancement'
25+
- 'added'
26+
- title: '🐛 Bug Fixes'
27+
labels:
28+
- 'fix'
29+
- 'bugfix'
30+
- 'bug'
31+
- 'fixed'
32+
- title: '⚙️ Changes'
33+
labels:
34+
- 'changed'
35+
- 'dependencies'
36+
- title: '🧰 Removed'
37+
label: 'removed'
38+
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
39+
template: |
40+
## Changes
41+
42+
$CHANGES

.github/weekly-digest.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Configuration for weekly-digest - https://github.com/apps/weekly-digest
2+
publishDay: sun
3+
canPublishIssues: true
4+
canPublishPullRequests: true
5+
canPublishContributors: true
6+
canPublishStargazers: false
7+
canPublishCommits: true

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ node_modules/
44
.DS_Store
55
.composer.lock
66
composer.lock
7+
.phpunit.result.cache
78

89
# forget some files and folders inside the published CSS and JS assets,
910
# since they're not actually used anywhere

CHANGELOG.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,40 @@ All Notable changes to `Backpack CRUD` will be documented in this file.
88

99
-----------
1010

11+
## 4.0.46 - 2020-03-05
12+
13+
### Fixed
14+
- added back revisionable as a dependency;
15+
16+
17+
## 4.0.45 - 2020-03-05
18+
19+
### Fixed
20+
- installation command did not correctly use the new version of Symphony Process;
21+
22+
23+
## 4.0.44 - 2020-03-04
24+
25+
### Fixed
26+
- installation command on Laravel 7;
27+
28+
29+
## 4.0.43 - 2020-03-04
30+
31+
### Added
32+
- support for Laravel 7;
33+
34+
### Fixed
35+
- #2501 - Backpack is no longer using the Auth services from Laravel (5.8-7); because Laravel moved its services in a different package in Laravel 7, but we want to support L5.8, L6 and L7 at the same time, we've been forced to move those classes inside Backpack, and we've done so, inside app\Library\Auth; Backpack is now completely indepenendent from Laravel's authentication;
36+
37+
38+
## 4.0.42 - 2020-03-01
39+
40+
### Fixed
41+
- updated npm dependencies;
42+
- CSS assets inside elFinder views;
43+
44+
1145
## 4.0.41 - 2020-02-16
1246

1347
### Fixed

composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
}
3333
],
3434
"require": {
35-
"laravel/framework": "^6.0|5.8.*",
35+
"laravel/framework": "^7.0|^6.0|5.8.*",
3636
"prologue/alerts": "^0.4.1",
3737
"creativeorange/gravatar": "~1.0",
38-
"nesbot/carbon": "^2.14.0",
38+
"nesbot/carbon": "^2.14",
3939
"ocramius/package-versions": "^1.4",
4040
"laravel/helpers": "^1.1",
4141
"doctrine/dbal": "^2.5",
@@ -44,11 +44,11 @@
4444
"guzzlehttp/guzzle": "^6.3"
4545
},
4646
"require-dev": {
47-
"phpunit/phpunit": "~7.0",
48-
"scrutinizer/ocular": "~1.1",
49-
"orchestra/testbench": "^3.0",
50-
"orchestra/database": "3.8.x-dev",
51-
"spatie/laravel-translatable": "^3.1.3"
47+
"phpunit/phpunit": "~8.0|~7.0",
48+
"scrutinizer/ocular": "~1.7|~1.1",
49+
"orchestra/testbench": "^5.0|^3.0",
50+
"orchestra/database": "^5.0@dev|3.8.x-dev",
51+
"spatie/laravel-translatable": "^4.0|^3.1.3"
5252
},
5353
"autoload": {
5454
"psr-4": {

0 commit comments

Comments
 (0)