Skip to content

Commit 5d878de

Browse files
leofeyerleofeyer
committed
Merge branch 'hotfix/3.2.17' into hotfix/3.4.1
Conflicts: assets/contao/css/debug.css assets/contao/css/form.css assets/contao/css/layout.css assets/contao/js/core-uncompressed.js assets/contao/js/core.js assets/tinymce/plugins/typolinks/editor_plugin.js assets/tinymce/plugins/typolinks/editor_plugin_src.js assets/tinymce/plugins/typolinks/js/typobox.js assets/tinymce/plugins/typolinks/js/typobox_src.js assets/tinymce/plugins/typolinks/js/typolinks.js assets/tinymce/plugins/typolinks/js/typolinks_src.js assets/tinymce/plugins/typolinks/typoimages.php assets/tinymce/plugins/typolinks/typolib.php assets/tinymce/plugins/typolinks/typolinks.php assets/tinymce/plugins/typolinks/typotemplates.php contao/changelog.php contao/confirm.php contao/file.php contao/help.php contao/index.php contao/install.php contao/main.php contao/page.php contao/password.php contao/popup.php contao/preview.php contao/switch.php index.php system/bin/minify system/cron/cron.php system/modules/core/classes/FrontendTemplate.php system/modules/core/forms/FormCaptcha.php system/modules/core/forms/FormCheckBox.php system/modules/core/forms/FormExplanation.php system/modules/core/forms/FormFieldset.php system/modules/core/forms/FormFileUpload.php system/modules/core/forms/FormHeadline.php system/modules/core/forms/FormHidden.php system/modules/core/forms/FormHtml.php system/modules/core/forms/FormPassword.php system/modules/core/forms/FormRadioButton.php system/modules/core/forms/FormSelectMenu.php system/modules/core/forms/FormSubmit.php system/modules/core/forms/FormTextArea.php system/modules/core/forms/FormTextField.php system/modules/core/library/Contao/Dbafs/Filter.php system/modules/news/assets/style.css system/themes/default/basic.css system/themes/default/confirm.css system/themes/default/error.css system/themes/default/help.css system/themes/default/install.css system/themes/default/login.css system/themes/default/main.css system/themes/default/popup.css system/themes/tinymce.css
2 parents 9f8c327 + 47b4fca commit 5d878de

File tree

369 files changed

+1152
-3129
lines changed

Some content is hidden

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

369 files changed

+1152
-3129
lines changed

‎.htaccess.default

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
##
22
# Contao Open Source CMS
33
#
4-
# Copyright (c) 2005-2014 Leo Feyer
4+
# Copyright (c) 2005-2015 Leo Feyer
55
#
6-
# @package Core
7-
# @link https://contao.org
8-
# @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
6+
# @license LGPL-3.0+
97
##
108

119
##

‎assets/contao/css/debug-uncompressed.css

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
/**
22
* Contao Open Source CMS
33
*
4-
* Copyright (c) 2005-2014 Leo Feyer
4+
* Copyright (c) 2005-2015 Leo Feyer
55
*
6-
* @package Core
7-
* @link https://contao.org
8-
* @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
6+
* @license LGPL-3.0+
97
*/
108

119
#contao-debug * {

‎assets/contao/css/form-uncompressed.css

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
/**
22
* Contao Open Source CMS
33
*
4-
* Copyright (c) 2005-2014 Leo Feyer
4+
* Copyright (c) 2005-2015 Leo Feyer
55
*
6-
* @package Core
7-
* @link https://contao.org
8-
* @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
6+
* @license LGPL-3.0+
97
*/
108

119
/**

‎assets/contao/css/grid-uncompressed.css

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
/**
22
* Contao Open Source CMS
33
*
4-
* Copyright (c) 2005-2014 Leo Feyer
4+
* Copyright (c) 2005-2015 Leo Feyer
55
*
6-
* @package Core
7-
* @link https://contao.org
8-
* @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
6+
* @license LGPL-3.0+
97
*/
108

119
/**

‎assets/contao/css/grid.css

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

‎assets/contao/css/layout-uncompressed.css

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
/**
22
* Contao Open Source CMS
33
*
4-
* Copyright (c) 2005-2014 Leo Feyer
4+
* Copyright (c) 2005-2015 Leo Feyer
55
*
6-
* @package Core
7-
* @link https://contao.org
8-
* @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
6+
* @license LGPL-3.0+
97
*/
108

119
/**

‎assets/contao/css/reset-uncompressed.css

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
/**
22
* Contao Open Source CMS
33
*
4-
* Copyright (c) 2005-2014 Leo Feyer
4+
* Copyright (c) 2005-2015 Leo Feyer
55
*
6-
* @package Core
7-
* @link https://contao.org
8-
* @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
6+
* @license LGPL-3.0+
97
*/
108

