aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | | | [ticket/13650] Validate ucp profile data changesRichard McGirr2015-02-231-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13650
* | | | | | Merge branch '3.1.x'Joas Schilling2015-02-241-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3439 from RMcGirr83/ticket/13587Joas Schilling2015-02-241-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | [ticket/13587] SQL syntax errors in get_prune_users()
| | * | | | [ticket/13587] SQL syntax errors in get_prune_users()RMcGirr832015-02-241-2/+2
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13587
* | | | | Merge branch '3.1.x'Andreas Fischer2015-02-221-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
| * | | | Merge pull request #3433 from Nicofuma/ticket/13643Andreas Fischer2015-02-221-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13643] Change the priority of kernel_terminate_subscriber to -10000 * Nicofuma/ticket/13643: [ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
| | * | | | [ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MINNicofuma2015-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP_INT_MIN isn't a defined constant but it can be calculed by ~PHP_INT_MAX (two's complement of PHP_INT_MAX) PHPBB3-13643
* | | | | | Merge branch '3.1.x'Joas Schilling2015-02-221-1/+41
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3415 from RMcGirr83/ticket/13578Joas Schilling2015-02-221-1/+41
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13578] Add ucp_register.php core events
| | * | | | | [ticket/13578] Add ucp_register.php core eventsRMcGirr832015-02-221-1/+41
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | PHPBB3-13578
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-02-221-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
| * | | | | Merge pull request #3427 from prototech/ticket/13551Andreas Fischer2015-02-221-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN * prototech/ticket/13551: [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
| | * | | | | [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DNCesar G2015-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13551
* | | | | | | Merge branch '3.1.x'Andreas Fischer2015-02-222-6/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13644] Always type hint dispatch_interface
| * | | | | | Merge pull request #3431 from Nicofuma/ticket/13644Andreas Fischer2015-02-222-6/+6
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13644] Always type hint dispatch_interface * Nicofuma/ticket/13644: [ticket/13644] Always type hint dispatch_interface
| | * | | | | [ticket/13644] Always type hint dispatch_interfaceNicofuma2015-02-222-6/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-13644
* | | | | | Merge branch '3.1.x'Joas Schilling2015-02-201-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3418 from brunoais/ticket/13631Joas Schilling2015-02-201-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13631] Fix wrong variable in get_global_visibility_sql()'s event
| | * | | | | [ticket/13631] Better, more explicit comment explanationbrunoais2015-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13631
| | * | | | | [ticket/13631] Fix wrong variable in get_global_visibility_sql()'s eventbrunoais2015-02-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't get this... I was positive I, at some point, had it right... I don't get what happened... PHPBB3-13631
* | | | | | | Merge branch '3.1.x'Joas Schilling2015-02-201-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3423 from RMcGirr83/ticket/13635Joas Schilling2015-02-201-1/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13635] Add sql_ary to ucp profile event
| | * | | | | | [ticket/13635] Add sql_ary to ucp profile eventRMcGirr832015-02-191-1/+2
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-13635
* | | | | | | Merge branch '3.1.x'Joas Schilling2015-02-201-1/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3425 from dragosvr92/patch-4Joas Schilling2015-02-201-1/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update colours.css
| | * | | | | | [ticket/13639] Update colours.cssDragos-Valentin Radulescu2015-02-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rule is a left over from development. it should be removed from colours.css .icon-search-advanced { background-image: url("./images/icon_search_adv.gif");} Area21 ticket: https://area51.phpbb.com/phpBB/viewtopic.php?f=81&p=275166 PHPBB3-13639
* | | | | | | | Merge branch '3.1.x'Joas Schilling2015-02-202-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3380 from n-aleha/ticket/13586Joas Schilling2015-02-202-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13586] Allow '0' as username with Jabber notifications
| | * | | | | | | [ticket/13586] Allow '0' as username with Jabber notificationsn-aleha2015-02-072-2/+2
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | PHPBB3-13586
* | | | | | | | Merge branch '3.1.x'Joas Schilling2015-02-202-0/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / /