1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-03 23:43:10 +02:00

31541 Commits

Author SHA1 Message Date
Tristan Darricau
e454b5838d Merge branch '3.2.x'
* 3.2.x:
  [ticket/15673] Fix Duplicated links in QuickLinks and main nav bar
2018-07-08 18:19:39 +02:00
Tristan Darricau
3d4cc025e0 Merge pull request #5278 from hubaishan/ticket/15673
[ticket/15673] Fix Duplicated links in QuickLinks and main nav bar

* github.com:/phpbb/phpbb:
  [ticket/15673] Fix Duplicated links in QuickLinks and main nav bar
2018-07-08 18:19:39 +02:00
Tristan Darricau
e2152a3f02 Merge pull request #5280 from senky/ticket/15718
[ticket/15718] Update CONTRIBUTING.md

* github.com:/phpbb/phpbb:
  [ticket/15718] Update CONTRIBUTING.md
2018-07-08 18:18:10 +02:00
Tristan Darricau
5542070169 Merge pull request #5198 from kasimi/ticket/15637
[ticket/15637] Extract multi-line PHP event descriptions

* github.com:/phpbb/phpbb:
  [ticket/15637] Remove trailing space from description
  [ticket/15637] Preserve line breaks in event descriptions
  [ticket/15637] Updated test fixture to include complete event description
  [ticket/15637] Remove trailing space from description
  [ticket/15637] Fixed removing white-spaces from description line
  [ticket/15637] Extract all lines before the first @tag
  [ticket/15637] Extract multi-line PHP event descriptions
2018-07-08 18:14:20 +02:00
Tristan Darricau
6c53a68ee1 Merge branch '3.2.x'
* 3.2.x:
  [ticket/15637] Remove trailing space from description
  [ticket/15637] Preserve line breaks in event descriptions
  [ticket/15637] Updated test fixture to include complete event description
  [ticket/15637] Remove trailing space from description
  [ticket/15637] Fixed removing white-spaces from description line
  [ticket/15637] Extract all lines before the first @tag
  [ticket/15637] Extract multi-line PHP event descriptions
2018-07-08 18:14:20 +02:00
Tristan Darricau
aa2ed924a8 Merge pull request #4986 from Sophist-UK/ticket/15388
[ticket/15388] List boxes internal corners rounded

* github.com:/phpbb/phpbb:
  [ticket/15388] List boxes internal corners rounded fix 2
  [ticket/15388] List boxes internal corners rounded fix 1
  [ticket/15388] List boxes internal corners rounded
2018-07-08 18:12:43 +02:00
Tristan Darricau
a2653c97b4 Merge pull request #5119 from hubaishan/ticket/15545
[ticket/15545] Fix no vertical space between format buttons

* github.com:/phpbb/phpbb:
  [ticket/15545] Fix no vertical space between format buttons
  [ticket/15545] Fix no vertical space between format buttons
  [ticket/15545] Fix no vertical space between format buttons
2018-07-08 18:10:42 +02:00
Tristan Darricau
1c61e85425
Merge pull request #5156 from 3D-I/ticket/15580_
[ticket/15580] Remove redundant code from ACP
2018-07-08 18:09:51 +02:00
Tristan Darricau
8dc100949d Merge pull request #5136 from senky/ticket/15522-2
[ticket/15522] Improve color palette syntax

* github.com:/phpbb/phpbb:
  [ticket/15522] Improve color palette syntax
2018-07-08 18:07:53 +02:00
Tristan Darricau
777443d95c Merge pull request #5157 from kasimi/ticket/15583
[ticket/15583] Update session time in AJAX request only once a minute

* github.com:/phpbb/phpbb:
  [ticket/15583] Update session time in AJAX request only once a minute
  [ticket/15583] Update session time in AJAX request only once a minute
2018-07-08 18:06:16 +02:00
Tristan Darricau
9fd893a2cf Merge branch '3.2.x'
* 3.2.x:
  [ticket/15583] Update session time in AJAX request only once a minute
  [ticket/15583] Update session time in AJAX request only once a minute
2018-07-08 18:06:16 +02:00
Tristan Darricau
9db4983f03 Merge pull request #5185 from SupSuper/ticket/15611
[ticket/15611] Fix misaligned text in responsive user profile

* github.com:/phpbb/phpbb:
  [ticket/15611] Fix misaligned text in responsive user profile
