Marc Alexander
4523eb0812
Merge branch '3.2.x'
2017-11-01 21:33:40 +01:00
Marc Alexander
c3cc6bcbac
Merge pull request #4977 from rxu/ticket/15384
...
[ticket/15384] Add linebreaks to SMTP/Jabber configuration option explanations
2017-11-01 21:33:35 +01:00
Marc Alexander
e86afe6799
[ticket/15384] Use html5 version of <br> instead of xhtml one
...
PHPBB3-15384
2017-11-01 20:08:45 +01:00
Marc Alexander
2312af57c6
[ticket/15387] Fix CSS for master branch
...
PHPBB3-15387
2017-11-01 19:08:17 +01:00
Marc Alexander
c309b4cd8d
Merge branch '3.2.x'
2017-11-01 18:02:14 +01:00
Marc Alexander
22e97296af
Merge pull request #5019 from marc1706/ticket/14994
...
[ticket/14994] Refactor template->assign_block_var
2017-11-01 17:23:33 +01:00
Marc Alexander
91caee664a
Merge branch '3.2.x'
2017-11-01 16:08:46 +01:00
Marc Alexander
18a0abcaa3
Merge pull request #5024 from kasimi/ticket/15432
...
[ticket/15432] Don't remove dark background if fadedark is false
2017-11-01 16:08:41 +01:00
Marc Alexander
1926f1a3a8
Merge pull request #5010 from hanakin/ticket/15414
...
[ticket/15414] Remove useless redundant css properties
2017-11-01 16:03:31 +01:00
Marc Alexander
d7f9b9bc07
Merge pull request #5011 from rxu/ticket/15415
...
[ticket/15415] Fix styling in ucp_notifications.html
2017-11-01 16:02:11 +01:00
Marc Alexander
a3fd51ae47
Merge branch '3.2.x'
2017-11-01 15:59:09 +01:00
Marc Alexander
44277d6a0d
Merge pull request #5013 from rxu/ticket/15419
...
[ticket/15419] Fix Sphinx UTF8 search in delta index
2017-11-01 15:59:05 +01:00
Marc Alexander
dbca73f468
Merge branch '3.2.x'
2017-11-01 15:51:31 +01:00
Marc Alexander
1b480df535
Merge pull request #5015 from kasimi/ticket/15423
...
[ticket/15423] Fix wrong title for topic's "Unappproved posts" icon
2017-11-01 15:51:27 +01:00
Marc Alexander
f75fdc69b3
Merge branch '3.2.x'
2017-11-01 15:45:15 +01:00
Marc Alexander
5cdec6199c
Merge pull request #4984 from senky/ticket/15111
...
[ticket/15111] Fix the typo in ucp_pm_view_messsage
2017-11-01 15:45:11 +01:00
Marc Alexander
51b8974312
Merge branch '3.2.x'
2017-11-01 13:21:37 +01:00
Marc Alexander
96cb62fe6d
Merge pull request #5026 from marc1706/ticket/15387
...
[ticket/15387] Make vertical bars full height on board index forum rows
2017-11-01 13:21:33 +01:00
Marc Alexander
54d5d9329a
Merge branch '3.2.x'
2017-11-01 13:19:50 +01:00
Marc Alexander
a9f850c36d
Merge pull request #5018 from marc1706/ticket/15133
...
[ticket/15133] Update fast-image-size to 1.1.4
2017-11-01 12:32:51 +01:00
javiexin
a30693a594
[ticket/14994] Refactor template->assign_block_var
...
Refactor assign_block_var to use the same block selection mechanism
as is used in alter_block_array. This allows creating new blocks
at any position in the template structure, not only on the last block.
Allows selecting a block as outer[2].middle.
Added tests. Added PHP 7.2 compatibility.
PHPBB3-14994
2017-11-01 12:29:49 +01:00
javiexin
c2043e47da
[ticket/14994] Refactor template->assign_block_var
...
Refactor assign_block_var to use the same block selection mechanism
as is used in alter_block_array. This allows creating new blocks
at any position in the template structure, not only on the last block.
Allows selecting a block as outer[2].middle.
Added tests. Added PHP 7.2 compatibility.
PHPBB3-14994
2017-11-01 12:29:49 +01:00
Marc Alexander
e157d8890b
Merge pull request #5020 from marc1706/ticket/15424
...
[ticket/15424] Multiple typo fixes in docs & comments
2017-11-01 12:27:13 +01:00
Marc Alexander
14cb1b9cfc
Merge branch '3.2.x'
2017-11-01 12:19:46 +01:00
Marc Alexander
c14cc433b7
Merge pull request #4988 from Elsensee/ticket/15389
...
[ticket/15389] Allow arrays in event dispatcher
2017-11-01 12:00:23 +01:00
Sophist
ab83b25857
[ticket/15387] Make vertical bars full height - fix MCP
...
Fix issue where changes were half applied to MCP creating c. 990px of
whitespace.
PHPBB3-15387
2017-11-01 11:03:00 +01:00
Sophist
e5860288be
[ticket/15387] Make vertical bars full height - fix 1
...
Fix issue with 2px gap at the bottom of the bars.
PHPBB3-15387
2017-11-01 11:00:49 +01:00
Sophist
44a0a9e3e0
[ticket/15387] Make vertical bars full height on forum topic rows - consistency
...
Make extra size consistent with immediately following css i.e. use 999px
not 99999px as v. large to exceed possible box size.
PHPBB3-15387
2017-11-01 11:00:33 +01:00
Sophist
a6b994d95e
[ticket/15387] Make vertical bars full height on board index forum rows
...
Make vertical left border bars for height for Topics and Posts columns
in board index forum rows when these columns have less height than e.g.
the Last Post column.
PHPBB3-15387
2017-11-01 11:00:06 +01:00
Marc Alexander
6259789e02
Merge branch '3.2.x'
2017-11-01 10:40:01 +01:00
Marc Alexander
a6c5204cbd
Merge pull request #4973 from DavidIQ/ticket/15372
...
[ticket/15372] Add permission for listing topics without being able to read them
2017-11-01 10:39:56 +01:00
kasimi
8df79ba5a4
[ticket/15432] Don't remove dark background if fadedark is false
...
PHPBB3-15432
2017-10-31 17:36:29 +01:00
Marc Alexander
28df230f8d
Merge branch '3.2.x'
2017-10-31 16:13:39 +01:00
Marc Alexander
131c264492
Merge pull request #4985 from senky/ticket/13150
...
[ticket/13150] Add core.phpbb_log_get_topic_auth_sql_after
2017-10-31 16:13:34 +01:00
Marc Alexander
c6e8a5ddee
Merge branch '3.2.x'
2017-10-31 15:51:24 +01:00
Marc Alexander
200562548e
Merge pull request #4980 from senky/ticket/15381
...
[ticket/15381] Better explain CONTACT_US_ENABLE_EXPLAIN
2017-10-31 15:51:20 +01:00
Marc Alexander
a51741df41
Merge branch '3.2.x'
2017-10-31 15:47:14 +01:00
Marc Alexander
1744d829ad
Merge pull request #4978 from ftc2/3.2.x
...
[ticket/15385] nginx.sample.conf: www redirection, security regex
2017-10-31 15:47:09 +01:00
Marc Alexander
f5467c560a
Merge branch '3.2.x'
2017-10-31 14:17:32 +01:00
Marc Alexander
78610f0406
Merge pull request #4975 from senky/ticket/15273
...
[ticket/15273] Better explain cookie path
2017-10-31 14:17:28 +01:00
Marc Alexander
cc52dc9a7e
Merge branch '3.2.x'
2017-10-31 12:58:44 +01:00
Marc Alexander
f31dcfc937
Merge pull request #4970 from rxu/ticket/15374
...
[ticket/15374] Add core event to modify page title in viewforum.php
2017-10-31 12:58:40 +01:00
Marc Alexander
ea23d456d5
Merge branch '3.2.x'
2017-10-31 09:58:33 +01:00
Marc Alexander
fbbd1713d7
Merge pull request #4969 from Elsensee/ticket/15245
...
[ticket/15245] Fix images in feeds when accessing via app.php
2017-10-31 09:58:29 +01:00
Marc Alexander
0c009e3feb
Merge pull request #4959 from rubencm/ticket/15366
...
[ticket/15366] Remove useless code
2017-10-29 22:09:49 +01:00
Marc Alexander
7a54b0631d
Merge branch '3.2.x'
2017-10-29 12:49:25 +01:00
Marc Alexander
d56e573a8e
Merge pull request #4950 from Nicofuma/ticket/15357-3.2.x
...
[ticket/15298] Never suppress exception trace when using CLI
2017-10-29 12:49:16 +01:00
luzpaz
e13ba99c81
[ticket/15424] Multiple typo fixes in docs & comments
...
Fixed typos in some docs, guidelines, some non-user-facing files.
PHPBB3-15424
2017-10-29 12:44:01 +01:00
Marc Alexander
408916d24e
Merge branch '3.2.x'
2017-10-29 11:34:52 +01:00
Marc Alexander
d0e25f2eed
Merge pull request #5012 from kasimi/ticket/15060
...
[ticket/15060] Set correct forum id in user session data if f= is missing
2017-10-29 11:34:47 +01:00
