mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity
25,459 Commits 17 Branches 190 Tags
Commit Graph

25459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JoshyPHP
3e5ee87b15 [ticket/11768] Allowed text in places where text is not valid HTML 
PHPBB3-11768
 2015-04-02 19:16:02 +02:00
JoshyPHP
93c53ed52d [ticket/11768] Fixed test 
PHPBB3-11768
 2015-04-02 19:16:02 +02:00
JoshyPHP
f721b85a78 [ticket/11768] Replaced the Censor plugin 
...with something that is run at rendering time.

PHPBB3-11768
 2015-04-02 19:16:01 +02:00
JoshyPHP
6578e1c6ec [ticket/11768] Added limited support for [url] in [quote] author 
PHPBB3-11768
 2015-04-02 19:16:01 +02:00
JoshyPHP
42c1297345 [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:01 +02:00
JoshyPHP
6bd86a8e8a [ticket/11768] Updated phpbb\textformatter\s9e\factory::regenerate() 
Returns an associative array rather than a numerically-indexed array. Feels
cleaner and more extensible.

PHPBB3-11768
 2015-04-02 19:16:01 +02:00
JoshyPHP
f6e3e41717 [ticket/11768] Added support for magic links that start with "www." 
PHPBB3-11768
 2015-04-02 19:16:01 +02:00
JoshyPHP
63753bbf1a [ticket/11768] Uncommented disabled test 
PHPBB3-11768
 2015-04-02 19:16:01 +02:00
JoshyPHP
6540918ffa [ticket/11768] Added test files 
PHPBB3-11768
 2015-04-02 19:16:01 +02:00
JoshyPHP
cfbf02bcba [ticket/11768] Re-added the code that got lost in rebase 
PHPBB3-11768
 2015-04-02 19:16:01 +02:00
s9e
3b115a903a [ticket/11768] Removed unused use statements 
PHPBB3-11768
 2015-04-02 19:16:01 +02:00
s9e
90d1a431bd [ticket/11768] Updated tests to use the new constructor signature 
PHPBB3-11768
 2015-04-02 19:16:01 +02:00
s9e
c4a58bce89 [ticket/11768] Updated test case helper with new signature 
PHPBB3-11768
 2015-04-02 19:16:01 +02:00
s9e
72fb380c9f [ticket/11768] Updated constructors with explicit dependencies 
The trade-off is that an instance of phpbb\textformatter\s9e\factory and
phpbb\textformatter\data_access is created on any page that uses the
parser or the renderer, even when neither need to be regenerated. It has
no measureable impact on performance and costs ~20KB of RAM.

PHPBB3-11768
 2015-04-02 19:16:01 +02:00
s9e
e0bb446c57 [ticket/11768] Reorganized code for readability 
No functional change intended

PHPBB3-11768
 2015-04-02 19:16:01 +02:00
s9e
dc303cbc99 [ticket/11768] Toggled Unicode modifier in relative URL filter 
get_preg_expression('relative_url') returns an expression that requires it

PHPBB3-11768
 2015-04-02 19:16:01 +02:00
s9e
cf39b02891 [ticket/11768] Updated annotations to pass sniff 
PHPBB3-11768
 2015-04-02 19:16:01 +02:00
s9e
ca9f534409 [ticket/11768] Restored blank line from develop 
PHPBB3-11768
 2015-04-02 19:16:01 +02:00
s9e
d779ae340a [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:01 +02:00
s9e
261f7eec9c [ticket/11768] Updated composer.lock 
PHPBB3-11768
 2015-04-02 19:16:01 +02:00
s9e
147a713cc0 [ticket/11768] This commit integrates s9e\TextFormatter 
This commit integrates s9e\TextFormatter as outlined in
http://area51.phpbb.com/phpBB/viewtopic.php?f=108&t=44467

PHPBB3-11768
 2015-04-02 19:16:01 +02:00
Andreas Fischer
eb7e6d7c23 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13736] Missing four colon in Contact us page
 2015-04-02 13:31:31 +02:00
Andreas Fischer
5fc92a03b2 Merge pull request #3513 from bantu/ticket/13736 
[ticket/13736] Missing four colon in Contact us page

* bantu/ticket/13736:
  [ticket/13736] Missing four colon in Contact us page
 2015-04-02 13:31:31 +02:00
Raphaël M
40c79f2a26 [ticket/13736] Missing four colon in Contact us page 
Replacing of four ```:``` with four {L_COLON} in Contact us page.

PHPBB3-13736
 2015-04-02 12:48:31 +02:00
Andreas Fischer
18d3dd54a1 Merge pull request #3507 from VSEphpbb/ticket/13725 
[ticket/13725] Coding guidelines: static public

* VSEphpbb/ticket/13725:
  [ticket/13725] Coding guidelines: static public
 2015-04-02 12:37:34 +02:00
Marc Alexander
fbfcbd5aa7 Merge branch '3.1.x' 2015-04-01 15:51:30 +02:00
Marc Alexander
42d831f472 Merge pull request #3510 from Nicofuma/ticket/13732 
[ticket/13732] Update composer to be php7 compliant
 2015-04-01 15:51:26 +02:00
Tristan Darricau
be472cc7bb [ticket/13732] Update composer to be php7 compliant 
Updated to Composer version 1.0-dev
(f10c71475167a4661225b14560ca0a400d730829) 2015-03-29 14:37:42

PHPBB3-13732
 2015-03-30 21:48:28 +02:00
Nicofuma
a3f7e0f441 Merge branch '3.1.x' 2015-03-29 19:50:58 +02:00
Nicofuma
1a484f08bb Merge branch '3.0.x' into 3.1.x 2015-03-29 19:50:38 +02:00
Nicofuma
d9f4964d91 Merge pull request #3376 from marc1706/ticket/13568-asc 
[ticket/13568] Validate imagick path as readable absolute path

closes #3376
 2015-03-29 19:50:19 +02:00
Nicofuma
b9db47e3f5 Merge pull request #3359 from marc1706/ticket/13568 
[ticket/13568] Validate imagick path as readable absolute path

closes #3359
 2015-03-29 19:41:13 +02:00
Matt Friedman
dbb538afbd [ticket/13725] Coding guidelines: static public 
PHPBB3-13725
 2015-03-27 00:02:20 -07:00
Andreas Fischer
67d81a1ce6 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13555] Render poll options separately when previewing.
 2015-03-26 11:15:37 +01:00
