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
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
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
Nicofuma
7f2b932a1b
[ticket/13723] Merge branch 'ticket/13723' into ticket/13723-31x
...
Conflicts:
phpBB/docs/AUTHORS
PHPBB3-13723
2015-03-25 21:40:12 +01:00
Nicofuma
44540b6112
[ticket/13723] Add Elsensee to authors list
...
PHPBB3-13723
2015-03-25 21:31:50 +01:00
RMcGirr83
d4ca81f23f
[ticket/13710] Allow template events near smilies display
...
PHPBB3-13710
2015-03-19 07:25:45 -04:00
Crizzo
0a52d732e4
[ticket/13701] Adds two new events to posting_pm_layout.html
...
These events wrap the includes of posting_pm_header.html to add some
content before and after it.
PHPBB3-13701
2015-03-13 23:37:07 +01:00
Marc Alexander
72d9cf3a95
Merge branch '3.1.x'
2015-03-10 15:23:29 +01:00
n-aleha
aeafb90208
[ticket/13679] Add template event overall_header_searchbox_before
...
PHPBB3-13679
2015-03-08 21:54:01 +02:00
Dragos-Valentin Radulescu
4ccba99047
[ticket/13602] Adding event overall_header_navbar_before
...
PHPBB3-13602
2015-03-06 19:41:02 +02:00
Marc Alexander
5e7560845b
Merge branch '3.1.x'
2015-03-06 14:36:22 +01:00
Marc Alexander
d7f4715b96
Merge pull request #3473 from RMcGirr83/ticket/13675
...
[ticket/13675] Add validate to acp_profile event and add template events
2015-03-06 14:36:20 +01:00
Richard McGirr
6b87e06292
[ticket/13675] Add validate to acp_profile event and add template events
...
for acp users profile
PHPBB3-13675
2015-03-06 07:26:35 -05:00
Marc Alexander
5d6f86800f
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/subsilver2/template/viewtopic_body.html
2015-02-27 22:10:27 +01:00
Marc Alexander
a7b1b71921
Merge pull request #3451 from RMcGirr83/ticket/13510
...
[ticket/13510] Add template even viewtopic_body_pagination_after
2015-02-27 22:08:51 +01:00
RMcGirr83
8c73f63529
[ticket/13510] Add template even viewtopic_body_pagination_after
...
PHPBB3-13510
2015-02-26 18:29:02 -05:00
Joas Schilling
72f7c5e9c2
Merge branch '3.1.x'
2015-02-26 22:40:03 +01:00
Joas Schilling
ea4b993516
Merge pull request #2992 from prototech/ticket/12599
...
[ticket/12599] Update documentation style
2015-02-26 22:34:05 +01:00
Cesar G
4df853abcc
[ticket/12599] Remove empty line at end of code boxes.
...
PHPBB3-12599
2015-02-25 20:08:08 -08:00
Cesar G
a07b29c1df
[ticket/12599] Place standalone text in a box.
...
PHPBB3-12599
2015-02-25 20:08:03 -08:00
Cesar G
6e5f33e5fb
[ticket/12599] Get the font sizes under control.
...
PHPBB3-12599
2015-02-25 20:02:40 -08:00
Cesar G
62f69224a4
[ticket/12599] Add padding on the sides of the inline code boxes.
...
PHPBB3-12599
2015-02-25 20:02:28 -08:00
