Skip to content

Commit 09bff8f

Browse files
committed
Merge branch 'hotfix/3.2.17' into hotfix/3.4.1
Conflicts: system/config/constants.php system/docs/CHANGELOG.md system/modules/calendar/languages/es/default.xlf system/modules/calendar/languages/fa/modules.xlf system/modules/calendar/languages/fa/tl_calendar.xlf system/modules/calendar/languages/fa/tl_calendar_events.xlf system/modules/calendar/languages/fa/tl_calendar_feed.xlf system/modules/calendar/languages/fa/tl_module.xlf system/modules/calendar/languages/fa/tl_user.xlf system/modules/calendar/languages/fa/tl_user_group.xlf system/modules/calendar/languages/nl/tl_calendar_events.xlf system/modules/comments/languages/fa/default.xlf system/modules/comments/languages/fa/modules.xlf system/modules/comments/languages/fa/tl_comments.xlf system/modules/comments/languages/fa/tl_content.xlf system/modules/comments/languages/nl/tl_comments.xlf system/modules/comments/languages/ru/tl_content.xlf system/modules/core/languages/cs/default.xlf system/modules/core/languages/cs/tl_layout.xlf system/modules/core/languages/cs/tl_maintenance.xlf system/modules/core/languages/cs/tl_page.xlf system/modules/core/languages/da/default.xlf system/modules/core/languages/da/tl_maintenance.xlf system/modules/core/languages/de/default.xlf system/modules/core/languages/de/tl_maintenance.xlf system/modules/core/languages/es/default.xlf system/modules/core/languages/es/exception.xlf system/modules/core/languages/es/tl_files.xlf system/modules/core/languages/es/tl_form.xlf system/modules/core/languages/es/tl_form_field.xlf system/modules/core/languages/es/tl_install.xlf system/modules/core/languages/es/tl_layout.xlf system/modules/core/languages/es/tl_maintenance.xlf system/modules/core/languages/es/tl_page.xlf system/modules/core/languages/es/tl_settings.xlf system/modules/core/languages/es/tl_user.xlf system/modules/core/languages/fa/default.xlf system/modules/core/languages/fa/exception.xlf system/modules/core/languages/fa/explain.xlf system/modules/core/languages/fa/modules.xlf system/modules/core/languages/fa/tl_article.xlf system/modules/core/languages/fa/tl_content.xlf system/modules/core/languages/fa/tl_files.xlf system/modules/core/languages/fa/tl_form.xlf system/modules/core/languages/fa/tl_form_field.xlf system/modules/core/languages/fa/tl_install.xlf system/modules/core/languages/fa/tl_layout.xlf system/modules/core/languages/fa/tl_log.xlf system/modules/core/languages/fa/tl_maintenance.xlf system/modules/core/languages/fa/tl_member.xlf system/modules/core/languages/fa/tl_member_group.xlf system/modules/core/languages/fa/tl_module.xlf system/modules/core/languages/fa/tl_page.xlf system/modules/core/languages/fa/tl_settings.xlf system/modules/core/languages/fa/tl_style.xlf system/modules/core/languages/fa/tl_style_sheet.xlf system/modules/core/languages/fa/tl_templates.xlf system/modules/core/languages/fa/tl_theme.xlf system/modules/core/languages/fa/tl_user.xlf system/modules/core/languages/fa/tl_user_group.xlf system/modules/core/languages/fi/default.xlf system/modules/core/languages/fi/languages.xlf system/modules/core/languages/fi/tl_maintenance.xlf system/modules/core/languages/fi/tl_page.xlf system/modules/core/languages/fr/default.xlf system/modules/core/languages/fr/tl_maintenance.xlf system/modules/core/languages/hu/default.xlf system/modules/core/languages/hu/tl_maintenance.xlf system/modules/core/languages/it/default.xlf system/modules/core/languages/it/tl_content.xlf system/modules/core/languages/it/tl_layout.xlf system/modules/core/languages/it/tl_maintenance.xlf system/modules/core/languages/ja/default.xlf system/modules/core/languages/ja/tl_maintenance.xlf system/modules/core/languages/lv/default.xlf system/modules/core/languages/lv/tl_maintenance.xlf system/modules/core/languages/my/default.xlf system/modules/core/languages/my/tl_maintenance.xlf system/modules/core/languages/nl/default.xlf system/modules/core/languages/nl/modules.xlf system/modules/core/languages/nl/tl_article.xlf system/modules/core/languages/nl/tl_content.xlf system/modules/core/languages/nl/tl_form.xlf system/modules/core/languages/nl/tl_form_field.xlf system/modules/core/languages/nl/tl_layout.xlf system/modules/core/languages/nl/tl_maintenance.xlf system/modules/core/languages/nl/tl_module.xlf system/modules/core/languages/nl/tl_page.xlf system/modules/core/languages/nl/tl_style.xlf system/modules/core/languages/pl/default.xlf system/modules/core/languages/pl/tl_maintenance.xlf system/modules/core/languages/pl/tl_page.xlf system/modules/core/languages/rm/default.xlf system/modules/core/languages/rm/tl_maintenance.xlf system/modules/core/languages/ro/default.xlf system/modules/core/languages/ro/tl_layout.xlf system/modules/core/languages/ro/tl_maintenance.xlf system/modules/core/languages/ro/tl_page.xlf system/modules/core/languages/ro/tl_user.xlf system/modules/core/languages/ru/default.xlf system/modules/core/languages/ru/exception.xlf system/modules/core/languages/ru/tl_content.xlf system/modules/core/languages/ru/tl_maintenance.xlf system/modules/core/languages/ru/tl_module.xlf system/modules/core/languages/ru/tl_page.xlf system/modules/core/languages/sk/default.xlf system/modules/core/languages/sk/tl_maintenance.xlf system/modules/core/languages/sl/default.xlf system/modules/core/languages/sl/tl_maintenance.xlf system/modules/core/languages/sq/default.xlf system/modules/core/languages/sq/tl_maintenance.xlf system/modules/core/languages/sv/default.xlf system/modules/core/languages/sv/tl_maintenance.xlf system/modules/core/languages/uk/default.xlf system/modules/core/languages/uk/tl_maintenance.xlf system/modules/core/languages/zh/default.xlf system/modules/core/languages/zh/tl_maintenance.xlf system/modules/core/languages/zh/tl_page.xlf system/modules/devtools/languages/fa/tl_autoload.xlf system/modules/devtools/languages/fa/tl_extension.xlf system/modules/faq/languages/fa/modules.xlf system/modules/faq/languages/fa/tl_faq.xlf system/modules/faq/languages/fa/tl_faq_category.xlf system/modules/faq/languages/fa/tl_module.xlf system/modules/faq/languages/fa/tl_user.xlf system/modules/faq/languages/fa/tl_user_group.xlf system/modules/faq/languages/it/tl_faq.xlf system/modules/faq/languages/nl/tl_faq.xlf system/modules/listing/languages/fa/tl_module.xlf system/modules/listing/languages/it/tl_module.xlf system/modules/news/languages/fa/modules.xlf system/modules/news/languages/fa/tl_module.xlf system/modules/news/languages/fa/tl_news.xlf system/modules/news/languages/fa/tl_news_archive.xlf system/modules/news/languages/fa/tl_news_comments.xlf system/modules/news/languages/fa/tl_news_feed.xlf system/modules/news/languages/fa/tl_user.xlf system/modules/news/languages/it/tl_news_archive.xlf system/modules/news/languages/ja/tl_news_feed.xlf system/modules/news/languages/nl/tl_news.xlf system/modules/news/languages/nl/tl_news_comments.xlf system/modules/news/languages/ru/default.xlf system/modules/news/languages/ru/tl_module.xlf system/modules/news/languages/ru/tl_news_archive.xlf system/modules/newsletter/languages/fa/default.xlf system/modules/newsletter/languages/fa/modules.xlf system/modules/newsletter/languages/fa/tl_member.xlf system/modules/newsletter/languages/fa/tl_module.xlf system/modules/newsletter/languages/fa/tl_newsletter.xlf system/modules/newsletter/languages/fa/tl_newsletter_channel.xlf system/modules/newsletter/languages/fa/tl_newsletter_recipients.xlf system/modules/newsletter/languages/fa/tl_user.xlf system/modules/newsletter/languages/nl/tl_newsletter.xlf system/modules/repository/languages/fa/tl_repository.xlf system/modules/repository/languages/fa/tl_settings.xlf system/modules/repository/languages/it/tl_repository.xlf system/modules/repository/languages/sl/tl_repository.xlf
2 parents 190311e + acdd1ab commit 09bff8f

File tree

6 files changed

+65
-14
lines changed

6 files changed

+65
-14
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
1-
/* Contao Open Source CMS, (c) 2005-2015 Leo Feyer, LGPL license */
2-
table.sortable thead th { background-image:url("../images/default.gif"); background-repeat:no-repeat; background-position:center right; }
3-
table.sortable thead th.headerSortDown { background-image:url("../images/asc.gif"); }
4-
table.sortable thead th.headerSortUp { background-image:url("../images/desc.gif"); }
1+
/**
2+
* Contao Open Source CMS
3+
*
4+
* Copyright (c) 2005-2015 Leo Feyer
5+
*
6+
* @license LGPL-3.0+
7+
*/
8+
9+
table.sortable thead th {
10+
background-image:url("../images/default.gif");
11+
background-repeat:no-repeat;
12+
background-position:center right;
13+
}
14+
table.sortable thead th.headerSortDown {
15+
background-image:url("../images/asc.gif");
16+
}
17+
table.sortable thead th.headerSortUp {
18+
background-image:url("../images/desc.gif");
19+
}

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

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
/* Contao Open Source CMS, (c) 2005-2015 Leo Feyer, LGPL license */
1+
/**
2+
* Contao Open Source CMS
3+
*
4+
* Copyright (c) 2005-2015 Leo Feyer
5+
*
6+
* @license LGPL-3.0+
7+
*/
8+
29
.styled_select {
310
display:inline;
411
margin-top:1px;
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
1-
/* Contao Open Source CMS, (c) 2005-2015 Leo Feyer, LGPL license */
2-
table.sortable thead th { background-image:url("../images/default.gif"); background-repeat:no-repeat; background-position:center right; }
3-
table.sortable thead th a.pointer { display:block; margin-right:9px; cursor:pointer; }
4-
table.sortable thead th.unsortable { background-image:none; }
5-
table.sortable thead th.asc { background-image:url("../images/asc.gif"); }
6-
table.sortable thead th.desc { background-image:url("../images/desc.gif"); }
1+
/**
2+
* Contao Open Source CMS
3+
*
4+
* Copyright (c) 2005-2015 Leo Feyer
5+
*
6+
* @license LGPL-3.0+
7+
*/
8+
9+
table.sortable thead th {
10+
background-image:url("../images/default.gif");
11+
background-repeat:no-repeat;
12+
background-position:center right;
13+
}
14+
table.sortable thead th a.pointer {
15+
display:block;
16+
margin-right:9px;
17+
cursor:pointer;
18+
}
19+
table.sortable thead th.unsortable {
20+
background-image:none;
21+
}
22+
table.sortable thead th.asc {
23+
background-image:url("../images/asc.gif");
24+
}
25+
table.sortable thead th.desc {
26+
background-image:url("../images/desc.gif");
27+
}

assets/swipe/2.0/css/swipe.css

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
/* Contao Open Source CMS, (c) 2005-2015 Leo Feyer, LGPL license */
1+
/**
2+
* Contao Open Source CMS
3+
*
4+
* Copyright (c) 2005-2015 Leo Feyer
5+
*
6+
* @license LGPL-3.0+
7+
*/
8+
29
.content-slider {
310
overflow:hidden;
411
visibility:hidden;
@@ -42,4 +49,4 @@
4249
}
4350
.slider-control .slider-menu b.active {
4451
color:#666;
45-
}
52+
}