Andreas Fischer
499088b62f Merge branch '3.0.x' into 3.1.x 
* 3.0.x:
  [ticket/13555] Render poll options separately when previewing.
 2015-03-26 11:15:37 +01:00
Andreas Fischer
1efbb5b3bb Merge pull request #3493 from prototech/ticket/13555 
[ticket/13555] Render poll options separately when previewing.

* prototech/ticket/13555:
  [ticket/13555] Render poll options separately when previewing.
 2015-03-26 11:15:36 +01:00
Oliver Schramm
784ccdf0b0 Merge branch '3.1.x' 2015-03-25 22:03:15 +01:00
Oliver Schramm
9d75f3fca8 Merge branch '3.0.x' into 3.1.x 2015-03-25 21:49:11 +01:00
Oliver Schramm
407b9d3c6b Merge pull request #3506 from Nicofuma/ticket/13723-31x 
[ticket/13723-Ascraeus] Add Elsensee to authors list
 2015-03-25 21:48:05 +01:00
Oliver Schramm
84d77d6cd5 Merge pull request #3505 from Nicofuma/ticket/13723 
[ticket/13723] Add Elsensee to authors list
 2015-03-25 21:44:09 +01:00
Nicofuma
7f2b932a1b [ticket/13723] Merge branch 'ticket/13723' into ticket/13723-31x 
Conflicts:
	phpBB/docs/AUTHORS

PHPBB3-13723
 2015-03-25 21:40:12 +01:00
Nicofuma
44540b6112 [ticket/13723] Add Elsensee to authors list 
PHPBB3-13723
 2015-03-25 21:31:50 +01:00
Nicofuma
9e66a10bac Merge branch '3.1.x' 2015-03-24 23:57:26 +01:00
Nicofuma
50b3c2b49e Merge pull request #3398 from marc1706/ticket/13612 
[ticket/13612] Run meta refresh until extension is fully enabled
 2015-03-24 23:32:29 +01:00
Nicofuma
9a5aefd4c2 Merge branch '3.1.x' 2015-03-24 23:20:03 +01:00
Nicofuma
4a08d74571 Merge pull request #3501 from prototech/ticket/13698 
[ticket/13698] Pass parameters for link in LOGIN_ERROR_PASSWORD error message.
 2015-03-24 23:19:46 +01:00
Nicofuma
673435a0fc Merge branch '3.1.x' 2015-03-24 22:37:01 +01:00
Nicofuma
285e35992a Merge pull request #3410 from Senky/ticket/13467 
[ticket/13467] Add a CONTRIBUTING file to the project on Github
 2015-03-24 22:35:34 +01:00
Marc Alexander
b67b0056e8 Merge branch '3.1.x' 2015-03-24 11:00:29 +01:00
Marc Alexander
3d0153de60 Merge pull request #3499 from Elsensee/ticket/13721 
[ticket/13271] Fix URL Rewriting on IIS7
 2015-03-24 11:00:26 +01:00