aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11768] Added support for creating unsafe BBCodesJoshyPHP2015-04-021-1/+2
| | | | PHPBB3-11768
* [ticket/11768] Replaced extract() callsJoshyPHP2015-04-023-4/+7
| | | | PHPBB3-11768
* [ticket/11768] Replaced some referencesJoshyPHP2015-04-021-5/+3
| | | | PHPBB3-11768
* [ticket/11768] Removed the cached rendererJoshyPHP2015-04-022-8/+3
| | | | | | | We don't need to cache an instance of the renderer, we can just instantiate it every time we need one. PHPBB3-11768
* [ticket/11768] Replaced FQNs in annotationsJoshyPHP2015-04-023-5/+5
| | | | PHPBB3-11768
* [ticket/11768] Renamed propertyJoshyPHP2015-04-021-8/+8
| | | | PHPBB3-11768
* [ticket/11768] Replaced class names in annotations with their FQNJoshyPHP2015-04-023-10/+10
| | | | PHPBB3-11768
* [ticket/11768] Removed commentsJoshyPHP2015-04-021-3/+0
| | | | PHPBB3-11768
* [ticket/11768] Updated renderer annotationJoshyPHP2015-04-021-1/+1
| | | | PHPBB3-11768
* [ticket/11768] Replaced \phpbb\textformatter\parser with an interfaceJoshyPHP2015-04-022-22/+27
| | | | PHPBB3-11768
* [ticket/11768] Renamed get_words() to get_censored_words()JoshyPHP2015-04-022-2/+2
| | | | PHPBB3-11768
* [ticket/11768] Removed unused annotationsJoshyPHP2015-04-029-26/+0
| | | | PHPBB3-11768
* [ticket/11768] Updated censor to apply to XML valuesJoshyPHP2015-04-021-3/+4
| | | | PHPBB3-11768
* [ticket/11768] Fixed censored words being escaped twiceJoshyPHP2015-04-021-1/+2
| | | | PHPBB3-11768
* [ticket/11768] Added methods to access the library's parser/rendererJoshyPHP2015-04-022-0/+20
| | | | PHPBB3-11768
* [ticket/11768] Updated the cache dir to point to the current environmentJoshyPHP2015-04-021-1/+1
| | | | PHPBB3-11768
* [ticket/11768] Allowed text in places where text is not valid HTMLJoshyPHP2015-04-021-0/+3
| | | | PHPBB3-11768
* [ticket/11768] Replaced the Censor pluginJoshyPHP2015-04-023-23/+44
| | | | | | ...with something that is run at rendering time. PHPBB3-11768
* [ticket/11768] Added limited support for [url] in [quote] authorJoshyPHP2015-04-021-2/+21
| | | | PHPBB3-11768
* [ticket/11768] Updated s9e\TextFormatterJoshyPHP2015-04-021-4/+4
| | | | PHPBB3-11768
* [ticket/11768] Updated phpbb\textformatter\s9e\factory::regenerate()JoshyPHP2015-04-023-4/+4
| | | | | | | Returns an associative array rather than a numerically-indexed array. Feels cleaner and more extensible. PHPBB3-11768
* [ticket/11768] Added support for magic links that start with "www."JoshyPHP2015-04-022-5/+6
| | | | PHPBB3-11768
* [ticket/11768] Re-added the code that got lost in rebaseJoshyPHP2015-04-024-7/+10
| | | | PHPBB3-11768
* [ticket/11768] Removed unused use statementss9e2015-04-022-3/+0
| | | | PHPBB3-11768
* [ticket/11768] Updated constructors with explicit dependenciess9e2015-04-023-11/+11
| | | | | | | | | 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
* [ticket/11768] Reorganized code for readabilitys9e2015-04-021-2/+3
| | | | | | No functional change intended PHPBB3-11768
* [ticket/11768] Toggled Unicode modifier in relative URL filters9e2015-04-021-4/+2
| | | | | | get_preg_expression('relative_url') returns an expression that requires it PHPBB3-11768
* [ticket/11768] Updated annotations to pass sniffs9e2015-04-023-9/+9
| | | | PHPBB3-11768
* [ticket/11768] Restored blank line from develops9e2015-04-021-0/+1
| | | | PHPBB3-11768
* [ticket/11768] Updated s9e\TextFormatters9e2015-04-021-4/+4
| | | | PHPBB3-11768
* [ticket/11768] Updated composer.locks9e2015-04-021-22/+18
| | | | PHPBB3-11768
* [ticket/11768] This commit integrates s9e\TextFormatters9e2015-04-0219-146/+2003
| | | | | | | This commit integrates s9e\TextFormatter as outlined in http://area51.phpbb.com/phpBB/viewtopic.php?f=108&t=44467 PHPBB3-11768
* Merge branch '3.1.x'Andreas Fischer2015-04-021-4/+4
|\ | | | | | | | | * 3.1.x: [ticket/13736] Missing four colon in Contact us page
| * [ticket/13736] Missing four colon in Contact us pageRaphaƫl M2015-04-021-4/+4
| | | | | | | | | | | | Replacing of four ```:``` with four {L_COLON} in Contact us page. PHPBB3-13736
* | Merge pull request #3507 from VSEphpbb/ticket/13725Andreas Fischer2015-04-0221-34/+34
|\ \ | | | | | | | | | | | | | | | | | | [ticket/13725] Coding guidelines: static public * VSEphpbb/ticket/13725: [ticket/13725] Coding guidelines: static public
| * | [ticket/13725] Coding guidelines: static publicMatt Friedman2015-03-2721-34/+34
| | | | | | | | | | | | PHPBB3-13725
* | | Merge branch '3.1.x'Nicofuma2015-03-292-5/+10
|\ \ \ | | |/ | |/|
| * | Merge pull request #3376 from marc1706/ticket/13568-ascNicofuma2015-03-292-5/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | [ticket/13568] Validate imagick path as readable absolute path closes #3376
| | * \ Merge branch 'ticket/13568' into ticket/13568-ascMarc Alexander2015-02-062-5/+10
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/adm/index.php phpBB/includes/acp/acp_attachments.php
| | | * | [ticket/13568] Also check if absolute_path_writable is writableMarc Alexander2015-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13568
| | | * | [ticket/13568] Correctly check rpath and rwpath validation optionsMarc Alexander2015-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13568
| | | * | [ticket/13568] Use more descriptive validation names and merge with path blockMarc Alexander2015-02-022-40/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-13568
| | | * | [ticket/13568] Validate imagick path as readable absolute pathMarc Alexander2015-02-022-1/+37
| | | | | | | | | | | | | | | | | | | | PHPBB3-13568
* | | | | Merge branch '3.1.x'Andreas Fischer2015-03-261-3/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/13555] Render poll options separately when previewing.
| * | | | Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-03-261-3/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * 3.0.x: [ticket/13555] Render poll options separately when previewing.
| | * \ \ \ Merge pull request #3493 from prototech/ticket/13555Andreas Fischer2015-03-261-3/+7
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13555] Render poll options separately when previewing. * prototech/ticket/13555: [ticket/13555] Render poll options separately when previewing.
| | | * | | | [ticket/13555] Render poll options separately when previewing.JoshyPHP2015-03-191-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents an option from being split into two when a line break is present inside of it. PHPBB3-13555
* | | | | | | Merge branch '3.1.x'Oliver Schramm2015-03-251-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | [ticket/13723] Merge branch 'ticket/13723' into ticket/13723-31xNicofuma2015-03-251-1/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/docs/AUTHORS PHPBB3-13723
| | * | | | | [ticket/13723] Add Elsensee to authors listNicofuma2015-03-251-1/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-13723