aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ticket/13808' into ticket/13808-masterJoas Schilling2015-05-281-2/+2
|\ | | | | | | | | | | | | | | * ticket/13808: [ticket/13808] Fix version Conflicts: phpBB/docs/events.md
| * [ticket/13808] Fix versionJoas Schilling2015-05-281-1/+1
| | | | | | | | PHPBB3-13808
* | Merge branch '3.1.x'Joas Schilling2015-05-281-0/+7
|\ \ | |/ | | | | | | | | | | | | * 3.1.x: [ticket/13808] search_body_form_before Conflicts: phpBB/styles/subsilver2/template/search_body.html
| * Merge pull request #3600 from dragosvr92/ticket/13808Joas Schilling2015-05-281-0/+8
| |\ | | | | | | | | | [ticket/13808] search_body_form_before
| | * [ticket/13808] search_body_form_beforedragosvr922015-05-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Extensions may be designed to add secondary search options, such as Google search in the search_body.html. There are no events in the searchbody, so this should be merged. PHPBB3-13808
* | | Merge branch '3.1.x'Oliver Schramm2015-05-151-0/+16
|\ \ \ | |/ /
| * | Merge pull request #3563 from rxu/ticket/13791Oliver Schramm2015-05-151-0/+16
| |\ \ | | | | | | | | | | | | [ticket/13791] Add more post buttons template events to viewtopic_body.html
| | * | [ticket/13791] Add more post buttons template events to viewtopic_body.htmlrxu2015-05-011-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose is to allow adding custom post buttons outside of original post buttons conditionals/list in prosilver (for subsilver2 it's not the issue). PHPBB3-13791
* | | | Merge branch '3.1.x'Marc Alexander2015-05-141-0/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/viewforum_body.html
| * | | Merge pull request #3540 from RMcGirr83/ticket/13699Marc Alexander2015-05-141-0/+16
| |\ \ \ | | |_|/ | |/| | | | | | [ticket/13699] Add event before and after forum title in viewforum
| | * | [ticket/13699] Add event before and after forum title in viewforumRichard McGirr2015-05-051-0/+16
| | |/ | | | | | | | | | PHPBB3-13699
* | | Merge branch '3.1.x'Marc Alexander2015-05-081-0/+14
|\ \ \ | |/ /
| * | Merge pull request #3530 from VSEphpbb/ticket/13753Marc Alexander2015-05-081-0/+14
| |\ \ | | | | | | | | | | | | [ticket/13753] Add template events to forum category row headers
| | * | [ticket/13753] Fix event documentationMatt Friedman2015-04-091-4/+4
| | | | | | | | | | | | | | | | PHPBB3-13753
| | * | [ticket/13753] Add template events to forum category row headersMatt Friedman2015-04-091-0/+14
| | | | | | | | | | | | | | | | PHPBB3-13753
* | | | Merge branch '3.1.x'Joas Schilling2015-05-031-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: build/build.xml
| * | | [prep-release-3.1.4] Add security issue to changelogJoas Schilling2015-05-031-0/+4
| | | |
* | | | Merge branch '3.1.x'Andreas Fischer2015-05-031-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 3.1.x: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release.
| * | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-05-031-0/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.14: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release. Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * | | [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.Andreas Fischer2015-05-031-0/+4
| | | | |
* | | | | Merge branch '3.1.x'Andreas Fischer2015-04-282-1/+27
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [3.0.x] Add changelog for 3.0.14 release. [3.0.x] Bump version numbers for 3.0.14-RC1 release. [3.0.x] Bumping version numbers to final for 3.0.14 releases.
| * | | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-04-282-1/+27
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.14: [3.0.x] Add changelog for 3.0.14 release. [3.0.x] Bump version numbers for 3.0.14-RC1 release. [3.0.x] Bumping version numbers to final for 3.0.14 releases. Conflicts: build/build.xml phpBB/docs/CHANGELOG.html phpBB/docs/INSTALL.html phpBB/includes/constants.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/imageset/imageset.cfg phpBB/styles/prosilver/style.cfg phpBB/styles/prosilver/template/template.cfg phpBB/styles/prosilver/theme/theme.cfg phpBB/styles/subsilver2/imageset/imageset.cfg phpBB/styles/subsilver2/style.cfg phpBB/styles/subsilver2/template/template.cfg phpBB/styles/subsilver2/theme/theme.cfg
| | * | [3.0.x] Add changelog for 3.0.14 release.Andreas Fischer2015-04-281-0/+26
| | | |
| | * | [3.0.x] Bumping version numbers to final for 3.0.14 releases.Andreas Fischer2015-04-271-3/+3
| | | |
* | | | Merge branch '3.1.x'Joas Schilling2015-04-101-1/+116
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | | [prep-release-3.1.4] Add changelog for 3.1.4-RC1Joas Schilling2015-04-091-1/+116
| | | |
* | | | Merge branch '3.1.x'Joas Schilling2015-04-061-0/+21
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/posting_body.html
| * | | Merge pull request #3492 from RMcGirr83/ticket/13710Joas Schilling2015-04-061-0/+24
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13710] Allow template events near smilies display
| | * | | [ticket/13710] Allow template events near smilies displayRMcGirr832015-03-191-0/+24
| | | | | | | | | | | | | | | | | | | | PHPBB3-13710
* | | | | Merge branch '3.1.x'Joas Schilling2015-04-061-0/+14
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3488 from Crizz0/ticket/13701Joas Schilling2015-04-061-0/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13701] Adds two new events to posting_pm_layout.html Conflicts: phpBB/docs/events.md
| | * | | | [ticket/13701] Adds two new events to posting_pm_layout.htmlCrizzo2015-03-131-0/+14
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These events wrap the includes of posting_pm_header.html to add some content before and after it. PHPBB3-13701
* | | | | Merge branch '3.1.x'Joas Schilling2015-04-061-0/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/posting_poll_body.html
| * | | | Merge pull request #3517 from Wolfsblvt/ticket/13739Joas Schilling2015-04-061-0/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13739] Add template core event posting_poll_body_options_after
| | * | | | [ticket/13739] Add template core event posting_poll_body_options_afterWolfsblvt2015-04-031-0/+8
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Template event added for the poll options while posting a topic so that you may add additional options for polls. PHPBB3-13739
* | | | | Merge branch '3.1.x'Marc Alexander2015-04-031-0/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/overall_header.html
| * | | | Merge pull request #3467 from dragosvr92/patch-5Marc Alexander2015-04-031-0/+8
| |\ \ \ \ | | |/ / / | |/| | | | | | | | [ticket/13602] Adding a new event overall_header_navbar_before
| | * | | [ticket/13602] Adding event overall_header_navbar_beforeDragos-Valentin Radulescu2015-03-061-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-13602
* | | | | Merge branch '3.1.x'Oliver Schramm2015-03-251-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/13723] Merge branch 'ticket/13723' into ticket/13723-31xNicofuma2015-03-251-1/+2
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | | | | | | | | Conflicts: phpBB/docs/AUTHORS PHPBB3-13723
| | * | [ticket/13723] Add Elsensee to authors listNicofuma2015-03-251-1/+2
| | | | | | | | | | | | | | | | PHPBB3-13723
* | | | Merge branch '3.1.x'Marc Alexander2015-03-101-0/+7
|\ \ \ \ | |/ / /
| * | | [ticket/13679] Add template event overall_header_searchbox_beforen-aleha2015-03-081-0/+7
| | | | | | | | | | | | | | | | PHPBB3-13679
* | | | Merge branch '3.1.x'Marc Alexander2015-03-061-0/+21
|\ \ \ \ | |/ / /
| * | | Merge pull request #3473 from RMcGirr83/ticket/13675Marc Alexander2015-03-061-0/+21
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13675] Add validate to acp_profile event and add template events
| | * | | [ticket/13675] Add validate to acp_profile event and add template eventsRichard McGirr2015-03-061-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for acp users profile PHPBB3-13675
* | | | | Merge branch '3.1.x'Marc Alexander2015-02-271-0/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/viewtopic_body.html
| * | | | Merge pull request #3451 from RMcGirr83/ticket/13510Marc Alexander2015-02-271-0/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13510] Add template even viewtopic_body_pagination_after
| | * | | | [ticket/13510] Add template even viewtopic_body_pagination_afterRMcGirr832015-02-261-0/+8
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-13510
* | | | | Merge branch '3.1.x'Joas Schilling2015-02-2615-392/+385
|\ \ \ \ \ | |/ / / /
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 16:13:31 +0000