mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-24 01:20:40 +01:00
Code Issues Releases Wiki Activity
31,593 Commits 18 Branches 191 Tags
Commit Graph

31593 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tristan Darricau
2d26fd5b0c Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15659] Fix retrieve_block_vars()
 2018-07-08 18:43:17 +02:00
Tristan Darricau
7f76d91128 Merge pull request #5249 from senky/ticket/15659 
[ticket/15659] Fix retrieve_block_vars()

* github.com:/phpbb/phpbb:
  [ticket/15659] Fix retrieve_block_vars()
 2018-07-08 18:43:16 +02:00
Tristan Darricau
d84af59cad Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15666] Fix array key in twig lang() call
 2018-07-08 18:42:27 +02:00
Tristan Darricau
71905e50e8 Merge pull request #5250 from senky/ticket/15666 
[ticket/15666] Language system is not fully supported in Twig

* github.com:/phpbb/phpbb:
  [ticket/15666] Fix array key in twig lang() call
 2018-07-08 18:42:26 +02:00
Tristan Darricau
c56568871d Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15674] Improve CPF lang descriptions
 2018-07-08 18:41:42 +02:00
Tristan Darricau
0e580d2ab0 Merge pull request #5252 from senky/ticket/15674 
[ticket/15674] Edit language lines in file en\acp\profile.php

* github.com:/phpbb/phpbb:
  [ticket/15674] Improve CPF lang descriptions
 2018-07-08 18:41:42 +02:00
Tristan Darricau
e247a0f6ea Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15618] Display The team link only to users with permission
 2018-07-08 18:41:04 +02:00
Tristan Darricau
078d076526 Merge pull request #5253 from senky/ticket/15618 
[ticket/15618] Display The team link only to users with permission

* github.com:/phpbb/phpbb:
  [ticket/15618] Display The team link only to users with permission
 2018-07-08 18:41:04 +02:00
Tristan Darricau
001604df0c Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15620] Use separate local avatar cache file for every lang
 2018-07-08 18:40:22 +02:00
Tristan Darricau
bdd384aa37 Merge pull request #5254 from senky/ticket/15620 
[ticket/15620] Use separate local avatar cache file for every lang

* github.com:/phpbb/phpbb:
  [ticket/15620] Use separate local avatar cache file for every lang
 2018-07-08 18:40:22 +02:00
Tristan Darricau
683250ee62 Merge pull request #5255 from senky/ticket/15694 
[ticket/15694] Ignore lang files in prosilver/theme dir

* github.com:/phpbb/phpbb:
  [ticket/15694] Ignore lang files in prosilver/theme dir
 2018-07-08 18:39:45 +02:00
Tristan Darricau
e7a1e16bc5 Merge pull request #5256 from senky/ticket/13043 
[ticket/13043] Improve HTML5

* github.com:/phpbb/phpbb:
  [ticket/13043] Improve HTML5
 2018-07-08 18:38:53 +02:00
Tristan Darricau
e190873280 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/13043] Improve HTML5
 2018-07-08 18:38:53 +02:00
Tristan Darricau
47d70d9c2d Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15651] Remove unnecessary condition
 2018-07-08 18:38:14 +02:00
Tristan Darricau
e7ad97de3a Merge pull request #5257 from senky/ticket/15651 
[ticket/15651] Remove unnecessary condition

* github.com:/phpbb/phpbb:
  [ticket/15651] Remove unnecessary condition
 2018-07-08 18:38:13 +02:00
Tristan Darricau
c37e77c8bb Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15628] Add topic link to newtopic_notify.txt
 2018-07-08 18:36:58 +02:00
Tristan Darricau
90dc5519c0 Merge pull request #5258 from senky/ticket/15628 
[ticket/15628] Add topic link to newtopic_notify.txt

* github.com:/phpbb/phpbb:
  [ticket/15628] Add topic link to newtopic_notify.txt
 2018-07-08 18:36:58 +02:00
Tristan Darricau
8033209e03 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15696] Add tests
  [ticket/15696] Add support of other tools to 'if'
 2018-07-08 18:36:10 +02:00
Tristan Darricau
e680d46865 Merge pull request #5260 from senky/ticket/15696 
[ticket/15696] 'if' module tool should support calling other tools

* github.com:/phpbb/phpbb:
  [ticket/15696] Add tests
  [ticket/15696] Add support of other tools to 'if'
 2018-07-08 18:36:10 +02:00
Tristan Darricau
28112b7b77 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15670] Fix SQL error when !f_list_topics and f_read
 2018-07-08 18:35:30 +02:00
Tristan Darricau
f5e3394550 Merge pull request #5261 from senky/ticket/15670 
[ticket/15670] Group forum permission: Can see forum gives NO SQL ERROR

* github.com:/phpbb/phpbb:
  [ticket/15670] Fix SQL error when !f_list_topics and f_read
 2018-07-08 18:35:29 +02:00
Tristan Darricau
6d062aa562 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15606] Hide viewprofile link when unavailable
 2018-07-08 18:34:13 +02:00
Tristan Darricau
fca72a0f6a Merge pull request #5262 from senky/ticket/15606 
[ticket/15606] Hide viewprofile link when unavailable

* github.com:/phpbb/phpbb:
  [ticket/15606] Hide viewprofile link when unavailable
 2018-07-08 18:34:12 +02:00
Tristan Darricau
52f77f113a Merge pull request #5263 from senky/ticket/12591-2 
[ticket/12591] Improve breadcrumb naming and extend it's usage

* github.com:/phpbb/phpbb:
  [ticket/12591] Introduce a BC fallback
  [ticket/12591] Improve breadcrumb naming and extend it's usage
 2018-07-08 18:33:35 +02:00
Tristan Darricau
f6301ea85a Merge pull request #5266 from senky/ticket/12624 
[ticket/12624] Add debug.load_time parameter

* github.com:/phpbb/phpbb:
  [ticket/12624] Add debug.load_time parameter
 2018-07-08 18:32:45 +02:00
Tristan Darricau
7cf35eafb5 Merge pull request #5267 from senky/ticket/12627 
[ticket/12627] Add debug.sql_explain parameter

* github.com:/phpbb/phpbb:
  [ticket/12627] Add debug.sql_explain parameter
 2018-07-08 18:26:52 +02:00
Tristan Darricau
0efb48855f Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15705] fix phpbbcli language vs PHP
 2018-07-08 18:25:53 +02:00
Tristan Darricau
be15d8718d Merge pull request #5269 from 3D-I/ticket/15705 
[ticket/15705] fix phpbbcli language vs PHP

* github.com:/phpbb/phpbb:
  [ticket/15705] fix phpbbcli language vs PHP
 2018-07-08 18:24:55 +02:00
Tristan Darricau
4028c92c9d Merge pull request #5272 from rubencm/ticket/15714 
[ticket/15714] Auto login after registration

* github.com:/phpbb/phpbb:
  [ticket/15714] Edit language string
  [ticket/15714] Auto login after registration
 2018-07-08 18:23:33 +02:00
Tristan Darricau
187e598236 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15717] Using correct variable for log entry
 2018-07-08 18:21:46 +02:00
Tristan Darricau
b0df5e31cf Merge pull request #5277 from ghostal/ticket/15717 
[ticket/15717] Using correct variable for log entry

* github.com:/phpbb/phpbb:
  [ticket/15717] Using correct variable for log entry
 2018-07-08 18:21:45 +02:00
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