aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #4375 from bantu/ticket/14692Marc Alexander2016-07-061-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14692] Remove duplicate subexpression in questionnaire.php
| * | | | | [ticket/14692] Remove duplicate subexpression in questionnaire.phpkilida2016-07-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subexpression `($ip_address_ary[0] == '192' && $ip_address_ary[1] == '168')` was repeated. PHPBB3-14692
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-061-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge pull request #4354 from Stanzilla/smtp_explainMarc Alexander2016-07-061-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | [ticket/14184] Add a _EXPLAIN translation entry for the SMTP server option
| | * | | [ticket/14184] Add a _EXPLAIN translation entry for the SMTP server optionBenjamin Staneck2016-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should help users trying to figure out why their mail config is not working when they forgot to use a protocol prefix. PHPBB3-14184
* | | | | [Release 3.2.0-RC1] Update version to 3.2.0-RC2-devTristan Darricau2016-06-271-1/+1
| | | | |
* | | | | Merge remote-tracking branch 'upstream/prep-release-3.2.0-RC1' into 3.2.xTristan Darricau2016-06-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/prep-release-3.2.0-RC1: [prep-release-3.2.0-RC1] Update changelog [prep-release-3.2.0-RC1] Add migration [prep-release-3.2.0-RC1] Update schema.json [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1
| * | | | | [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1Tristan Darricau2016-06-191-1/+1
| | | | | |
* | | | | | [ticket/14690] Create email queue cache file in the current env cache folderrxu2016-06-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14690
* | | | | | [ticket/14660] Remove redundant empty line in ucp_profile.phprxu2016-06-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14660
* | | | | | Merge pull request #4357 from rxu/ticket/14660Marc Alexander2016-06-192-13/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14660] Fix parsing board email messages through template engine.
| * | | | | | [ticket/14660] Fix parsing board email messages through template engine.rxu2016-06-182-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14660
* | | | | | | Merge pull request #4356 from markshawtoronto/ticket/14680Marc Alexander2016-06-191-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14680] Fix wrong function name being checked in mcp_queue.
| * | | | | | | [ticket/14680] Fix wrong function name being checked in mcp_queue.Mark Shaw2016-06-171-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-14680
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-192-0/+18
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Conflicts: phpBB/language/en/install.php
| * | | | | | Merge pull request #4281 from rmcgirr83/ticket_13716Marc Alexander2016-06-192-0/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13716] Check phpBB version against config version
| | * | | | | | [ticket/13716] Fix verbosenessRichard McGirr2016-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13716
| | * | | | | | [ticket/13716] Remove extraneous blank lineRMcGirr832016-04-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13716
| | * | | | | | [ticket/13716] Check phpBB version against config versionRichard McGirr2016-04-052-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display a warning in the ACP if the version constant (files) does not match the phpbb_config version (often indicating that the database updates hasn't been run) PHPBB3-13716
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-191-0/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/ucp/ucp_profile.php
| * | | | | | | Merge pull request #4331 from Senky/ticket/13978Marc Alexander2016-06-191-0/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13978] Add core.ucp_profile_modify_signature_sql_ary
| | * | | | | | | [ticket/13978] Add core.ucp_profile_modify_signature_sql_aryJakub Senko2016-05-241-0/+10
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | PHPBB3-13978
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-191-0/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge pull request #4329 from Senky/ticket/14429Marc Alexander2016-06-191-0/+24
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14429] Add core.obtain_users_online_string_before_modify
| | * | | | | | [ticket/14429] Add core.modify_users_online_string_modifyJakub Senko2016-05-271-0/+24
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-14429
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-191-0/+28
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | Conflicts: phpBB/includes/ucp/ucp_pm_compose.php
| * | | | | Merge pull request #4316 from rmcgirr83/ticket_14630Marc Alexander2016-06-191-0/+28
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | [ticket/14630] Add event to modify pm message
| | * | | | [ticket/14630] Rename core eventRichard McGirr2016-06-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14630
| | * | | | [ticket/14630] Change event name and fix capitalizationRichard McGirr2016-05-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14630
| | * | | | [ticket/14630] Add event to modify pm messageRichard McGirr2016-05-061-0/+28
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-14630 PHPBB3-14630
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-131-5/+24
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/14626] Event core.make_jumpbox_modify_tpl_aryTobi Schäfer2016-06-131-4/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14626
| * | | | [ticket/14626] Event core.make_jumpbox_modify_tpl_aryTobi Schäfer2016-06-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-14626 PHPBB3-14626
| * | | | [ticket/14626] Event core.make_jumpbox_modify_tpl_aryTobi Schäfer2016-06-131-5/+26
| | | | | | | | | | | | | | | | | | | | PHPBB3-14626
* | | | | Merge branch '3.1.x' into 3.2.xAndreas Fischer2016-06-111-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/14291] Do not update filesize if displaying thumbnail
| * | | | [ticket/14291] Do not update filesize if displaying thumbnailMarc Alexander2016-05-301-1/+1
| | |/ / | |/| | | | | | | | | | PHPBB3-14291
* | | | [ticket/14649] Add preview variable back to ucp_profile for eventRichard McGirr2016-05-261-1/+3
| | | | | | | | | | | | | | | | PHPBB3-14649
* | | | [ticket/14624] Remove no longer existing event argumemtMarc Alexander2016-05-161-1/+0
| | | | | | | | | | | | | | | | PHPBB3-14624
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-05-151-0/+26
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/includes/ucp/ucp_profile.php
| * | | [ticket/14624] Remove whitespaceRichard McGirr2016-05-051-2/+2
| | | | | | | | | | | | | | | | PHPBB3-14624
| * | | [ticket/14624] Fix typo and phpBB versionRichard McGirr2016-05-051-2/+2
| | | | | | | | | | | | | | | | PHPBB3-14624
| * | | [ticket/14624] Move event so it actually worksRichard McGirr2016-05-051-13/+13
| | | | | | | | | | | | | | | | PHPBB3-14624
| * | | [ticket/14624] Add event to ucp_profile in signature sectionRichard McGirr2016-05-051-0/+26
| |/ / | | | | | | | | | PHPBB3-14624
| * | [3.1.x] Increase version for 3.1.10 developmentJoas Schilling2016-04-091-1/+1
| | |
| * | [prep-release-3.1.9] Update version to 3.1.9-RC1Joas Schilling2016-04-091-1/+1
| |/
* | [ticket/13616] Fix UI testsTristan Darricau2016-04-031-2/+0
| | | | | | | | PHPBB3-13616
* | [ticket/13616] Updates direct call to twig environment constructorTristan Darricau2016-04-032-2/+0
| | | | | | | | PHPBB3-13616
* | [ticket/14426] Fixed undefined offset errorJoshyPHP2016-04-031-0/+5
| | | | | | | | PHPBB3-14426
* | Merge pull request #4271 from kasimi/ticket/14562-3.2.xTristan Darricau2016-04-021-2/+2
|\ \ | | | | | | | | | | | | | | | | | | [ticket/14562] Language fallback for extension permissions (3.2.x) * kasimi/ticket/14562-3.2.x: [ticket/14562] Language fallback for extension permissions (3.2.x)
| * | [ticket/14562] Language fallback for extension permissions (3.2.x)kasimi2016-04-011-2/+2
| | | | | | | | | | | | PHPBB3-14562