aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Joas Schilling2015-02-201-1/+4
|\
| * 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
* | | Merge branch '3.1.x'Joas Schilling2015-02-201-6/+8
|\ \ \ | |/ /
| * | Merge branch 'ticket/13640' into 3.1.xJoas Schilling2015-02-201-6/+8
| |\ \
| | * | [ticket/13640] Rearrange css in a better orderDragos-Valentin Radulescu2015-02-201-6/+8
| |/ / | | | | | | | | | PHPBB3-13640
* | | Merge branch '3.1.x'Joas Schilling2015-02-201-0/+22
|\ \ \ | |/ /
| * | 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 branch '3.1.x'Andreas Fischer2015-02-191-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13634] Update links to travis build icons [ticket/13634] Update branch names on README
| * | | Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-02-191-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0.x: [ticket/13634] Update links to travis build icons [ticket/13634] Update branch names on README
| | * \ \ Merge pull request #3422 from VSEphpbb/ticket/13634-3.0.xAndreas Fischer2015-02-191-3/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13634] Update branch names on README * VSEphpbb/ticket/13634-3.0.x: [ticket/13634] Update links to travis build icons [ticket/13634] Update branch names on README
| | | * | | [ticket/13634] Update links to travis build iconsMatt Friedman2015-02-181-3/+3
| | | | | | | | | | | | | | | | | | PHPBB3-13634
| | | * | | [ticket/13634] Update branch names on READMEMatt Friedman2015-02-181-3/+3
| | |/ / / | | | | | | | | | | PHPBB3-13634
* | | | | Merge branch '3.1.x'Marc Alexander2015-02-181-2/+24
|\ \ \ \ \ | |/ / / /
| * | | | 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 branch '3.1.x'Marc Alexander2015-02-186-65/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-02-183-0/+32
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/ucp_profile_profile_info.html phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
| * | | | | | Merge pull request #3420 from marc1706/ticket/13628Marc Alexander2015-02-185-0/+40
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13628] Allow ability for extension to add entries to user's profile
| | * | | | | | [ticket/13628] Allow ability for extension to add entries to user's profileRMcGirr832015-02-185-0/+40
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13628
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-02-182-1/+223
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3414 from rxu/ticket/13433Marc Alexander2015-02-182-1/+223
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13433] Fix parsing of email addresses
| | * | | | | | [ticket/13433] Add make_clickable() test for emailsrxu2015-02-181-0/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13433
| | * | | | | | [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 branch '3.1.x'Andreas Fischer2015-02-171-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13570] Remove unnecessary ternary condition from mysqli driver
| * | | | | | | 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
* | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2015-02-171-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3412 from Senky/ticket/13618Marc Alexander2015-02-171-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | [ticket/13618] Small grammatical typo in the English FAQ
| | * | | | | [ticket/13618] Fix typo in English FAQJakub Senko2015-02-161-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-13618
* | | | | | Merge pull request #3401 from marc1706/ticket/13619Joas Schilling2015-02-161-0/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13619] Remove unneeded files and folders from vendor in release package
| * | | | | | [ticket/13619] Remove unneeded files and folders from vendor in release packageMarc Alexander2015-02-151-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13619
* | | | | | | Merge pull request #3394 from nickvergessen/ticket/10748-postgresqlMarc Alexander2015-02-156-282/+641
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10748][Part2] Split postgres DB tools into it's own class
| * | | | | | | [ticket/10748] Fix class type hintingJoas Schilling2015-02-152-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10748
| * | | | | | | [ticket/10748] Split postgres DB tools into it's own classJoas Schilling2015-02-134-277/+637
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-10748
* | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2015-02-150-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | Conflicts: phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
| * | | | | Merge pull request #3403 from marc1706/ticket/13615Marc Alexander2015-02-151-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13615] Correctly display images for gallery avatar in subsilver2
| | * | | | | [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
* | | | | | Merge pull request #3285 from MGaetan89/ticket/13497Marc Alexander2015-02-133-15/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13497] Change get_tables() calls with $db_tools->sql_list_tables()
| * | | | | | [ticket/13497] Update calls to `get_tables()`Gaëtan Muller2015-02-113-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13497
* | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2015-02-130-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Merge branch 'develop-olympus' into develop-ascraeusMarc Alexander2015-02-130-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | | | | | | Conflicts: .travis.yml travis/phpunit-mysqli-travis.xml
| | * | | Merge pull request #3393 from bantu/ticket/13599Marc Alexander2015-02-133-70/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | [ticket/13599] Remove Travis CI PHP 5.2 environment. No longer supported.
| | | * | | [ticket/13599] Remove Travis CI PHP 5.2 environment. No longer supported.Andreas Fischer2015-02-123-70/+2
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-13599
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-19 14:37:35 +0000