Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4861 from v12mike/PHPBB3-15247 | Tristan Darricau | 2017-08-06 | 2 | -1/+69 |
|\ | |||||
| * | [PHPBB3-15247] Add support for php v7 APCu cache API | v12mike | 2017-06-26 | 2 | -1/+69 |
* | | Merge pull request #4864 from lavigor/ticket/15259 | Marc Alexander | 2017-07-16 | 1 | -0/+37 |
|\ \ | |||||
| * | | [ticket/15259] Fatal error on SQLite/Oracle database update | lavigor | 2017-07-06 | 1 | -0/+37 |
| |/ | |||||
* | | Merge pull request #4865 from JoshyPHP/ticket/15261 | Marc Alexander | 2017-07-16 | 3 | -0/+16 |
|\ \ | |||||
| * | | [ticket/15261] Fix censoring HTML tags | JoshyPHP | 2017-07-03 | 3 | -0/+16 |
| |/ | |||||
* | | [ticket/security/210] Fix tests for 3.2.x | Marc Alexander | 2017-07-16 | 1 | -2/+1 |
* | | Merge pull request #39 from phpbb/ticket/security/210-rhea | Marc Alexander | 2017-07-16 | 1 | -0/+55 |
|\ \ | |||||
| * \ | Merge branch 'ticket/security/210' into ticket/security/210-rhea | Marc Alexander | 2017-07-10 | 1 | -1/+4 |
| |\ \ | |||||
| | * | | [ticket/security/210] Adjust regex and add tests for IPv6 | Marc Alexander | 2017-07-10 | 1 | -1/+4 |
| * | | | Merge branch 'ticket/security/210' into ticket/security/210-rhea | Marc Alexander | 2017-07-09 | 1 | -0/+52 |
| |\ \ \ | | |/ / | | | / | | |/ | |/| | |||||
| | * | [ticket/security/210] Prevent using IP addresses or ports for remote avatar | Marc Alexander | 2017-07-09 | 1 | -0/+52 |
| | * | Merge pull request #4657 from marc1706/ticket/7336 | Tristan Darricau | 2017-04-28 | 1 | -7/+12 |
| | |\ | |||||
| | * \ | Merge pull request #4780 from marc1706/ticket/8116 | Tristan Darricau | 2017-04-21 | 2 | -0/+140 |
| | |\ \ | |||||
* | | \ \ | Merge pull request #35 from phpbb/ticket/security-203-rhea | Marc Alexander | 2017-07-16 | 1 | -31/+74 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Merge branch 'ticket/security-203' into ticket/security-203-rhea | Marc Alexander | 2016-12-28 | 1 | -31/+74 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/security-203] Do not add null values to versions info | Marc Alexander | 2016-12-27 | 1 | -1/+14 |
| | * | | | | [ticket/security-203] Fully validate version check data in version helper | Marc Alexander | 2016-12-26 | 1 | -34/+64 |
* | | | | | | Merge remote-tracking branch 'javiexin/ticket/15068' into 3.2.x | Marc Alexander | 2017-05-29 | 1 | -0/+31 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'ticket/15068' of https://github.com/javiexin/phpbb into ticket/... | javiexin | 2017-05-21 | 446 | -1978/+15035 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | [ticket/15068] Add template vars retrieval from the template object | javiexin | 2017-05-21 | 1 | -0/+31 |
* | | | | | | | | [ticket/15222] Fix a typo in generate_text_for_display_test.php | rxu | 2017-05-08 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'ticket/8116' into ticket/8116-rhea | Marc Alexander | 2017-04-19 | 2 | -0/+140 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | [ticket/8116] Add missing new line | Marc Alexander | 2017-04-19 | 1 | -1/+1 |
| * | | | | | | | [ticket/8116] Improve code and add tests for helper functions | Marc Alexander | 2017-03-29 | 2 | -0/+140 |
* | | | | | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2017-04-19 | 1 | -7/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge pull request #4657 from marc1706/ticket/7336 | Tristan Darricau | 2017-04-19 | 1 | -7/+12 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | [ticket/7336] Add tests for indexing first post after splitting topics | Marc Alexander | 2017-01-16 | 1 | -7/+12 |
* | | | | | | | | [ticket/15163] Escape curly braces in smilies HTML attributes | JoshyPHP | 2017-04-18 | 3 | -0/+25 |
* | | | | | | | | [ticket/14990] Move dispatcher object to the front of the options array | rxu | 2017-04-16 | 8 | -4/+9 |
* | | | | | | | | [ticket/14990] Fix event name, email parsing, installer and dispatcher calls | rxu | 2017-04-16 | 1 | -1/+2 |
* | | | | | | | | [ticket/14938] Add missing language class to extension manager mock | Marc Alexander | 2017-04-16 | 1 | -1/+4 |
* | | | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-04-16 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #4592 from javiexin/ticket/14938 | Marc Alexander | 2017-04-16 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | [ticket/14938] Inconsistency in ext_mgr all_available vs is_available | javiexin | 2017-02-10 | 1 | -0/+2 |
| | | |_|/ / / / | | |/| | | | | | |||||
* | | | | | | | | Merge pull request #4698 from javiexin/ticket/15087 | Marc Alexander | 2017-04-16 | 1 | -3/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | [ticket/15087] Optimize creation of metadata objects by caching | javiexin | 2017-02-12 | 1 | -3/+1 |
* | | | | | | | | | Merge pull request #4612 from javiexin/ticket/14950 | Marc Alexander | 2017-04-15 | 1 | -1/+50 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | [ticket/14950] Add possibility to delete a template block | javiexin | 2017-01-08 | 1 | -1/+1 |
| * | | | | | | | | | [ticket/14950] Add possibility to delete a template block | javiexin | 2017-01-08 | 1 | -1/+6 |
| * | | | | | | | | | [ticket/14950] Add possibility to delete a template block | javiexin | 2017-01-08 | 1 | -2/+2 |
| * | | | | | | | | | [ticket/14950] Add possibility to delete a template block | javiexin | 2017-01-07 | 1 | -0/+42 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | [ticket/15142] Merge branch 'ticket/15142' into 32x | Matt Friedman | 2017-04-10 | 1 | -0/+297 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | [ticket/15142] Add ext branch update tests | Matt Friedman | 2017-03-24 | 1 | -0/+292 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #4714 from vinny/ticket/14732 | Marc Alexander | 2017-03-08 | 1 | -5/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | [ticket/14732] Remove references from tests | Vinny | 2017-02-28 | 1 | -5/+0 |
* | | | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-02-23 | 1 | -2/+129 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #4605 from javiexin/ticket/14943 | Marc Alexander | 2017-02-23 | 1 | -2/+129 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | [ticket/14943] Fix template loop access by index | javiexin | 2017-01-07 | 1 | -0/+10 |
| | * | | | | | | | [ticket/14943] Fix template loop access by index | javiexin | 2017-01-07 | 1 | -2/+119 |
| | | |/ / / / / | | |/| | | | | |