Skip to content

Commit e472bb2

Browse files
committed
Merge branch 'develop' into 1.1
# Conflicts: # composer.json
2 parents 7cbccc3 + 712843d commit e472bb2

File tree

10 files changed

+13
-21
lines changed

10 files changed

+13
-21
lines changed
3.33 MB
Binary file not shown.

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Winter's mission is to show the world that web development is not rocket science.
88

99
![Stable Build](https://github.com/wintercms/winter/workflows/Tests/badge.svg?branch=develop)
10-
[![License](https://poser.pugx.org/wintercms/winter/license.svg)](https://packagist.org/packages/winter/winter)
10+
[![License](https://poser.pugx.org/wintercms/winter/license.svg)](https://packagist.org/packages/wintercms/winter)
1111

1212
## Installing Winter
1313

@@ -18,7 +18,7 @@ Instructions on how to install Winter can be found at the [installation guide](h
1818
For advanced users, run this in your terminal to install Winter from command line:
1919

2020
```shell
21-
composer create-project winter/winter
21+
composer create-project wintercms/winter example.com "dev-develop"
2222
```
2323

2424
If you plan on using a database, run this command:

config/app.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
| on the Backend password reset flow for security reasons.
7272
*/
7373

74-
'trustedHosts' => true,
74+
'trustedHosts' => false,
7575

7676
/*
7777
|--------------------------------------------------------------------------

modules/backend/composer.json

+2-5
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
],
2525
"require": {
2626
"php": ">=7.2",
27-
"composer/installers": "~1.0",
28-
"winter/storm": "~1.1.0",
27+
"composer/installers": "dev-main as 1.0",
2928
"laravel/framework": "~6.0"
3029
},
3130
"autoload": {
@@ -34,9 +33,7 @@
3433
}
3534
},
3635
"extra": {
37-
"branch-alias": {
38-
"dev-master": "1.0-dev"
39-
}
36+
"installer-name": "backend"
4037
},
4138
"minimum-stability": "dev"
4239
}

modules/backend/widgets/Form.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1121,7 +1121,7 @@ protected function getFieldValue($field)
11211121

11221122
/**
11231123
* Checks if default values should be taken from data.
1124-
* This should be done when model exists or when explicitly configured
1124+
* This should be done when the model does not exist or when explicitly configured
11251125
*/
11261126
protected function shouldFetchDefaultValues()
11271127
{

modules/backend/widgets/form/assets/js/winter.form.js

+1
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@
154154
data: refreshData
155155
}).success(function() {
156156
self.toggleEmptyTabs()
157+
$('[data-field-name="' + toRefresh.fields[0] + '"]').trigger('change')
157158
})
158159
}, this.dependantUpdateInterval)
159160

modules/cms/composer.json

+2-5
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
],
2525
"require": {
2626
"php": ">=7.2",
27-
"composer/installers": "~1.0",
28-
"winter/storm": "~1.1.0",
27+
"composer/installers": "dev-main as 1.0",
2928
"laravel/framework": "~6.0"
3029
},
3130
"autoload": {
@@ -34,9 +33,7 @@
3433
}
3534
},
3635
"extra": {
37-
"branch-alias": {
38-
"dev-master": "1.0-dev"
39-
}
36+
"installer-name": "cms"
4037
},
4138
"minimum-stability": "dev"
4239
}

modules/system/assets/ui/js/list.rowlink.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
})
7979

8080
$(this).addClass(options.linkedClass)
81-
link.hide().after(link.html())
81+
link.after(link.children()).hide()
8282
})
8383

8484
// Add Keyboard Navigation to list rows

modules/system/assets/ui/storm-min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/system/composer.json

+2-5
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
],
2525
"require": {
2626
"php": ">=7.2",
27-
"composer/installers": "~1.0",
28-
"winter/storm": "~1.1.0",
27+
"composer/installers": "dev-main as 1.0",
2928
"laravel/framework": "~6.0"
3029
},
3130
"autoload": {
@@ -34,9 +33,7 @@
3433
}
3534
},
3635
"extra": {
37-
"branch-alias": {
38-
"dev-master": "1.0-dev"
39-
}
36+
"installer-name": "system"
4037
},
4138
"minimum-stability": "dev"
4239
}

0 commit comments

Comments
 (0)