aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | 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
| * | | | | | | | | | | | Merge pull request #3449 from prototech/ticket/13649Joas Schilling2015-02-262-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13649] Fix incorrect subforum tooltip title when unread.
| | * | | | | | | | | | | | [ticket/13649] Fix incorrect subforum tooltip title when unread.Cesar G2015-02-252-2/+2
| | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13649
* | | | | | | | | | | | | Merge branch '3.1.x'Joas Schilling2015-02-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/functions_mcp.php
| * | | | | | | | | | | | Merge pull request #3447 from brunoais/ticket/13143Joas Schilling2015-02-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13652] Added $phpbb_dispatcher from global to phpbb_mcp_sorting()
| | * | | | | | | | | | | | [ticket/13652] Added $phpbb_dispatcher from global to phpbb_mcp_sorting()brunoais2015-02-251-1/+1
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13652
* | | | | | | | | | | | | Merge branch '3.1.x'Joas Schilling2015-02-2615-392/+385
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #2992 from prototech/ticket/12599Joas Schilling2015-02-2615-392/+385
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12599] Update documentation style
| | * | | | | | | | | | | | [ticket/12599] Remove empty line at end of code boxes.Cesar G2015-02-252-200/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12599
| | * | | | | | | | | | | | [ticket/12599] Place standalone text in a box.Cesar G2015-02-257-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12599
| | * | | | | | | | | | | | [ticket/12599] Get the font sizes under control.Cesar G2015-02-251-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12599
| | * | | | | | | | | | | | [ticket/12599] Add padding on the sides of the inline code boxes.Cesar G2015-02-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12599
| | * | | | | | | | | | | | [ticket/12599] Use the back to top icon instead of text.Cesar G2015-02-252-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12599
| | * | | | | | | | | | | | [ticket/12599] Move images to assets/ and update the phpBB logo.Cesar G2015-02-2510-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12599
| | * | | | | | | | | | | | [ticket/12599] Move documentation stylesheet to assets directory.Cesar G2015-02-257-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12599
| | * | | | | | | | | | | | [ticket/12599] Remove corner images from documentation style.Cesar G2015-02-2511-164/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12599
* | | | | | | | | | | | | | Merge branch '3.1.x'Joas Schilling2015-02-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/memberlist_body.html
| * | | | | | | | | | | | | Merge pull request #3448 from prototech/ticket/13563Joas Schilling2015-02-261-7/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13563] Remove PM column from subsilver2's memberlist_body.html.
| | * | | | | | | | | | | | [ticket/13563] Remove PM column from subsilver2's memberlist_body.html.Cesar G2015-02-251-7/+5
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PM link was intentionally dropped due to excessive query requirements, thus the column is without purpose now. See PHPBB3-13229 PHPBB3-13563
* | | | | | | | | | | | | Merge pull request #3303 from Nicofuma/ticket/13513Marc Alexander2015-02-265-16/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13513] Use paths relative to the phpBB root in the router
| * | | | | | | | | | | | | [ticket/13513] Use paths relative to the phpBB root in the routerTristan Darricau2015-01-175-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13513
* | | | | | | | | | | | | | Merge branch '3.1.x'Joas Schilling2015-02-241-6/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #3381 from rxu/ticket/13591Joas Schilling2015-02-241-6/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13591] Add core events to the function obtain_users_online_string()
| | * | | | | | | | | | | | | [ticket/13591] Add core events to the function obtain_users_online_string()rxu2015-02-081-6/+52
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add functions.php core events to the function obtain_users_online_string() to allow extensions adding/modifying online users data. PHPBB3-13591
* | | | | | | | | | | | | | Merge branch '3.1.x'Joas Schilling2015-02-241-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #3436 from RMcGirr83/ticket/13650Joas Schilling2015-02-241-1/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13650] Validate ucp profile data changes