aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/13132] Twig: Add loops content to the root contextTristan Darricau2015-03-0518-3/+335
| | | | PHPBB3-13132
* Merge branch '3.1.x'Andreas Fischer2015-03-051-1/+1
|\ | | | | | | | | * 3.1.x: [ticket/13670] Modify variable-variable syntax in common avatar test for PHP7
| * Merge pull request #3466 from marc1706/ticket/13670Andreas Fischer2015-03-051-1/+1
| |\ | | | | | | | | | | | | | | | | | | [ticket/13670] Modify variable-variable syntax in common avatar test for PHP/ * marc1706/ticket/13670: [ticket/13670] Modify variable-variable syntax in common avatar test for PHP7
| | * [ticket/13670] Modify variable-variable syntax in common avatar test for PHP7Marc Alexander2015-03-051-1/+1
| | | | | | | | | | | | PHPBB3-13670
* | | Merge branch '3.1.x'Cesar G2015-03-051-0/+1
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/13667] Fix buttons alignment in Chrome for Windows
| * | Merge remote-tracking branch 'cyberalien/ticket/13667' into 3.1.xCesar G2015-03-051-0/+1
| |\ \ | | | | | | | | | | | | | | | | * cyberalien/ticket/13667: [ticket/13667] Fix buttons alignment in Chrome for Windows
| | * | [ticket/13667] Fix buttons alignment in Chrome for Windowscyberalien2015-03-031-0/+1
| | | | | | | | | | | | | | | | PHPBB3-13667
* | | | Merge branch '3.1.x'Marc Alexander2015-03-051-0/+14
|\ \ \ \ | |/ / /
| * | | Merge pull request #3453 from RMcGirr83/ticket/13477Marc Alexander2015-03-051-0/+14
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13477] Update file cache driver for extension paths
| | * | | [ticket/13477] rename function and fix doc blocksRMcGirr832015-03-041-7/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-13477
| | * | | [ticket/13477] Update file cache driver for filenamesRMcGirr832015-03-031-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace slashes on file name PHPBB3-13477
* | | | | Merge branch '3.1.x'Marc Alexander2015-03-051-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3413 from kasimi/ticket/13540Marc Alexander2015-03-051-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13540] Add topic info and total posts count to mcp_topic_review_modify_row event
| | * | | | [ticket/13540] Add total post count to mcp_topic_review_modify_row eventkasimi2015-02-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13540
| | * | | | [ticket/13540] Add topic_info to mcp_topic_review_modify_row eventkasimi2015-02-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13540
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-03-051-0/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13657] Run travis builds on PHP 7.0
| * | | | | Merge pull request #3465 from marc1706/ticket/13657Andreas Fischer2015-03-051-0/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13657] Run travis builds on PHP 7.0 * marc1706/ticket/13657: [ticket/13657] Run travis builds on PHP 7.0
| | * | | | [ticket/13657] Run travis builds on PHP 7.0Marc Alexander2015-03-051-0/+3
| | | |_|/ | | |/| | | | | | | | | | | | PHPBB3-13657
* | | | | Merge pull request #3434 from nickvergessen/ticket/13647Marc Alexander2015-03-0513-96/+217
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13647] Move FAQ page to a controller
| * | | | | [ticket/13647] Use the Symfony way for redirectingJoas Schilling2015-02-272-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13647
| * | | | | [ticket/13647] Switch FAQ handling in view online to controllerJoas Schilling2015-02-221-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13647
| * | | | | [ticket/13647] Generate route links for faqJoas Schilling2015-02-226-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13647
| * | | | | [ticket/13647] Send 301 statusJoas Schilling2015-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13647
| * | | | | [ticket/13647] Move FAQ page to a controllerJoas Schilling2015-02-226-86/+182
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13647
* | | | | | Merge branch '3.1.x'Marc Alexander2015-03-054-19/+21
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html phpBB/styles/subsilver2/theme/stylesheet.css
| * | | | | Merge pull request #3454 from RMcGirr83/ticket/13590Marc Alexander2015-03-056-22/+28
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | [ticket/13590] Headers of remember me login keys are not centered
| | * | | | [ticket/13590] Headers of remember me login keys are not centeredRMcGirr832015-03-046-22/+28
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Corrected a few other files as well PHPBB3-13590
* | | | | Merge branch '3.1.x'Joas Schilling2015-02-271-1/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: phpBB/phpbb/session.php
| * | | | Merge branch '3.0.x' into 3.1.xJoas Schilling2015-02-270-0/+0
| |\ \ \ \
| | * \ \ \ Merge pull request #3443 from naderman/ticket/13617Joas Schilling2015-02-271-1/+3
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13617] Enforce column size limit for session_forum_id
| * | \ \ \ \ Merge pull request #3444 from naderman/ticket/13617-ascraeusJoas Schilling2015-02-271-1/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13617] Enforce column size limit for session_forum_id
| | * | | | | | [ticket/13617] Document magic number for forum_idNils Adermann2015-02-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13617
| | * | | | | | [ticket/13617] Use request->variable instead of request_varNils Adermann2015-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13617
| | * | | | | | Merge branch 'ticket/13617' into ticket/13617-ascraeusNils Adermann2015-02-251-1/+4
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| / / / | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * ticket/13617: [ticket/13617] Enforce column size limit for session_forum_id Conflicts: phpBB/phpbb/session.php
| | | * | | | [ticket/13617] Enforce column size limit for session_forum_idNils Adermann2015-02-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13617
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-02-272-1/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/viewtopic_body.html
| * | | | | | Merge pull request #3451 from RMcGirr83/ticket/13510Marc Alexander2015-02-273-2/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13510] Add template even viewtopic_body_pagination_after
| | * | | | | | [ticket/13510] Add template even viewtopic_body_pagination_afterRMcGirr832015-02-263-2/+10
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13510
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-02-271-0/+22
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3388 from rxu/ticket/13596Marc Alexander2015-02-271-0/+22
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13596] Add display_forums() event to allow modifying forums list data
| | * | | | | | [ticket/13596] Add display_forums() event to allow modifying forums list datarxu2015-02-101-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add display_forums() core event in includes/functions_display.php to allow modifying forums list data before the list is being generated and dumped to the template. PHPBB3-13596
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-02-271-2/+33
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3384 from brunoais/ticket/13592Marc Alexander2015-02-271-2/+33
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13592] Allow changing get_visibility_sql's result
| | * | | | | | | [ticket/13592] The name didn't make proper sensebrunoais2015-02-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13592
| | * | | | | | | [ticket/13592] Empty line before event comment block.brunoais2015-02-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I had forgotten this one PHPBB3-13592
| | * | | | | | | [ticket/13592] Removed unwanted space in self line.brunoais2015-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13592
| | * | | | | | | [ticket/13592] Allow full override of get_visibility_sql()brunoais2015-02-091-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13592
| | * | | | | | | [ticket/13592] Allow changing get_visibility_sql's resultbrunoais2015-02-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13592
| | * | | | | | | [ticket/13592] Allow changing get_visibility_sql's resultbrunoais2015-02-081-2/+22
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13592
* | | | | | | | Merge branch '3.1.x'Joas Schilling2015-02-261-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/forumlist_body.html
generated by cgit v1.2.1 (git 2.21.0) at 2024-09-27 07:27:45 +0000