Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3568 from s9e/ticket/10268 | Andreas Fischer | 2015-05-07 | 2 | -0/+8 |
|\ | |||||
| * | [ticket/10268] Added regression test | JoshyPHP | 2015-04-29 | 2 | -0/+8 |
* | | Merge pull request #3573 from s9e/ticket/9073 | Andreas Fischer | 2015-05-07 | 3 | -0/+18 |
|\ \ | |||||
| * | | [ticket/9073] Added regression test | JoshyPHP | 2015-04-30 | 3 | -0/+18 |
| |/ | |||||
* | | Merge pull request #3571 from s9e/ticket/13425 | Andreas Fischer | 2015-05-07 | 3 | -0/+25 |
|\ \ | |||||
| * | | [ticket/13425] Added regression test | JoshyPHP | 2015-04-30 | 3 | -0/+25 |
| |/ | |||||
* | | Merge branch '3.1.x' | Marc Alexander | 2015-05-06 | 1 | -5/+72 |
|\ \ | |||||
| * \ | Merge pull request #3521 from rxu/ticket/13745 | Marc Alexander | 2015-05-06 | 1 | -5/+72 |
| |\ \ | |||||
| | * | | [ticket/13745] Add viewtopic.php core events to allow manipulating poll data | rxu | 2015-04-15 | 1 | -5/+72 |
* | | | | Merge branch '3.1.x' | Nicofuma | 2015-05-06 | 4 | -21/+203 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge pull request #3583 from nickvergessen/ticket/13807 | Nicofuma | 2015-05-06 | 4 | -21/+203 |
| |\ \ \ | |||||
| | * | | | [ticket/13807] Add version to the usage output | Joas Schilling | 2015-05-05 | 1 | -1/+1 |
| | * | | | [ticket/13807] Only output the header for diff | Joas Schilling | 2015-05-02 | 1 | -6/+7 |
| | * | | | [ticket/13807] Fix minor coding flaws | Joas Schilling | 2015-05-02 | 1 | -2/+3 |
| | * | | | [ticket/13807] Fix "changed version" to match our version numbering | Joas Schilling | 2015-05-02 | 1 | -1/+1 |
| | * | | | [ticket/13807] Add an option to generate a diff for the release highlights | Joas Schilling | 2015-05-02 | 3 | -14/+68 |
| | * | | | [ticket/13807] Allow filtering template events | Joas Schilling | 2015-05-02 | 1 | -1/+27 |
| | * | | | [ticket/13807] Allow filtering events by phpBB version | Joas Schilling | 2015-05-02 | 2 | -6/+106 |
* | | | | | Merge branch '3.1.x' | Andreas Fischer | 2015-05-06 | 2 | -0/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #3595 from marc1706/ticket/13819 | Andreas Fischer | 2015-05-06 | 2 | -0/+2 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/13819] Add missing sql_freeresult() to files in includes/ | Marc Alexander | 2015-05-05 | 2 | -0/+2 |
| |/ / / / | |||||
* | | | | | Merge pull request #3432 from Nicofuma/ticket/13638 | Joas Schilling | 2015-05-05 | 15 | -17/+120 |
|\ \ \ \ \ | |||||
| * | | | | | [ticket/13638] Inject $filesystem in \phpbb\template\asset | Nicofuma | 2015-05-05 | 15 | -16/+58 |
| * | | | | | [ticket/13638] Add tests | Nicofuma | 2015-05-04 | 1 | -0/+49 |
| * | | | | | [ticket/13638] Handle assets outside of phpbb_root_path | Nicofuma | 2015-05-04 | 1 | -3/+15 |
| * | | | | | [ticket/13638] Prepend the assets path phpbb root | Nicofuma | 2015-05-04 | 1 | -2/+2 |
|/ / / / / | |||||
* | | | | | Merge branch '3.1.x' | Nicofuma | 2015-05-04 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #3564 from VSEphpbb/ticket/13516 | Nicofuma | 2015-05-04 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/13516] Update image search script | Matt Friedman | 2015-05-04 | 1 | -1/+1 |
| | * | | | | [ticket/13516] Do not search ICC profiles in extension vendors | Matt Friedman | 2015-04-28 | 1 | -1/+1 |
* | | | | | | Merge pull request #3590 from rxu/ticket/13814 | Tristan Darricau | 2015-05-04 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | [ticket/13814] Prevent phpbb_is_writable() method from truncating files | rxu | 2015-05-04 | 1 | -1/+1 |
* | | | | | | | Merge pull request #3589 from marc1706/ticket/13782 | Tristan Darricau | 2015-05-04 | 16 | -25/+25 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | [ticket/13782] Rename null driver test to dummy driver test | Marc Alexander | 2015-05-04 | 1 | -1/+1 |
| * | | | | | | | [ticket/13782] Rename null log to dummy for PHP7 compatibility | Marc Alexander | 2015-05-04 | 3 | -4/+4 |
| * | | | | | | | [ticket/13782] Rename null driver to dummy for PHP7 compatibility | Marc Alexander | 2015-05-04 | 13 | -20/+20 |
* | | | | | | | | Merge branch '3.1.x' | Tristan Darricau | 2015-05-04 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge pull request #3562 from VSEphpbb/ticket/11521 | Tristan Darricau | 2015-05-04 | 1 | -0/+7 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | [ticket/11521] Add missing lang strings for migration exceptions | Matt Friedman | 2015-04-28 | 1 | -0/+7 |
| | | |/ / / / | | |/| | | | | |||||
* | | | | | | | Merge branch '3.1.x' | Nicofuma | 2015-05-03 | 3 | -24/+29 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge pull request #3588 from nickvergessen/ticket/13809-asc | Nicofuma | 2015-05-03 | 3 | -24/+29 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | [ticket/13809] Test each file individually | Joas Schilling | 2015-05-03 | 1 | -21/+28 |
| | * | | | | | | [ticket/13809] Perform the lint test prior to normal tests | Joas Schilling | 2015-05-03 | 2 | -3/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch '3.1.x' | Joas Schilling | 2015-05-03 | 3 | -2/+38 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch 'prep-release-3.1.4' into 3.1.x | Joas Schilling | 2015-05-03 | 3 | -2/+38 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | [prep-release-3.1.4] Add security issue to changelog | Joas Schilling | 2015-05-03 | 1 | -0/+4 |
| | * | | | | | | [prep-release-3.1.4] Add migration | Joas Schilling | 2015-05-03 | 1 | -0/+32 |
| | * | | | | | | [prep-release-3.1.4] Update version to 3.1.4 | Joas Schilling | 2015-05-03 | 3 | -4/+4 |
* | | | | | | | | Merge branch '3.1.x' | Andreas Fischer | 2015-05-03 | 3 | -1/+42 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge branch '3.0.x' into 3.1.x | Andreas Fischer | 2015-05-03 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ |