Skip to content

Commit 93cf2d8

Browse files
committed
Merge tag '2.2.0'
Stable release 2.2.0 This brings full Contao 4.9 support. Additionally there have been performance improvements and various bugfixes. - Support manual file sorting - now works with the "picture factory" - this supports lazy-loading of picture settings - option "mandatory field" is now available - option "read only" is now available - Restriction of selection to "files only" has been extended to "folders only" - default remains files and folders - Image size support for a lightbox with values from the layout settings - a placeholder image can be selected - option whether a download link is protected via the session or not; for backward compatibility reasons the value is set via a migration if the "Download link" checkbox is on; if the protection is deactivated, no cookie is set by the function and the page can be cached
2 parents c042bdf + 61a8450 commit 93cf2d8

25 files changed

+413
-488
lines changed

.check-author.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@ ignore:
33

44
exclude:
55
- /^src\/Resources\/contao\/languages/
6+
7+
mapping:
8+
"Ingolf Steinhardt <info@e-spin.de>":
9+
- "Ingolf Steinhardt <git@e-spin.de>"

.github/workflows/diagnostics.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: MetaModels attribute_translatedfile
2+
3+
on:
4+
push:
5+
branches-ignore:
6+
- '**-translation'
7+
pull_request:
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
php: [7.4]
15+
contao: [~4.9.0]
16+
17+
steps:
18+
- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Pull source
19+
uses: actions/checkout@v2
20+
with:
21+
fetch-depth: 0
22+
23+
# see https://github.com/shivammathur/setup-php
24+
- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Setup PHP.
25+
uses: shivammathur/setup-php@v2
26+
with:
27+
php-version: ${{ matrix.php }}
28+
coverage: none
29+
30+
- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Cache composer cache directory
31+
uses: actions/cache@v1
32+
env:
33+
cache-name: composer-cache-dir
34+
with:
35+
path: ~/.cache/composer
36+
key: ${{ runner.os }}-build-${{ env.cache-name }}
37+
38+
- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Cache vendor directory
39+
uses: actions/cache@v1
40+
env:
41+
cache-name: composer-vendor
42+
with:
43+
path: vendor
44+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.lock') }}
45+
restore-keys: |
46+
${{ runner.os }}-build-${{ env.cache-name }}-
47+
48+
- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Install composer dependencies
49+
run: composer update --prefer-dist --no-interaction --no-suggest
50+
51+
- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Run tests
52+
run: ant -keep-going

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ composer.lock
1717

1818
# build
1919
build/
20+
.phpunit.result.cache

.travis.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build Status](https://travis-ci.org/MetaModels/attribute_translatedfile.svg)](https://travis-ci.org/MetaModels/attribute_translatedfile)
1+
[![Build Status](https://github.com/MetaModels/attribute_translatedfile/actions/workflows/diagnostics.yml/badge.svg)](https://github.com/MetaModels/attribute_translatedfile/actions)
22
[![Latest Version tagged](http://img.shields.io/github/tag/MetaModels/attribute_translatedfile.svg)](https://github.com/MetaModels/attribute_translatedfile/tags)
33
[![Latest Version on Packagist](http://img.shields.io/packagist/v/MetaModels/attribute_translatedfile.svg)](https://packagist.org/packages/MetaModels/attribute_translatedfile)
44
[![Installations via composer per month](http://img.shields.io/packagist/dm/MetaModels/attribute_translatedfile.svg)](https://packagist.org/packages/MetaModels/attribute_translatedfile)

composer.json

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
"translatable"
1010
],
1111
"type": "contao-bundle",
12-
"homepage": "http://now.metamodel.me/",
12+
"homepage": "https://now.metamodel.me/",
1313
"license": "LGPL-3.0-or-later",
1414
"authors": [
1515
{
1616
"name": "Christian Schiffler",
1717
"email": "c.schiffler@cyberspectrum.de",
18-
"homepage": "http://www.cyberspectrum.de",
18+
"homepage": "https://www.cyberspectrum.de",
1919
"role": "Developer"
2020
},
2121
{
@@ -27,18 +27,18 @@
2727
"support": {
2828
"email": "mail@metamodel.me",
2929
"issues": "https://github.com/MetaModels/attribute_translatedfile/issues",
30-
"wiki": "http://de.contaowiki.org/MetaModels",
31-
"irc": "irc://irc.freenode.org/contao.mm",
30+
"wiki": "https://de.contaowiki.org/MetaModels",
3231
"source": "https://github.com/MetaModels/attribute_translatedfile"
3332
},
3433
"require": {
35-
"php": "^7.1",
36-
"contao-community-alliance/dc-general": "^2.1.3",
37-
"contao/core-bundle": "^4.4.8",
38-
"metamodels/core": "^2.1.1",
39-
"metamodels/attribute_file": "^2.1.1",
40-
"symfony/dependency-injection": "^3.3 || ^4.0",
41-
"symfony/http-kernel": "^3.3 || ^4.0"
34+
"php": "^7.4",
35+
"contao-community-alliance/dc-general": "^2.2",
36+
"contao/core-bundle": "^4.9.0, <4.13.0",
37+
"metamodels/core": "^2.2",
38+
"metamodels/attribute_file": "^2.2",
39+
"symfony/dependency-injection": "^4.4.6",
40+
"symfony/event-dispatcher": "^4.4.6",
41+
"symfony/http-kernel": "~4.4.13"
4242
},
4343
"require-dev": {
4444
"contao/manager-plugin": "^2.1",
@@ -61,10 +61,14 @@
6161
"extra": {
6262
"contao-manager-plugin": "MetaModels\\AttributeTranslatedFileBundle\\ContaoManager\\Plugin",
6363
"branch-alias": {
64-
"dev-master": "2.1.x-dev"
64+
"dev-feature/2.2.0": "2.2.x-dev"
6565
}
6666
},
6767
"config": {
68+
"allow-plugins": {
69+
"contao-components/installer": false,
70+
"contao/manager-plugin": false
71+
},
6872
"sort-packages": true
6973
}
7074
}

0 commit comments

Comments
 (0)