aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-074-5/+5
|\ | | | | | | | | | | Conflicts: phpBB/install/install_install.php phpBB/language/en/install.php
| * Merge pull request #4342 from Senky/ticket/14654Marc Alexander2016-07-075-7/+7
| |\ | | | | | | | | | [ticket/14654] Change Imagemagick to ImageMagick
| | * [ticket/14654] Change Imagemagick to ImageMagickJakub Senko2016-06-115-7/+7
| | | | | | | | | | | | PHPBB3-14654
* | | 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-062-1/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #4354 from Stanzilla/smtp_explainMarc Alexander2016-07-062-1/+2
| |\ \ \ | | | | | | | | | | | | | | | [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-172-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | [ticket/14671] Remove schema.json fileSumanai2016-07-021-3390/+0
| |_|/ / |/| | | | | | | PHPBB3-14671
* | | | [Release 3.2.0-RC1] Update version to 3.2.0-RC2-devTristan Darricau2016-06-272-2/+2
| | | |
* | | | Merge remote-tracking branch 'upstream/prep-release-3.2.0-RC1' into 3.2.xTristan Darricau2016-06-278-28/+123
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 changelogTristan Darricau2016-06-191-0/+55
| | | | |
| * | | | [prep-release-3.2.0-RC1] Add migrationTristan Darricau2016-06-191-0/+40
| | | | |
| * | | | [prep-release-3.2.0-RC1] Update schema.jsonTristan Darricau2016-06-191-22/+22
| | | | |
| * | | | [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1Tristan Darricau2016-06-195-6/+6
| | | | |
* | | | | [ticket/14690] Create email queue cache file in the current env cache folderrxu2016-06-231-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14690
* | | | | Merge pull request #4233 from VSEphpbb/ticket/14547Marc Alexander2016-06-203-2/+167
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14547] Add Vagrant support to phpBB
| * | | | | [ticket/14547] Fix Docs and increase PHP memory limitMatt Friedman2016-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14547
| * | | | | [ticket/14547] Use package compatible with phpBB requirementsMatt Friedman2016-04-283-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14547
| * | | | | [ticket/14547] Add Vagrant to phpBBMatt Friedman2016-04-283-2/+167
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14547
* | | | | | [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 typos in email templates.rxu2016-06-195-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14660
| * | | | | | [ticket/14660] Fix parsing board email messages through template engine.rxu2016-06-182-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14660
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-195-5/+5
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | [ticket/14683] Fix typos in email templates.rxu2016-06-205-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14683
* | | | | | | Merge pull request #4326 from Crizz0/ticket/14640Marc Alexander2016-06-191-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14640] Changes docu-link in language/en/install.php from 3.3 to 3.2
| * | | | | | | [ticket/14640] Changes link from 3.3 to 3.2 to link to the correct docuCrizzo2016-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14640
* | | | | | | | 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-195-2/+55
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/language/en/install.php
| * | | | | | | Merge pull request #4281 from rmcgirr83/ticket_13716Marc Alexander2016-06-195-2/+54
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13716] Check phpBB version against config version
| | * | | | | | | [ticket/13716] Remove extra br tag and correct missing closing a html tagRichard McGirr2016-05-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13716
| | * | | | | | | [ticket/13716] Fix verbosenessRichard McGirr2016-04-122-18/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13716
| | * | | | | | | [ticket/13716] Fix grammar and href title tagsRichard McGirr2016-04-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13716
| | * | | | | | | [ticket/13716] Remove extraneous blank lineRMcGirr832016-04-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13716
| | * | | | | | | [ticket/13716] Check phpBB version against config versionRichard McGirr2016-04-055-2/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-194-1/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/viewforum_body.html phpBB/styles/subsilver2/template/mcp_forum.html phpBB/styles/subsilver2/template/search_results.html phpBB/styles/subsilver2/template/viewforum_body.html
| * | | | | | | | Merge pull request #4351 from rmcgirr83/ticket_14672Marc Alexander2016-06-197-2/+18
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14672] Add template event after topic title
| | * | | | | | | | [ticket/14672] Change event name add to events.mdRichard McGirr2016-06-137-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14672
| | * | | | | | | | [ticket/14672] Add template event after topic titleRichard McGirr2016-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14672
* | | | | | | | | | 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/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #4328 from Senky/ticket/13865Marc Alexander2016-06-191-0/+5
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13865] Add id_ary, show_results to core.search_modify_param_before
| | * | | | | | | | | [ticket/13865] Add id_ary, show_results to core.search_modify_param_beforeJakub Senko2016-05-221-0/+5
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13865
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-20 06:21:32 +0000