Skip to content

Commit 47ea6bc

Browse files
marc1706marc1706
committed
Merge branch 'develop' of https://github.com/phpbb/phpbb into ticket/11997
Conflicts: tests/functional/fixtures/ext/foo/bar/config/services.yml
2 parents f32a30e + 71169de commit 47ea6bc

183 files changed

Lines changed: 3564 additions & 1980 deletions

File tree

Some content is hidden

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

‎.travis.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ env:
1010
- DB=mysql
1111
- DB=postgres
1212

13+
services:
14+
- redis-server
15+
1316
install:
1417
- sh -c "if [ '$DB' = 'mariadb' ]; then travis/setup-mariadb.sh; fi"
1518
- sh -c "if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` = "1" ]; then travis/setup-webserver.sh; fi"

‎build/build.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
44
<!-- a few settings for the build -->
5-
<property name="newversion" value="3.1.0-a1" />
6-
<property name="prevversion" value="3.0.12" />
7-
<property name="olderversions" value="3.0.11" />
5+
<property name="newversion" value="3.1.0-a2" />
6+
<property name="prevversion" value="3.1.0-a1" />
7+
<property name="olderversions" value="3.0.12" />
88
<!-- no configuration should be needed beyond this point -->
99

1010
<property name="oldversions" value="${olderversions}, ${prevversion}" />

‎phpBB/adm/style/acp_ext_delete_data.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ <h1>{L_EXTENSIONS_ADMIN}</h1>
2121
<form id="acp_extensions" method="post" action="{U_PURGE}">
2222
<fieldset class="submit-buttons">
2323
<legend>{L_EXTENSION_DELETE_DATA}</legend>
24-
<input class="button1" type="submit" name="purge" value="{L_EXTENSION_DELETE_DATA}" />
24+
<input class="button1" type="submit" name="delete_data" value="{L_EXTENSION_DELETE_DATA}" />
2525
<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
2626
</fieldset>
2727
</form>

‎phpBB/adm/style/acp_groups.html‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,12 @@ <h3>{L_WARNING}</h3>
9292
</dl>
9393
<dl>
9494
<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
95-
<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" /><!-- IF GROUP_COLOUR -->&nbsp;<span style="background-color: #{GROUP_COLOUR}">&nbsp; &nbsp;</span><!-- ENDIF -->&nbsp;&nbsp;<span>[ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
95+
<dd>
96+
<input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />
97+
<!-- IF GROUP_COLOUR -->&nbsp;<span style="background-color: #{GROUP_COLOUR}">&nbsp; &nbsp;</span><!-- ENDIF -->&nbsp;&nbsp;<span>
98+
[ <a href="#" id="color_palette_toggle">{L_COLOUR_SWATCH}</a> ]</span>
99+
<div id="color_palette_placeholder" style="display: none;" data-orientation="h" data-height="12" data-width="15" data-target="#group_colour"></div>
100+
</dd>
96101
</dl>
97102
<dl>
98103
<dt><label for="group_rank">{L_GROUP_RANK}{L_COLON}</label></dt>

‎phpBB/adm/style/acp_inactive.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ <h2>{L_INACTIVE_USERS}</h2>
5353
</table>
5454

5555
<fieldset class="display-options">
56-
{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination -->&nbsp;Users per page{L_COLON} <input class="inputbox autowidth" type="number" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
56+
{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination -->&nbsp;{L_USERS_PER_PAGE}{L_COLON} <input class="inputbox autowidth" type="number" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
5757
<input class="button2" type="submit" value="{L_GO}" name="sort" />
5858
</fieldset>
5959

‎phpBB/adm/style/acp_modules.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ <h3>{L_WARNING}</h3>
151151
<td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;<!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->&nbsp;</td>
152152
<td class="actions">
153153
<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
154-
<span class="up"><a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a></span>
154+
<span class="up"><a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a></span>
155155
<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
156156
<span class="down"><a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a></span>
157157
<a href="{modules.U_EDIT}">{ICON_EDIT}</a>

‎phpBB/adm/style/acp_prune_users.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ <h1>{L_ACP_PRUNE_USERS}</h1>
3939
</dl>
4040
<dl>
4141
<dt><label for="posts_on_queue">{L_POSTS_ON_QUEUE}{L_COLON}</label></dt>
42-
<dd><select name="queue_select">{S_COUNT_OPTIONS}</select> <input type="number" id="posts_on_queue" name="posts_on_queue" /></select>
42+
<dd><select name="queue_select">{S_COUNT_OPTIONS}</select> <input type="number" id="posts_on_queue" name="posts_on_queue" /></dd>
4343
</dl>
4444
<!-- IF S_GROUP_LIST -->
4545
<dl>
46-
<dt><label for="group_id">{L_GROUP}{L_COLON}</label><br /><span>{L_PRUNE_USERS_GROUP_EXPLAIN}</dt>
46+
<dt><label for="group_id">{L_GROUP}{L_COLON}</label><br /><span>{L_PRUNE_USERS_GROUP_EXPLAIN}</span></dt>
4747
<dd><select name="group_id">{S_GROUP_LIST}</select></dd>
4848
</dl>
4949
<!-- ENDIF -->

‎phpBB/adm/style/acp_users_prefs.html‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@
3939
<dd><label><input type="radio" class="radio" name="notifypm" value="1"<!-- IF NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
4040
<label><input type="radio" class="radio" name="notifypm" value="0"<!-- IF not NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
4141
</dl>
42-
<dl>
43-
<dt><label for="popuppm">{L_POPUP_ON_PM}{L_COLON}</label></dt>
44-
<dd><label><input type="radio" class="radio" name="popuppm" value="1"<!-- IF POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
45-
<label><input type="radio" class="radio" name="popuppm" value="0"<!-- IF not POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
46-
</dl>
4742
<dl>
4843
<dt><label for="lang">{L_BOARD_LANGUAGE}{L_COLON}</label></dt>
4944
<dd><select id="lang" name="lang">{S_LANG_OPTIONS}</select></dd>

‎phpBB/adm/style/acp_users_signature.html‎

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
var form_name = 'user_signature';
55
var text_name = 'signature';
6+
var load_draft = false;
7+
var upload = false;
68

79
// Define the bbCode tags
810
var bbcode = new Array();
@@ -20,19 +22,19 @@
2022
o: '{LA_BBCODE_O_HELP}',
2123
p: '{LA_BBCODE_P_HELP}',
2224
w: '{LA_BBCODE_W_HELP}',
25+
a: '{LA_BBCODE_A_HELP}',
2326
s: '{LA_BBCODE_S_HELP}',
2427
f: '{LA_BBCODE_F_HELP}',
2528
y: '{LA_BBCODE_Y_HELP}',
26-
d: '{LA_BBCODE_D_HELP}',
27-
tip: '{L_STYLES_TIP}'
29+
d: '{LA_BBCODE_D_HELP}'
2830
<!-- BEGIN custom_tags -->
2931
,cb_{custom_tags.BBCODE_ID}{L_COLON} '{custom_tags.A_BBCODE_HELPLINE}'
3032
<!-- END custom_tags -->
3133
}
3234

3335
// ]]>
3436
</script>
35-
<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
37+
<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
3638

3739
<form id="user_signature" method="post" action="{U_ACTION}">
3840

@@ -48,52 +50,46 @@
4850
<p>{L_SIGNATURE_EXPLAIN}</p>
4951

5052
<div id="format-buttons">
51-
<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" />
52-
<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" onmouseout="helpline('tip')" />
53-
<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;" onclick="bbstyle(4)" onmouseover="helpline('u')" onmouseout="helpline('tip')" />
54-
<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" onmouseover="helpline('q')" onmouseout="helpline('tip')" />
55-
<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" />
56-
<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" />
57-
<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" />
58-
<input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('y')" onmouseout="helpline('tip')" />
53+
<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
54+
<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
55+
<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" />
56+
<!-- IF S_BBCODE_QUOTE -->
57+
<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" />
58+
<!-- ENDIF -->
59+
<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" />
60+
<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" />
61+
<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" />
62+
<input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" />
5963
<!-- IF S_BBCODE_IMG -->
60-
<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" onmouseout="helpline('tip')" />
64+
<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" />
6165
<!-- ENDIF -->
6266
<!-- IF S_LINKS_ALLOWED -->
63-
<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" onmouseout="helpline('tip')" />
67+
<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" />
6468
<!-- ENDIF -->
6569
<!-- IF S_BBCODE_FLASH -->
66-
<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" onmouseover="helpline('d')" onmouseout="helpline('tip')" />
70+
<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}" />
6771
<!-- ENDIF -->
68-
69-
{L_FONT_SIZE}{L_COLON} <select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_FONT_SIZE}" onmouseover="helpline('f')" onmouseout="helpline('tip')">
72+
<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
7073
<option value="50">{L_FONT_TINY}</option>
7174
<option value="85">{L_FONT_SMALL}</option>
7275
<option value="100" selected="selected">{L_FONT_NORMAL}</option>
73-
<option value="150">{L_FONT_LARGE}</option>
74-
<option value="200">{L_FONT_HUGE}</option>
76+
<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 150 -->
77+
<option value="150">{L_FONT_LARGE}</option>
78+
<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 200 -->
79+
<option value="200">{L_FONT_HUGE}</option>
80+
<!-- ENDIF -->
81+
<!-- ENDIF -->
7582
</select>
76-
<!-- IF .custom_tags -->
77-
<br /><br />
7883
<!-- BEGIN custom_tags -->
79-
<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})"<!-- IF custom_tags.BBCODE_HELPLINE !== '' --> onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')"<!-- ENDIF --> />
84+
<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
8085
<!-- END custom_tags -->
81-
<!-- ENDIF -->
82-
8386
</div>
8487

