Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '3.1.x' | Joas Schilling | 2015-05-16 | 6 | -9/+19 |
|\ | |||||
| * | [ticket/13838] Fix coding style | Nicofuma | 2015-05-14 | 6 | -9/+19 |
* | | Merge pull request #3591 from Nicofuma/ticket/12632 | Oliver Schramm | 2015-05-16 | 3 | -1/+17 |
|\ \ | |||||
| * | | [ticket/12632] Add twig.debug and twig.auto_reload in config.yml | Tristan Darricau | 2015-05-04 | 3 | -1/+17 |
* | | | Merge pull request #3581 from MateBartus/ticket/13804 | Nicofuma | 2015-05-14 | 2 | -3/+38 |
|\ \ \ | |||||
| * | | | [ticket/13804] Remove unnecessary array_merge | MateBartus | 2015-05-11 | 1 | -6/+1 |
| * | | | [ticket/13804] Make template's user dependency optional | MateBartus | 2015-05-05 | 2 | -3/+43 |
* | | | | Merge pull request #3577 from MateBartus/ticket/13800 | Nicofuma | 2015-05-14 | 1 | -7/+10 |
|\ \ \ \ | |||||
| * | | | | [ticket/13800] Make router's extension manager dependency optional | MateBartus | 2015-05-02 | 1 | -7/+10 |
* | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-05-08 | 1 | -1/+2 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge pull request #3598 from VSEphpbb/ticket/13822 | Marc Alexander | 2015-05-08 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/13822] Correctly display softdelete and post detail perms | Matt Friedman | 2015-05-07 | 1 | -1/+2 |
* | | | | | | Merge branch '3.1.x' | Nicofuma | 2015-05-06 | 2 | -10/+159 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge pull request #3583 from nickvergessen/ticket/13807 | Nicofuma | 2015-05-06 | 2 | -10/+159 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | [ticket/13807] Fix minor coding flaws | Joas Schilling | 2015-05-02 | 1 | -2/+3 |
| | * | | | | [ticket/13807] Add an option to generate a diff for the release highlights | Joas Schilling | 2015-05-02 | 2 | -5/+30 |
| | * | | | | [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 | 1 | -4/+101 |
* | | | | | | Merge branch '3.1.x' | Andreas Fischer | 2015-05-06 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | |||||
* | | | | | [ticket/13638] Inject $filesystem in \phpbb\template\asset | Nicofuma | 2015-05-05 | 3 | -9/+29 |
* | | | | | [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 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 |
* | | | | | [ticket/13782] Rename null log to dummy for PHP7 compatibility | Marc Alexander | 2015-05-04 | 1 | -2/+2 |
* | | | | | [ticket/13782] Rename null driver to dummy for PHP7 compatibility | Marc Alexander | 2015-05-04 | 1 | -2/+2 |
* | | | | | Merge branch '3.1.x' | Joas Schilling | 2015-05-03 | 1 | -0/+32 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge branch 'prep-release-3.1.4' into 3.1.x | Joas Schilling | 2015-05-03 | 1 | -0/+32 |
| |\ \ \ \ | |||||
| | * | | | | [prep-release-3.1.4] Add migration | Joas Schilling | 2015-05-03 | 1 | -0/+32 |
* | | | | | | Merge branch '3.1.x' | Andreas Fischer | 2015-05-03 | 1 | -0/+37 |
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | |||||
| * | | | | Merge branch 'prep-release-3.1.4' into 3.1.x | Andreas Fischer | 2015-05-03 | 1 | -0/+37 |
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | |||||
| | * | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4 | Andreas Fischer | 2015-05-03 | 1 | -0/+37 |
* | | | | [ticket/13762] Replace user service with lang in twig extension | MateBartus | 2015-05-02 | 1 | -6/+6 |
* | | | | [ticket/13762] Optional DI injectable default language module array | MateBartus | 2015-05-02 | 1 | -5/+14 |
* | | | | [ticket/13762] Moving language related functionality into a separate class | MateBartus | 2015-05-02 | 8 | -234/+1015 |
* | | | | [ticket/13793] Remove translation on throwing exceptions | MateBartus | 2015-05-01 | 7 | -47/+20 |
* | | | | Merge branch '3.1.x' | Joas Schilling | 2015-04-29 | 1 | -0/+32 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'prep-release-3.1.4' into 3.1.x | Joas Schilling | 2015-04-29 | 1 | -0/+32 |
| |\ \ \ | | |/ / | |||||
| | * | | [prep-release-3.1.4] Increase version number to 3.1.4-RC2 | Joas Schilling | 2015-04-29 | 1 | -0/+32 |
* | | | | Merge branch '3.1.x' | Andreas Fischer | 2015-04-28 | 1 | -0/+37 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | Merge branch 'prep-release-3.1.4' into 3.1.x | Andreas Fischer | 2015-04-28 | 1 | -0/+37 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4 | Andreas Fischer | 2015-04-28 | 1 | -0/+37 |
* | | | [ticket/8672] Remove outdated imagesize class | Marc Alexander | 2015-04-24 | 1 | -549/+0 |
* | | | [ticket/8672] Use fastImageSize in classes | Marc Alexander | 2015-04-24 | 5 | -8/+8 |
* | | | [ticket/8672] Updated the text_formatter.s9e service | JoshyPHP | 2015-04-24 | 1 | -9/+5 |
* | | | [ticket/8672] Add class for retrieving imagesize without download | Marc Alexander | 2015-04-24 | 5 | -28/+581 |
* | | | Merge branch '3.1.x' | Andreas Fischer | 2015-04-22 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | [ticket/13772] Fix typo in phpbb\passwords\manager::__construct() | brunoais | 2015-04-21 | 1 | -1/+1 |
* | | | [ticket/13768] Fix deprecations | Tristan Darricau | 2015-04-19 | 2 | -3/+3 |
* | | | Merge pull request #3539 from MateBartus/ticket/13766 | Tristan Darricau | 2015-04-17 | 1 | -1/+1 |
|\ \ \ |