Mate Bartus
030f6da911
[ticket/13740] Remove extra dot from config sample's name
...
PHPBB3-13740
2015-07-21 15:30:31 +02:00
Mate Bartus
846ab1d22f
[ticket/13740] Move install-config.yml to docs/
...
PHPBB3-13740
2015-07-20 18:12:50 +02:00
Andreas Fischer
65fef50869
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13931] Wrong order in docs/events.md
Conflicts:
phpBB/docs/events.md
2015-06-16 14:32:01 +02:00
Andreas Fischer
e8769fd561
Merge pull request #3695 from javiexin/ticket/13931
...
[ticket/13931] Wrong order in docs/events.md
* javiexin/ticket/13931:
[ticket/13931] Wrong order in docs/events.md
Conflicts:
phpBB/docs/events.md
2015-06-16 14:29:18 +02:00
CHItA
d5414592f1
Merge branch '3.1.x'
2015-06-16 01:20:22 +02:00
Joas Schilling
002f08ba35
[ticket/13947] Add CHItA to the list of developers
...
PHPBB3-13947
2015-06-16 00:17:00 +02:00
Joas Schilling
2a662c5e07
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
phpBB/phpbb/user.php
2015-06-14 17:40:18 +02:00
Joas Schilling
38a1442d40
[prep-release-3.1.5] Update version for final 3.1.5 release
2015-06-14 16:11:22 +02:00
Joas Schilling
a3883a6f23
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
2015-06-11 21:00:04 +02:00
Joas Schilling
790f7ded5b
[prep-release-3.1.5] Add changelog for 3.1.5-RC1
2015-06-09 20:45:37 +02:00
javiexin
41f78b5c49
[ticket/13931] Wrong order in docs/events.md
...
Reordered alphabetically (mcp before memberlist).
PHPBB3-13931
2015-06-08 11:26:59 +02:00
Joas Schilling
c28a213b1b
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/subsilver2/template/mcp_post.html
2015-06-04 17:46:36 +02:00
Joas Schilling
bb7f843344
Merge pull request #3558 from javiexin/ticket/13786
...
[ticket/13786] Add events to add MCP post options
2015-06-04 17:45:21 +02:00
Joas Schilling
5bf48bddf8
Merge branch 'ticket/13808' into ticket/13808-master
...
* ticket/13808:
[ticket/13808] Fix version
Conflicts:
phpBB/docs/events.md
2015-05-28 12:35:25 +02:00
Joas Schilling
0daa999fd0
[ticket/13808] Fix version
...
PHPBB3-13808
2015-05-28 12:34:21 +02:00
Joas Schilling
c5b2822cf5
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13808] search_body_form_before
Conflicts:
phpBB/styles/subsilver2/template/search_body.html
2015-05-28 11:09:24 +02:00
Joas Schilling
8fda16527e
Merge pull request #3600 from dragosvr92/ticket/13808
...
[ticket/13808] search_body_form_before
2015-05-28 11:05:32 +02:00
Oliver Schramm
c1ab364e28
Merge branch '3.1.x'
2015-05-15 17:54:10 +02:00
Oliver Schramm
1c0c9c1bca
Merge pull request #3563 from rxu/ticket/13791
...
[ticket/13791] Add more post buttons template events to viewtopic_body.html
2015-05-15 17:52:44 +02:00
Marc Alexander
11167f6060
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/subsilver2/template/viewforum_body.html
2015-05-14 15:57:41 +02:00
Marc Alexander
d004a1c6b8
Merge pull request #3540 from RMcGirr83/ticket/13699
...
[ticket/13699] Add event before and after forum title in viewforum
2015-05-14 15:56:05 +02:00
dragosvr92
345c25c367
[ticket/13808] search_body_form_before
...
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
2015-05-09 16:41:18 +03:00
Marc Alexander
83e9cdeebc
Merge branch '3.1.x'
2015-05-08 11:19:59 +02:00
Marc Alexander
b3b7f8e925
Merge pull request #3530 from VSEphpbb/ticket/13753
...
[ticket/13753] Add template events to forum category row headers
2015-05-08 11:19:53 +02:00
Richard McGirr
c2b4636008
[ticket/13699] Add event before and after forum title in viewforum
...
PHPBB3-13699
2015-05-05 13:37:46 -04:00
Joas Schilling
36abb61d39
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
2015-05-03 18:44:34 +02:00
Joas Schilling
005c27e73d
[prep-release-3.1.4] Add security issue to changelog
2015-05-03 17:14:55 +02:00
Andreas Fischer
9074738a10
Merge branch '3.1.x'
...
* 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.
2015-05-03 16:45:10 +02:00
Andreas Fischer
dde72c58b0
Merge branch 'prep-release-3.0.14' into prep-release-3.1.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
2015-05-03 16:39:51 +02:00
Andreas Fischer
11242dd07d
[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
2015-05-03 16:22:28 +02:00
rxu
aef5be3d17
[ticket/13791] Add more post buttons template events to viewtopic_body.html
...
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
2015-05-01 10:59:18 +07:00
Andreas Fischer
0f707ddb99
Merge branch '3.1.x'
...
* 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.
2015-04-28 21:43:46 +02:00
Andreas Fischer
969718fc91
Merge branch 'prep-release-3.0.14' into prep-release-3.1.4
...
* 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
2015-04-28 21:40:23 +02:00
Andreas Fischer
d833f29069
[3.0.x] Add changelog for 3.0.14 release.
2015-04-28 18:57:03 +02:00
Andreas Fischer
cd6c0427fb
[3.0.x] Bumping version numbers to final for 3.0.14 releases.
2015-04-27 23:13:56 +02:00
javiexin
e98a5afd07
[ticket/13786] Add events to add MCP post options
...
Three new events are included:
1) Core event to perform new moderator action in includes/mcp/mcp_post.php
2) Core event to add/modify template data in includes/mcp/mcp_post.php
3) Template event to present new options in template/mcp_post.html
PHPBB3-13786
2015-04-27 13:21:23 +02:00
Joas Schilling
bf107ba1af
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
2015-04-10 10:06:07 +02:00
Joas Schilling
073f3e4470
[prep-release-3.1.4] Add changelog for 3.1.4-RC1
2015-04-09 21:11:08 +02:00
Matt Friedman
ef0838e931
[ticket/13753] Fix event documentation
...
PHPBB3-13753
2015-04-09 12:00:33 -07:00
Matt Friedman
96339b7c86
[ticket/13753] Add template events to forum category row headers
...
PHPBB3-13753
2015-04-09 11:04:25 -07:00
Joas Schilling
a11994d424
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/subsilver2/template/posting_body.html
2015-04-06 14:45:20 +02:00
Joas Schilling
02202b1503
Merge pull request #3492 from RMcGirr83/ticket/13710
...
[ticket/13710] Allow template events near smilies display
2015-04-06 14:44:37 +02:00
Joas Schilling
4ce0d88ffd
Merge branch '3.1.x'
2015-04-06 14:43:11 +02:00
Joas Schilling
b16a56394b
Merge pull request #3488 from Crizz0/ticket/13701
...
[ticket/13701] Adds two new events to posting_pm_layout.html
Conflicts:
phpBB/docs/events.md
2015-04-06 14:42:59 +02:00
Joas Schilling
370fce1651
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/subsilver2/template/posting_poll_body.html
2015-04-06 14:27:48 +02:00
Joas Schilling
7d08bf5b3e
Merge pull request #3517 from Wolfsblvt/ticket/13739
...
[ticket/13739] Add template core event posting_poll_body_options_after
2015-04-06 14:26:35 +02:00
Wolfsblvt
d5021aeda4
[ticket/13739] Add template core event posting_poll_body_options_after
...
Template event added for the poll options while posting a topic
so that you may add additional options for polls.
PHPBB3-13739
2015-04-03 17:02:43 +02:00
Marc Alexander
ca1ac36c20
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/subsilver2/template/overall_header.html
2015-04-03 16:50:20 +02:00
Marc Alexander
55f6329c1d
Merge pull request #3467 from dragosvr92/patch-5
...
[ticket/13602] Adding a new event overall_header_navbar_before
2015-04-03 16:48:26 +02:00
Oliver Schramm
784ccdf0b0
Merge branch '3.1.x'
2015-03-25 22:03:15 +01:00
