Skip to content

Commit c137649

Browse files
discordierdiscordier
committed
Merge tag '2.0.0'
Stable release 2.0.0
2 parents 60cea1d + 08c159e commit c137649

File tree

12 files changed

+295
-128
lines changed

12 files changed

+295
-128
lines changed

‎.gitattributes‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.check-author.yml
2+
.gitattributes export-ignore
3+
.gitignore export-ignore
4+
.travis.yml export-ignore
5+
build.default.properties export-ignore
6+
build.xml export-ignore
7+
phpunit.xml.dist export-ignore
8+
/.github export-ignore
9+
/tests export-ignore

‎.travis.yml‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
11
language: php
22

33
php:
4-
- 5.3
5-
- 5.4
6-
- 5.5
7-
- 5.6
4+
- "5.4"
5+
- "5.5"
6+
- "5.6"
7+
- "7.0"
88

99
env:
10-
- CONTAO_VERSION=~3.2.0
11-
- CONTAO_VERSION=~3.3.0
12-
- CONTAO_VERSION=~3.4.0
13-
- CONTAO_VERSION=~3.5.0
14-
15-
# Exclude impossible Contao Version combinations.
16-
matrix:
17-
exclude:
18-
- php: 5.3
19-
env: CONTAO_VERSION=~3.5.0
10+
- CONTAO_VERSION=~3.5.5
2011

2112
sudo: false
2213

‎LICENSE‎

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
GNU LESSER GENERAL PUBLIC LICENSE
2+
Version 3, 29 June 2007
3+
4+
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
5+
Everyone is permitted to copy and distribute verbatim copies
6+
of this license document, but changing it is not allowed.
7+
8+
9+
This version of the GNU Lesser General Public License incorporates
10+
the terms and conditions of version 3 of the GNU General Public
11+
License, supplemented by the additional permissions listed below.
12+
13+
0. Additional Definitions.
14+
15+
As used herein, "this License" refers to version 3 of the GNU Lesser
16+
General Public License, and the "GNU GPL" refers to version 3 of the GNU
17+
General Public License.
18+
19+
"The Library" refers to a covered work governed by this License,
20+
other than an Application or a Combined Work as defined below.
21+
22+
An "Application" is any work that makes use of an interface provided
23+
by the Library, but which is not otherwise based on the Library.
24+
Defining a subclass of a class defined by the Library is deemed a mode
25+
of using an interface provided by the Library.
26+
27+
A "Combined Work" is a work produced by combining or linking an
28+
Application with the Library. The particular version of the Library
29+
with which the Combined Work was made is also called the "Linked
30+
Version".
31+
32+
The "Minimal Corresponding Source" for a Combined Work means the
33+
Corresponding Source for the Combined Work, excluding any source code
34+
for portions of the Combined Work that, considered in isolation, are
35+
based on the Application, and not on the Linked Version.
36+
37+
The "Corresponding Application Code" for a Combined Work means the
38+
object code and/or source code for the Application, including any data
39+
and utility programs needed for reproducing the Combined Work from the
40+
Application, but excluding the System Libraries of the Combined Work.
41+
42+
1. Exception to Section 3 of the GNU GPL.
43+
44+
You may convey a covered work under sections 3 and 4 of this License
45+
without being bound by section 3 of the GNU GPL.
46+
47+
2. Conveying Modified Versions.
48+
49+
If you modify a copy of the Library, and, in your modifications, a
50+
facility refers to a function or data to be supplied by an Application
51+
that uses the facility (other than as an argument passed when the
52+
facility is invoked), then you may convey a copy of the modified
53+
version:
54+
55+
a) under this License, provided that you make a good faith effort to
56+
ensure that, in the event an Application does not supply the
57+
function or data, the facility still operates, and performs
58+
whatever part of its purpose remains meaningful, or
59+
60+
b) under the GNU GPL, with none of the additional permissions of
61+
this License applicable to that copy.
62+
63+
3. Object Code Incorporating Material from Library Header Files.
64+
65+
The object code form of an Application may incorporate material from
66+
a header file that is part of the Library. You may convey such object
67+
code under terms of your choice, provided that, if the incorporated
68+
material is not limited to numerical parameters, data structure
69+
layouts and accessors, or small macros, inline functions and templates
70+
(ten or fewer lines in length), you do both of the following:
71+
72+
a) Give prominent notice with each copy of the object code that the
73+
Library is used in it and that the Library and its use are
74+
covered by this License.
75+
76+
b) Accompany the object code with a copy of the GNU GPL and this license
77+
document.
78+
79+
4. Combined Works.
80+
81+
You may convey a Combined Work under terms of your choice that,
82+
taken together, effectively do not restrict modification of the
83+
portions of the Library contained in the Combined Work and reverse
84+
engineering for debugging such modifications, if you also do each of
85+
the following:
86+
87+
a) Give prominent notice with each copy of the Combined Work that
88+
the Library is used in it and that the Library and its use are
89+
covered by this License.
90+
91+
b) Accompany the Combined Work with a copy of the GNU GPL and this license
92+
document.
93+
94+
c) For a Combined Work that displays copyright notices during
95+
execution, include the copyright notice for the Library among
96+
these notices, as well as a reference directing the user to the
97+
copies of the GNU GPL and this license document.
98+
99+
d) Do one of the following:
100+
101+
0) Convey the Minimal Corresponding Source under the terms of this
102+
License, and the Corresponding Application Code in a form
103+
suitable for, and under terms that permit, the user to
104+
recombine or relink the Application with a modified version of
105+
the Linked Version to produce a modified Combined Work, in the
106+
manner specified by section 6 of the GNU GPL for conveying
107+
Corresponding Source.
108+
109+
1) Use a suitable shared library mechanism for linking with the
110+
Library. A suitable mechanism is one that (a) uses at run time
111+
a copy of the Library already present on the user's computer
112+
system, and (b) will operate properly with a modified version
113+
of the Library that is interface-compatible with the Linked
114+
Version.
115+
116+
e) Provide Installation Information, but only if you would otherwise
117+
be required to provide such information under section 6 of the
118+
GNU GPL, and only to the extent that such information is
119+
necessary to install and execute a modified version of the
120+
Combined Work produced by recombining or relinking the
121+
Application with a modified version of the Linked Version. (If
122+
you use option 4d0, the Installation Information must accompany
123+
the Minimal Corresponding Source and Corresponding Application
124+
Code. If you use option 4d1, you must provide the Installation
125+
Information in the manner specified by section 6 of the GNU GPL
126+
for conveying Corresponding Source.)
127+
128+
5. Combined Libraries.
129+
130+
You may place library facilities that are a work based on the
131+
Library side by side in a single library together with other library
132+
facilities that are not Applications and are not covered by this
133+
License, and convey such a combined library under terms of your
134+
choice, if you do both of the following:
135+
136+
a) Accompany the combined library with a copy of the same work based
137+
on the Library, uncombined with any other library facilities,
138+
conveyed under the terms of this License.
139+
140+
b) Give prominent notice with the combined library that part of it
141+
is a work based on the Library, and explaining where to find the
142+
accompanying uncombined form of the same work.
143+
144+
6. Revised Versions of the GNU Lesser General Public License.
145+
146+
The Free Software Foundation may publish revised and/or new versions
147+
of the GNU Lesser General Public License from time to time. Such new
148+
versions will be similar in spirit to the present version, but may
149+
differ in detail to address new problems or concerns.
150+
151+
Each version is given a distinguishing version number. If the
152+
Library as you received it specifies that a certain numbered version
153+
of the GNU Lesser General Public License "or any later version"
154+
applies to it, you have the option of following the terms and
155+
conditions either of that published version or of any later version
156+
published by the Free Software Foundation. If the Library as you
157+
received it does not specify a version number of the GNU Lesser
158+
General Public License, you may choose any version of the GNU Lesser
159+
General Public License ever published by the Free Software Foundation.
160+
161+
If the Library as you received it specifies that a proxy can decide
162+
whether future versions of the GNU Lesser General Public License shall
163+
apply, that proxy's public statement of acceptance of any version is
164+
permanent authorization for you to choose that version for the
165+
Library.

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
[![Build Status](https://travis-ci.org/MetaModels/filter_checkbox.svg)](https://travis-ci.org/MetaModels/filter_checkbox)
1+
[![Stable Build Status](http://img.shields.io/travis/MetaModels/filter_checkbox/master.svg?label=stable)](https://travis-ci.org/MetaModels/filter_checkbox/branches)
2+
[![Development Build Status](http://img.shields.io/travis/MetaModels/filter_checkbox/develop.svg?label=develop)](https://travis-ci.org/MetaModels/filter_checkbox/branches)
23
[![Latest Version tagged](http://img.shields.io/github/tag/MetaModels/filter_checkbox.svg)](https://github.com/MetaModels/filter_checkbox/tags)
34
[![Latest Version on Packagist](http://img.shields.io/packagist/v/MetaModels/filter_checkbox.svg)](https://packagist.org/packages/MetaModels/filter_checkbox)
45
[![Installations via composer per month](http://img.shields.io/packagist/dm/MetaModels/filter_checkbox.svg)](https://packagist.org/packages/MetaModels/filter_checkbox)

‎composer.json‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,18 @@
3131
"source": "https://github.com/MetaModels/filter_checkbox"
3232
},
3333
"require": {
34-
"php": ">=5.3",
35-
"contao/core": ">=3.2,<3.6",
34+
"php": ">=5.4",
35+
"contao/core": "^3.5.5",
3636
"contao-community-alliance/composer-plugin": "~2.0",
3737
"metamodels/core": "~2.0"
3838
},
3939
"require-dev": {
4040
"cyberspectrum/contao-toolbox": "~0.6",
41-
"phpcq/all-tasks": "~1.0"
42-
},
43-
"conflict": {
44-
"contao/core": "3.4.0"
41+
"phpcq/all-tasks": "~1.1"
4542
},
4643
"autoload": {
4744
"psr-0": {
48-
"MetaModels": "src"
45+
"MetaModels\\": "src"
4946
}
5047
},
5148
"extra": {

‎contao/config/event_listeners.php‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
<?php
2+
23
/**
3-
* The MetaModels extension allows the creation of multiple collections of custom items,
4-
* each with its own unique set of selectable attributes, with attribute extendability.
5-
* The Front-End modules allow you to build powerful listing and filtering of the
6-
* data in each collection.
4+
* This file is part of MetaModels/filter_checkbox.
5+
*
6+
* (c) 2012-2016 The MetaModels team.
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
710
*
8-
* PHP version 5
11+
* This project is provided in good faith and hope to be usable by anyone.
912
*
1013
* @package MetaModels
1114
* @subpackage FilterCheckbox
1215
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
13-
* @copyright The MetaModels team.
14-
* @license LGPL.
16+
* @copyright 2012-2016 The MetaModels team.
17+
* @license https://github.com/MetaModels/filter_checkbox/blob/master/LICENSE LGPL-3.0
1518
* @filesource
1619
*/
1720

‎contao/dca/tl_metamodel_filtersetting.php‎

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,57 @@
11
<?php
22

33
/**
4-
* The MetaModels extension allows the creation of multiple collections of custom items,
5-
* each with its own unique set of selectable attributes, with attribute extendability.
6-
* The Front-End modules allow you to build powerful listing and filtering of the
7-
* data in each collection.
4+
* This file is part of MetaModels/filter_checkbox.
5+
*
6+
* (c) 2012-2016 The MetaModels team.
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*
11+
* This project is provided in good faith and hope to be usable by anyone.
812
*
9-
* PHP version 5
1013
* @package MetaModels
1114
* @subpackage FilterCheckbox
12-
* @author Andreas Isaak <info@andreas-isaak.de>
1315
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
16+
* @author Andreas Isaak <info@andreas-isaak.de>
1417
* @author David Molineus <mail@netzmacht.de>
1518
* @author Christian de la Haye <service@delahaye.de>
16-
* @copyright The MetaModels team.
17-
* @license LGPL.
19+
* @copyright 2012-2016 The MetaModels team.
20+
* @license https://github.com/MetaModels/filter_checkbox/blob/master/LICENSE LGPL-3.0
1821
* @filesource
1922
*/
2023

2124
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['checkbox extends _attribute_']['+config'][] =
22-
'urlparam';
25+
'urlparam';
2326

2427
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['checkbox extends _attribute_']['+fefilter'][] =
25-
'label';
28+
'label';
2629
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['checkbox extends _attribute_']['+fefilter'][] =
27-
'template';
30+
'template';
2831
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['checkbox extends _attribute_']['+fefilter'][] =
29-
'ynmode';
32+
'ynmode';
3033

3134
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metasubselectpalettes']['ynmode']['yes'] = array('ynfield');
3235
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metasubselectpalettes']['ynmode']['no'] = array('ynfield');
3336
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metasubselectpalettes']['ynmode']['radio'] = array('blankoption');
3437

3538
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['ynfield'] = array
3639
(
37-
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['ynfield'],
38-
'exclude' => true,
39-
'default' => true,
40-
'inputType' => 'checkbox',
41-
'eval' => array(
42-
'tl_class' => 'w50',
43-
),
40+
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['ynfield'],
41+
'exclude' => true,
42+
'default' => true,
43+
'inputType' => 'checkbox',
44+
'eval' => array(
45+
'tl_class' => 'w50',
46+
),
4447
);
4548

4649
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['fields']['ynmode'] = array
4750
(
48-
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['ynmode'],
49-
'exclude' => true,
50-
'inputType' => 'radio',
51-
'options' => array('yes','no','radio'),
52-
'reference' => $GLOBALS['TL_LANG']['tl_metamodel_filtersetting'],
53-
'eval' => array('tl_class' => 'w50 clr', 'submitOnChange' => true)
51+
'label' => &$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['ynmode'],
52+
'exclude' => true,
53+
'inputType' => 'radio',
54+
'options' => array('yes','no','radio'),
55+
'reference' => $GLOBALS['TL_LANG']['tl_metamodel_filtersetting'],
56+
'eval' => array('tl_class' => 'w50 clr', 'submitOnChange' => true)
5457
);

‎contao/languages/en/default.php‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
<?php
22

33
/**
4-
* The MetaModels extension allows the creation of multiple collections of custom items,
5-
* each with its own unique set of selectable attributes, with attribute extendability.
6-
* The Front-End modules allow you to build powerful listing and filtering of the
7-
* data in each collection.
4+
* This file is part of MetaModels/filter_checkbox.
5+
*
6+
* (c) 2012-2016 The MetaModels team.
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*
11+
* This project is provided in good faith and hope to be usable by anyone.
812
*
9-
* PHP version 5
1013
* @package MetaModels
1114
* @subpackage FilterCheckbox
15+
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
1216
* @author Christian de la Haye <service@delahaye.de>
13-
* @copyright The MetaModels team.
14-
* @license LGPL.
17+
* @copyright 2012-2016 The MetaModels team.
18+
* @license https://github.com/MetaModels/filter_checkbox/blob/master/LICENSE LGPL-3.0
1519
* @filesource
1620
*/
1721

18-
$GLOBALS['TL_LANG']['MSC']['extended_no'] = '%s: no';
22+
$GLOBALS['TL_LANG']['MSC']['extended_no'] = '%s: no';

0 commit comments

Comments
 (0)