aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* 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 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 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
* | | | [ticket/13587] SQL syntax errors in get_prune_users()RMcGirr832015-02-241-2/+2
|/ / / | | | | | | | | | PHPBB3-13587
* | | 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 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 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
* | | | | | [ticket/13644] Always type hint dispatch_interfaceNicofuma2015-02-222-6/+6
| |_|/ / / |/| | | | | | | | | | | | | | PHPBB3-13644
* | | | | 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 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 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 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 'Wolfsblvt-ticket/13533' into 3.1.xJoas Schilling2015-02-203-3/+37
|\ \ \ \ \ \
| * | | | | | [ticket/13533] Add template core event to search resultsWolfsblvt2015-02-203-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13533
* | | | | | | Merge pull request #3277 from dhruvgoel92/ticket/13472Joas Schilling2015-02-201-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13472] Delete admin activation notification when deleting user
| * | | | | | | [ticket/13472] Delete admin activation notification when deleting userDhruv2015-01-111-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13472
* | | | | | | | [ticket/13640] Rearrange css in a better orderDragos-Valentin Radulescu2015-02-201-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13640
* | | | | | | | Merge pull request #3197 from brunoais/ticket/13142Joas Schilling2015-02-201-0/+22
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | [ticket/13142] Before query to list unapproved and deleted posts
| * | | | | | | [ticket/13142] BUMPed versionbrunoais2015-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13142
| * | | | | | | [ticket/13142] Fix typo: unaproved -> unapprovedbrunoais2014-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13142
| * | | | | | | [ticket/13142] BUMPing versionbrunoais2014-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13142
| * | | | | | | [ticket/13142] Adding core.mcp_sorting_unapproved_deleted_posts_query_beforebrunoais2014-11-281-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13142
* | | | | | | | Merge pull request #3417 from nickvergessen/ticket/13600Marc Alexander2015-02-181-2/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13600] Allow extensions to create a custom help page
| * | | | | | | | [ticket/13600] Allow extensions to create a custom help pageJoas Schilling2015-02-171-2/+24
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13600
* | | | | | | | Merge pull request #3395 from s9e/ticket/13595Marc Alexander2015-02-186-65/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13595] Remove unused instances of the bbcode class
| * | | | | | | | [ticket/13595] Removed unused codeJoshyPHP2015-02-136-65/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13595
* | | | | | | | | [ticket/13628] Allow ability for extension to add entries to user's profileRMcGirr832015-02-185-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13628
* | | | | | | | | Merge pull request #3414 from rxu/ticket/13433Marc Alexander2015-02-181-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13433] Fix parsing of email addresses
| * | | | | | | | | [ticket/13433] Fix parsing of email addressesrxu2015-02-171-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently email addresses are parsed incorrectly due to the regex structure. Namely, if localpart consists of several dot separated parts, only the last part with the trailing dot will be captured. The patch change this behavior to capture the whole localpart. PHPBB3-13433
* | | | | | | | | Merge pull request #3411 from Senky/ticket/13570Andreas Fischer2015-02-171-2/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13570] Mysqli extension supports persistent connection since PHP 5.3.0 * Senky/ticket/13570: [ticket/13570] Remove unnecessary ternary condition from mysqli driver
| * | | | | | | | [ticket/13570] Remove unnecessary ternary condition from mysqli driverJakub Senko2015-02-161-2/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13570
* | | | | | | | [ticket/13618] Fix typo in English FAQJakub Senko2015-02-161-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13618
* | | | | | | [ticket/13615] Correctly display images for gallery avatar in subsilver2kamijoutouma2015-02-151-3/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avatar Gallery shows categories but no images in subsilver2. The ID was not specified in the template. Also, the correct parent template loop is called avatar_local_row and not avatar_local_col. PHPBB3-13615
* | | | | | [ticket/13597] Modify variable-variable syntax to be compatible with PHP7Marc Alexander2015-02-117-14/+14
| |_|_|/ / |/| | | | | | | | | | | | | | PHPBB3-13597
* | | | | [ticket/13588] Fixes wrong message in info fsockopen() disabledCrizzo2015-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13588
* | | | | Merge branch 'ticket/13348-olympus' into ticket/13348Marc Alexander2015-02-031-5/+6
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: phpBB/feed.php
| * | | | [ticket/13348] Remove unnecessary global $cacheMarc Alexander2015-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $cache is not used in the method get_item(). PHPBB3-13348
| * | | | [ticket/13348] Use close method to free query result handleMarc Alexander2015-02-031-4/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-13348
| * | | | Merge branch 'prep-release-3.0.13' into develop-olympusAndreas Fischer2015-01-302-27/+37
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.13: [prep-release-3.0.13] Correct changelog link to 3.0.13 changes. [prep-release-3.0.13] Also update version in references to files. [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release. [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html. [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release. Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql