aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12466] Move classes from acp_database.php to their own filesMateBartus2015-02-2713-1660/+2350
| | | | | | | | | | | | * Moving classes from acp_database.php to phpbb/db/extractor namespace, also into separate files * Adding DocBlocks and property visibility to classes * Removing globals from code * Passing former globals to base_extractor's constructor * Adding DB extractor as a service, also implementing the extractor interface as well as the extractor factory. PHPBB3-12466
* 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
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3369 from marc1706/ticket/13577Joas Schilling2015-02-202-0/+20
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13577] Skip tests requiring fileinfo if not enabled
| | * | | | | [ticket/13577] Skip filespec test requiring mimetype check on windowsMarc Alexander2015-02-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13577
| | * | | | | [ticket/13577] Skip functional tests requiring fileinfo if not enabledMarc Alexander2015-02-041-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13577
* | | | | | | Merge branch '3.1.x'Joas Schilling2015-02-202-2/+29
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/search_results.html
| * | | | | | 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 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