2018-07-08 18:03:59 +02:00
Tristan Darricau
f51b1911b7 Merge branch '3.2.x'
* 3.2.x:
  [ticket/15611] Fix misaligned text in responsive user profile
2018-07-08 18:03:59 +02:00
Tristan Darricau
89862b9783 Merge pull request #5183 from dnssh/phpbb-dev
[ticket/15605] Correct Right-Margin for ribbon image

* github.com:/phpbb/phpbb:
  [ticket/15605] Correct Right Margin for ribbon image
  [ticket/15605] Correct Right-Margin for ribbon image 4
  [ticket/15605] Correct Right-Margin for ribbon image 3
  [ticket/15605] Updated Correct Right-Margin for ribbon image 2
  [ticket/15605] Correct Right-Margin for ribbon image 1
2018-07-08 18:03:01 +02:00
Tristan Darricau
67cd86aca7 Merge pull request #5187 from amalnaeem/master
[ticket/15610] Improving UI of Board Statistics in ACP

* github.com:/phpbb/phpbb:
  [ticket/15610] Improving UI of Board Statistics in ACP
  [ticket/15610] Improving UI of Board Statistics in ACP
  [ticket/15610] Improving UI of Board Statistics in ACP
  [ticket/15610] Improving UI of Board Statistics in ACP
  [ticket/15610] Improving UI of Board Statistics in ACP
  [ticket/15610] Improving UI of Board Statistics in ACP
  [ticket/15610] Improving UI of Board Statistics in ACP
  [ticket/15610] Improving UI of Board Statistics in ACP
  [ticket/15610] Improving UI of Board Statistics
  [ticket/15610] Improving UI of Board Statistics in ACP
  [ticket/15610] Improving UI of Board Statistics in ACP
2018-07-08 17:59:13 +02:00
Tristan Darricau
0e842e1d63 Merge pull request #5223 from senky/ticket/15664
[ticket/15664] Manage extensions with ajax

* github.com:/phpbb/phpbb:
  [ticket/15664] Add support for multi step processes
  [ticket/15664] Ajaxify ext actions in ACP
2018-07-08 17:57:56 +02:00
Tristan Darricau
7f7f3904cd Merge branch '3.2.x'
* 3.2.x:
  [ticket/15638] Add word-break for overflowing.
2018-07-08 17:56:25 +02:00
Tristan Darricau
ed48b5f226 Merge pull request #5214 from ioannisbat/patch-1
[ticket/15638] Add word-break for overflowing.

* github.com:/phpbb/phpbb:
  [ticket/15638] Add word-break for overflowing.
2018-07-08 17:52:32 +02:00
Tristan Darricau
1872e8f04b Merge branch '3.2.x'
* 3.2.x:
  [ticket/15656] Add "View post" link in the mod logs on the ACP
2018-07-08 17:48:11 +02:00
Tristan Darricau
219e85c4e0 Merge pull request #5217 from Zoddo/ticket/15656
[ticket/15656] Add "View post" link in the mod logs on the ACP

* github.com:/phpbb/phpbb:
  [ticket/15656] Add "View post" link in the mod logs on the ACP
2018-07-08 17:48:10 +02:00
Tristan Darricau
29c2dfda4e Merge branch '3.2.x'
* 3.2.x:
  [ticket/15613] Fix Notification dropdown said to be not RTL compliant
2018-07-08 17:42:14 +02:00
Tristan Darricau
7f266a3664 Merge pull request #5229 from hubaishan/ticket/15613
[ticket/15613] Fix Notification dropdown said to be not RTL compliant

* github.com:/phpbb/phpbb:
  [ticket/15613] Fix Notification dropdown said to be not RTL compliant
2018-07-08 17:42:14 +02:00
Tristan Darricau
4829dfe487 Merge branch '3.2.x'
* 3.2.x:
  [ticket/15676] Use paragraphs and classes as suggested by hanakin
  [ticket/15676] Use twig syntax
  [ticket/15676] Simplify link text and use privacy link in cookie notice
  [ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY
2018-07-08 17:40:26 +02:00
Tristan Darricau
bc7b998632 Merge branch 'prep-release-3.2.3' into 3.2.x
* prep-release-3.2.3:
  [ticket/15676] Use paragraphs and classes as suggested by hanakin
  [ticket/15676] Use twig syntax
  [ticket/15676] Simplify link text and use privacy link in cookie notice
  [ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY
2018-07-08 17:38:27 +02:00
Tristan Darricau
43d7f15a25 Merge pull request #5231 from marc1706/ticket/15676
[ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY

* github.com:/phpbb/phpbb:
  [ticket/15676] Use paragraphs and classes as suggested by hanakin
  [ticket/15676] Use twig syntax
  [ticket/15676] Simplify link text and use privacy link in cookie notice
  [ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY
2018-07-08 17:38:27 +02:00
kasimi
eedcb3bbe1
[ticket/15637] Remove trailing space from description
PHPBB3-15637
2018-07-07 22:41:40 +02:00
kasimi
245f4df47c
[ticket/15637] Preserve line breaks in event descriptions
PHPBB3-15637
2018-07-07 21:25:43 +02:00
kasimi
517c601482
[ticket/15637] Updated test fixture to include complete event description
PHPBB3-15637
2018-07-07 20:13:49 +02:00
kasimi
83a8280554
[ticket/15637] Remove trailing space from description
PHPBB3-15637
2018-07-07 20:12:35 +02:00
kasimi
1c8570d0f5
[ticket/15637] Fixed removing white-spaces from description line
PHPBB3-15637
2018-07-07 16:10:23 +02:00
kasimi
21faf69d31
[ticket/15637] Extract all lines before the first @tag
PHPBB3-15637
2018-07-07 16:09:29 +02:00
Jakub Senko
a89b432411
[ticket/15718] Update CONTRIBUTING.md
PHPBB3-15718
2018-07-06 14:20:00 +02:00
hubaishan
27aba29d74 [ticket/15673] Fix Duplicated links in QuickLinks and main nav bar
Add required class to common.css

PHPBB3-15673
2018-07-04 16:40:53 +03:00
Jakub Senko
5cf88ea871
[ticket/15664] Add support for multi step processes
PHPBB3-15664
2018-07-04 14:56:36 +02:00
Marc Alexander
1491ce875d
Merge pull request #5242 from rubencm/ticket/15688
[ticket/15688] Fix event location in attachments download
2018-06-29 11:44:34 +02:00
Marc Alexander
7266e69e6d
Merge pull request #5227 from rubencm/ticket/15671
[ticket/15671] Limit accepted formats for avatar upload
2018-06-29 11:41:57 +02:00
Marc Alexander
68c6670c8b
Merge branch '3.2.x' 2018-06-20 22:11:22 +02:00
Marc Alexander
9b56a28be0
Merge branch 'prep-release-3.2.3' into 3.2.x 2018-06-20 22:11:15 +02:00
Marc Alexander
0925a22062
Merge pull request #5233 from rxu/ticket/15678
[ticket/15678] Fix PHP warning in filesystem.php
2018-06-20 22:08:37 +02:00
Marc Alexander
2f3bd918ac
[ticket/15676] Use paragraphs and classes as suggested by hanakin
PHPBB3-15676
2018-06-20 21:50:49 +02:00
Marc Alexander
857b55dd20 Merge branch '3.2.x' 2018-06-19 13:32:49 +02:00
Marc Alexander
754945e6ff Merge pull request #5259 from rubencm/ticket/15695
[ticket/15695] Fix gen_rand_string returning less characters than expected
2018-06-19 13:32:10 +02:00
Rubén Calvo
d4d8aec02a [ticket/15695] Fix gen_rand_string returning less characters than expected
PHPBB3-15695
2018-06-18 22:38:14 +02:00
Marc Alexander
596259f23e
Merge pull request #5241 from rubencm/ticket/15686
[ticket/15686] Update homestead
2018-06-18 22:17:45 +02:00
Marc Alexander
1d0046437b
Merge branch '3.2.x' 2018-06-17 15:44:33 +02:00
Marc Alexander
02cbb864a5
Merge pull request #5245 from rubencm/ticket/15693
[ticket/15693] Fix get_rand_string()
2018-06-17 15:44:28 +02:00
Marc Alexander
5a9b8a815d
Merge branch '3.2.x' 2018-06-17 15:40:02 +02:00
Marc Alexander
7245bc9977
Merge branch 'prep-release-3.2.3' into 3.2.x 2018-06-17 15:40:00 +02:00
Marc Alexander
ecf19b13c8
Merge pull request #5218 from senky/ticket/15657
[ticket/15657] Add MCP queue events
2018-06-17 15:38:08 +02:00
Marc Alexander
aea56fcf57
Merge pull request #5246 from marc1706/ticket/15633
[ticket/15633] Double space to single space
2018-06-17 15:35:17 +02:00