system/config/default.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@
311311
. 'mp3,mp4,m4a,m4v,webm,ogg,ogv,wma,wmv,ram,rm,mov,'
312312
. 'zip,rar,7z';
313313
$GLOBALS['TL_CONFIG']['installPassword'] = '';
314-
$GLOBALS['TL_CONFIG']['liveUpdateBase'] = 'https://update.contao.org/liveupdate/';
314+
$GLOBALS['TL_CONFIG']['liveUpdateBase'] = 'https://update.contao.org/service/';
315315
$GLOBALS['TL_CONFIG']['repository_wsdl'] = 'https://contao.org/services/repository.wsdl';
316316
$GLOBALS['TL_CONFIG']['repository_languages'] = 'en,de';
317317
$GLOBALS['TL_CONFIG']['repository_listsize'] = 10;

system/modules/repository/classes/RepositorySettings.php

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
'30030007,30030007;'. // 3.3.0-RC2
3232
'30030006,30030006;'. // 3.3.0-RC1
3333
'30030003,30030003;'. // 3.3.0-beta1
34+
'30020179,30020179;'. // 3.2.17
3435
'30020169,30020169;'. // 3.2.16
3536
'30020159,30020159;'. // 3.2.15
3637
'30020149,30020149;'. // 3.2.14

0 commit comments

Comments
 (0)