119
/**

‎assets/contao/css/reset.css

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

‎assets/contao/js/core-uncompressed.js

+6-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
/**
22
* Contao Open Source CMS
33
*
4-
* Copyright (c) 2005-2014 Leo Feyer
4+
* Copyright (c) 2005-2015 Leo Feyer
55
*
6-
* @package Core
7-
* @see https://contao.org
8-
* @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
6+
* @license LGPL-3.0+
97
*/
108

119

1210
/**
13-
* Class AjaxRequest
14-
*
1511
* Provide methods to handle Ajax requests.
16-
* @copyright Leo Feyer 2005-2014
17-
* @author Leo Feyer <https://contao.org>
12+
*
13+
* @author Leo Feyer <https://github.com/leofeyer>
1814
*/
1915
var AjaxRequest =
2016
{
@@ -712,11 +708,9 @@ var AjaxRequest =
712708

713709

714710
/**
715-
* Class Backend
716-
*
717711
* Provide methods to handle back end tasks.
718-
* @copyright Leo Feyer 2005-2014
719-
* @author Leo Feyer <https://contao.org>
712+
*
713+
* @author Leo Feyer <https://github.com/leofeyer>
720714
*/
721715
var Backend =
722716
{

‎assets/jquery/tablesorter/2.0.5/css/tablesorter.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Contao Open Source CMS, (c) 2005-2014 Leo Feyer, LGPL license */
1+
/* Contao Open Source CMS, (c) 2005-2015 Leo Feyer, LGPL license */
22
table.sortable thead th { background-image:url("../images/default.gif"); background-repeat:no-repeat; background-position:center right; }
33
table.sortable thead th.headerSortDown { background-image:url("../images/asc.gif"); }
44
table.sortable thead th.headerSortUp { background-image:url("../images/desc.gif"); }

‎assets/jquery/tablesorter/2.0.5/css/tablesorter.min.css

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

‎assets/mootools/mootao/Mootao-uncompressed.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
/**
22
* Contao Open Source CMS
33
*
4-
* Copyright (c) 2005-2014 Leo Feyer
4+
* Copyright (c) 2005-2015 Leo Feyer
55
*
6-
* @package Mootao
7-
* @see https://contao.org
8-
* @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
6+
* @license LGPL-3.0+
97
*/
108

119

‎assets/mootools/mootao/Mootao.js

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

‎assets/mootools/stylect/css/stylect-uncompressed.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Contao Open Source CMS, (c) 2005-2014 Leo Feyer, LGPL license */
1+
/* Contao Open Source CMS, (c) 2005-2015 Leo Feyer, LGPL license */
22
.styled_select {
33
display:inline;
44
margin-top:1px;

‎assets/mootools/stylect/css/stylect.css

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

‎assets/mootools/stylect/js/stylect-uncompressed.js

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
/**
22
* Contao Open Source CMS
33
*
4-
* Copyright (c) 2005-2014 Leo Feyer
4+
* Copyright (c) 2005-2015 Leo Feyer
55
*
6-
* @package Stylect
7-
* @see https://contao.org
8-
* @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
6+
* @license LGPL-3.0+
97
*/
108

119

1210
/**
13-
* Class Stylect
14-
*
1511
* Replace select menus with a nicer, JavaScript based solution.
16-
* @copyright Leo Feyer 2005-2014
17-
* @author Leo Feyer <http://contao.org>
18-
* @author Joe Ray Gregory <https://github.com/may17>
12+
*
13+
* @author Leo Feyer <http://contao.org>
14+
* @author Joe Ray Gregory <https://github.com/may17>
1915
*/
2016
var Stylect =
2117
{

‎assets/mootools/stylect/js/stylect.js

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

‎assets/mootools/tablesort/css/tablesort-uncompressed.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Contao Open Source CMS, (c) 2005-2014 Leo Feyer, LGPL license */
1+
/* Contao Open Source CMS, (c) 2005-2015 Leo Feyer, LGPL license */
22
table.sortable thead th { background-image:url("../images/default.gif"); background-repeat:no-repeat; background-position:center right; }
33
table.sortable thead th a.pointer { display:block; margin-right:9px; cursor:pointer; }
44
table.sortable thead th.unsortable { background-image:none; }

‎assets/mootools/tablesort/css/tablesort.css

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

‎assets/mootools/tablesort/js/tablesort-uncompressed.js

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
/**
22
* Contao Open Source CMS
33
*
4-
* Copyright (c) 2005-2014 Leo Feyer
4+
* Copyright (c) 2005-2015 Leo Feyer
55
*
6-
* @package Tablesort
7-
* @see https://contao.org
8-
* @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
6+
* @license LGPL-3.0+
97
*/
108

119

@@ -31,11 +29,9 @@ var DECIMAL_SEPARATOR = '.';
3129

3230

3331
/**
34-
* Class TableSort
35-
*
3632
* Provide methods to sort tables keeping the Contao class names intact.
37-
* @copyright Leo Feyer 2005-2014
38-
* @author Leo Feyer <http://contao.org>
33+
*
34+
* @author Leo Feyer <http://contao.org>
3935
*/
4036
var TableSort = new Class(
4137
{

0 commit comments

Comments
 (0)