| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '3.1.x' | Marc Alexander | 2015-05-22 | 1 | -5/+3 |
| |\ | | | | | | | | | Conflicts: phpBB/phpbb/db/migration/data/v310/style_update_p1.php | ||||
| | * | Merge pull request #3624 from VSEphpbb/ticket/13861 | Marc Alexander | 2015-05-22 | 1 | -3/+3 |
| | |\ | | | | | | | | | | [ticket/13861] Fix undefined variables in style update migration | ||||
| | | * | [ticket/13861] Fix undefined variables in style update migration | Matt Friedman | 2015-05-21 | 1 | -3/+3 |
| | | | | | | | | | | | | | PHPBB3-13861 | ||||
| * | | | Merge pull request #3608 from Nicofuma/ticket/13829 | Marc Alexander | 2015-05-20 | 1 | -22/+37 |
| |\ \ \ | | | | | | | | | | | | | [ticket/13829] Don't fail if the cache isn't writeable | ||||
| | * | | | [ticket/13829] Don't fail if the cache isn't writeable | Nicofuma | 2015-05-14 | 1 | -22/+37 |
| | | | | | | | | | | | | | | | | | PHPBB3-13829 | ||||
| * | | | | Merge pull request #3621 from Nicofuma/ticket/13849 | Marc Alexander | 2015-05-20 | 1 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | | | | | | [ticket/13849] Fix development environment | ||||
| | * | | | | [ticket/13849] Fix development environment | Nicofuma | 2015-05-19 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13849 | ||||
| * | | | | | Merge pull request #3586 from s9e/ticket/13680 | Nicofuma | 2015-05-20 | 3 | -12/+52 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/13680] Updated quote notifications | ||||
| | * | | | | | [ticket/13680] Renamed get_quote_authors to get_outermost_quote_authors | JoshyPHP | 2015-05-15 | 3 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13680 | ||||
| | * | | | | | [ticket/13680] Updated quote notifications | JoshyPHP | 2015-05-15 | 3 | -12/+52 |
| | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added get_quote_authors() to text_formatter.utils service to retrieve the names used in first-level quotes PHPBB3-13680 | ||||
| * | | | | | [ticket/13801] Updated event description [ci skip] | JoshyPHP | 2015-05-18 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13801 | ||||
| * | | | | | [ticket/13801] Updated comments for clarity | JoshyPHP | 2015-05-18 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13801 | ||||
| * | | | | | [ticket/13801] Removed user dependency from text_formatter.s9e.parser | JoshyPHP | 2015-05-18 | 1 | -19/+8 |
| | |/ / / |/| | | | | | | | | | | | PHPBB3-13801 | ||||
| * | | | | Merge branch '3.1.x' | Nicofuma | 2015-05-17 | 1 | -3/+23 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | Merge pull request #3601 from nickvergessen/ticket/13827 | Nicofuma | 2015-05-17 | 1 | -3/+23 |
| | |\ \ \ | | | | | | | | | | | | | | | | [ticket/13827] Correctly return JSON instead of HTML when valled from AJAX | ||||
| | | * | | | [ticket/13827] Use JsonResponse instead of our hacky json_response with exit() | Joas Schilling | 2015-05-14 | 1 | -8/+11 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13827 | ||||
| | | * | | | [ticket/13827] Correctly return JSON instead of HTML when valled from AJAX | Joas Schilling | 2015-05-09 | 1 | -3/+20 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13827 | ||||
| * | | | | | 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 |
| | | |_|/ | |/| | | | | | | | | | | PHPBB3-13838 | ||||
| * | | | | 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 | ||||
| | * | | | | [ticket/12632] Add twig.debug and twig.auto_reload in config.yml | Tristan Darricau | 2015-05-04 | 3 | -1/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13206 PHPBB3-12632 | ||||
| * | | | | | Merge pull request #3581 from MateBartus/ticket/13804 | Nicofuma | 2015-05-14 | 2 | -3/+38 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/13804] Make template's user dependency optional | ||||
| | * | | | | | [ticket/13804] Remove unnecessary array_merge | MateBartus | 2015-05-11 | 1 | -6/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13804 | ||||
| | * | | | | | [ticket/13804] Make template's user dependency optional | MateBartus | 2015-05-05 | 2 | -3/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13804 | ||||
| * | | | | | | Merge pull request #3577 from MateBartus/ticket/13800 | Nicofuma | 2015-05-14 | 1 | -7/+10 |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | [ticket/13800] Make router's extension manager dependency optional | ||||
| | * | | | | | [ticket/13800] Make router's extension manager dependency optional | MateBartus | 2015-05-02 | 1 | -7/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13800 | ||||
| * | | | | | | 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 | ||||
| | | * | | | | | [ticket/13822] Correctly display softdelete and post detail perms | Matt Friedman | 2015-05-07 | 1 | -1/+2 |
| | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | PHPBB3-13822 | ||||
| * | | | | | | 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 Allow building changesets for the event list | ||||
| | | * | | | | [ticket/13807] Fix minor coding flaws | Joas Schilling | 2015-05-02 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807 | ||||
| | | * | | | | [ticket/13807] Add an option to generate a diff for the release highlights | Joas Schilling | 2015-05-02 | 2 | -5/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807 | ||||
| | | * | | | | [ticket/13807] Allow filtering template events | Joas Schilling | 2015-05-02 | 1 | -1/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807 | ||||
| | | * | | | | [ticket/13807] Allow filtering events by phpBB version | Joas Schilling | 2015-05-02 | 1 | -4/+101 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807 | ||||
| * | | | | | | Merge branch '3.1.x' | Andreas Fischer | 2015-05-06 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13819] Add missing sql_freeresult() to files in includes/ Conflicts: phpBB/includes/acp/acp_database.php | ||||
| * | | | | | [ticket/13638] Inject $filesystem in \phpbb\template\asset | Nicofuma | 2015-05-05 | 3 | -9/+29 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13638 | ||||
| * | | | | | [ticket/13638] Handle assets outside of phpbb_root_path | Nicofuma | 2015-05-04 | 1 | -3/+15 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13638 | ||||
| * | | | | | [ticket/13638] Prepend the assets path phpbb root | Nicofuma | 2015-05-04 | 1 | -2/+2 |
| | |_|_|/ |/| | | | | | | | | | | | PHPBB3-13638 | ||||
| * | | | | 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 | ||||
| | * | | | | [ticket/13814] Prevent phpbb_is_writable() method from truncating files | rxu | 2015-05-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phpbb_is_writable() of filesystem class uses 'w' mode to fopen files which causes checked files to be truncated. Use the 'c' mode instead. PHPBB3-13814 | ||||
| * | | | | | [ticket/13782] Rename null log to dummy for PHP7 compatibility | Marc Alexander | 2015-05-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13782 | ||||
| * | | | | | [ticket/13782] Rename null driver to dummy for PHP7 compatibility | Marc Alexander | 2015-05-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13782 | ||||
| * | | | | | Merge branch '3.1.x' | Joas Schilling | 2015-05-03 | 1 | -0/+32 |
| |\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: build/build.xml | ||||
| | * | | | | Merge branch 'prep-release-3.1.4' into 3.1.x | Joas Schilling | 2015-05-03 | 1 | -0/+32 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql | ||||
| | | * | | | | [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 |
| |\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | | | | | | * 3.1.x: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release. | ||||
| | * | | | | Merge branch 'prep-release-3.1.4' into 3.1.x | Andreas Fischer | 2015-05-03 | 1 | -0/+37 |
| | |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | * prep-release-3.1.4: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release. Conflicts: build/build.xml | ||||
| | | * | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4 | Andreas Fischer | 2015-05-03 | 1 | -0/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.14: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release. Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql | ||||
| * | | | | [ticket/13762] Replace user service with lang in twig extension | MateBartus | 2015-05-02 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | PHPBB3-13762 | ||||
 |
index : forums | |
| The forums.mageia.org Website | Maat [maat] |
| aboutsummaryrefslogtreecommitdiffstats |