85-
<p><input type="text" class="text full" style="border: 0; background: none;" name="helpbox" value="{L_STYLES_TIP}" /></p>
86-
8788
<dl>
88-
<dt style="width: 90px;">
89-
<script type="text/javascript">
90-
// <![CDATA[
91-
colorPalette('v', 12, 10);
92-
// ]]>
93-
</script>
89+
<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
9490
</dt>
95-
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{SIGNATURE}</textarea></dd>
96-
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 90px; margin-top: 5px;">
91+
<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{SIGNATURE}</textarea></dd>
92+
<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;">
9793
<!-- IF S_BBCODE_ALLOWED -->
9894
<label><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label>
9995
<!-- ENDIF -->
@@ -104,7 +100,7 @@
104100
<label><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label>
105101
<!-- ENDIF -->
106102
</dd>
107-
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 90px; margin-top: 10px;"><strong>{L_OPTIONS}{L_COLON} </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
103+
<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 10px;"><strong>{L_OPTIONS}{L_COLON} </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
108104
</dl>
109105
</fieldset>
110106

‎phpBB/adm/style/admin.css‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,14 @@ li {
381381
color: #BC2A4D;
382382
}
383383

384+
#tabs a:hover {
385+
background-position: 0 -69px;
386+
}
387+
388+
#tabs a:hover span {
389+
background-position: 100% -69px;
390+
}
391+
384392
#tabs .activetab a {
385393
background-position: 0 0;
386394
border-bottom: 1px solid #DCDEE2;
@@ -392,14 +400,6 @@ li {
392400
color: #23649F;
393401
}
394402

395-
#tabs a:hover {
396-
background-position: 0 -69px;
397-
}
398-
399-
#tabs a:hover span {
400-
background-position: 100% -69px;
401-
}
402-
403403
#tabs .activetab a:hover span {
404404
color: #115098;
405405
}
@@ -737,6 +737,15 @@ td {
737737
border-spacing: 1px;
738738
}
739739

740+
dt#color_palette_placeholder table {
741+
margin-right: 5px;
742+
width: 80px;
743+
}
744+
745+
#color_palette_placeholder td {
746+
padding: 0;
747+
}
748+
740749
table.type2 {
741750
border: none;
742751
background: none;
@@ -1578,6 +1587,8 @@ input.button1:focus, input.button2:focus, input.button3:focus {
15781587

15791588
#darkenwrapper {
15801589
display: none;
1590+
position: relative;
1591+
z-index: 44;
15811592
}
15821593

15831594
#darken {
@@ -2354,11 +2365,14 @@ fieldset.permissions .padding {
23542365
.dropdown .dropdown-contents {
23552366
z-index: 2;
23562367
overflow: hidden;
2368+
overflow-y: auto;
23572369
background: #fff;
23582370
border: 1px solid #b9b9b9;
23592371
border-radius: 5px;
23602372
padding: 5px;
23612373
position: relative;
2374+
min-width: 40px;
2375+
max-height: 200px;
23622376
box-shadow: 1px 3px 5px rgba(0, 0, 0, 0.2);
23632377
-webkit-box-sizing: border-box;
23642378
-moz-box-sizing: border-box;

0 commit comments

Comments
 (0)