1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

1616 Commits

Author SHA1 Message Date
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
Joas Schilling
005c27e73d [prep-release-3.1.4] Add security issue to changelog 2015-05-03 17:14:55 +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
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
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
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
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
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
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
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
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
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
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
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
Cesar G
5cd3e7627c [ticket/12599] Use the back to top icon instead of text.
PHPBB3-12599
2015-02-25 20:02:16 -08:00
Cesar G
14fecb2f02 [ticket/12599] Move images to assets/ and update the phpBB logo.
PHPBB3-12599
2015-02-25 20:02:06 -08:00
Cesar G
4565cac049 [ticket/12599] Move documentation stylesheet to assets directory.
PHPBB3-12599
2015-02-25 20:01:53 -08:00
Cesar G
e29e0e5018 [ticket/12599] Remove corner images from documentation style.
PHPBB3-12599
2015-02-25 20:01:25 -08:00
Joas Schilling
461ce3f892 Merge branch 'Wolfsblvt-ticket/13533' into 3.1.x 2015-02-20 20:41:55 +01:00
Wolfsblvt
cba12aca2a [ticket/13533] Add template core event to search results
PHPBB3-13533
2015-02-20 20:41:17 +01:00
RMcGirr83
153d1691ae [ticket/13628] Allow ability for extension to add entries to user's profile
PHPBB3-13628
2015-02-18 16:35:10 +01:00
Joas Schilling
b1336ae016 Merge pull request #3302 from rxu/ticket/13512
[ticket/13512] Add template events before/after the post details
2015-02-02 23:05:50 +01:00
Joas Schilling
be30d8251a [prep-release-3.1.3] Add changelog for 3.1.3-RC2 2015-01-31 01:08:29 +01:00
Andreas Fischer
b6786f8ba1 Merge branch 'prep-release-3.0.13' into prep-release-3.1.3
* prep-release-3.0.13:
  [prep-release-3.0.13] Correct changelog link to 3.0.13 changes.
  [prep-release-3.0.13] Also update version in references to files.
  [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release.
  [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html.
  [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release.
  [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
  [ticket/12933] Handle case when * is last character of word
  [ticket/13554] Show feature release upgrades in blue rather than red.

Conflicts:
	build/build.xml
	phpBB/adm/style/acp_update.html
	phpBB/docs/CHANGELOG.html
	phpBB/docs/INSTALL.html
	phpBB/includes/constants.php
	phpBB/includes/startup.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	tests/security/trailing_path_test.php
2015-01-30 13:34:40 +01:00
Andreas Fischer
5f237a0426 [prep-release-3.0.13] Correct changelog link to 3.0.13 changes. 2015-01-30 01:32:34 +01:00
Andreas Fischer
1e94b0ae71 [prep-release-3.0.13] Also update version in references to files. 2015-01-29 23:32:05 +01:00
Andreas Fischer
5fea945b5b [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release. 2015-01-29 23:27:12 +01:00
Andreas Fischer
208923563e [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html. 2015-01-29 23:16:34 +01:00
Joas Schilling
b2b5addd09 [prep-release-3.1.3] Add changelog for 3.1.3-RC1 2015-01-26 20:09:46 +01:00
Joas Schilling
513b2f8296 [prep-release-3.1.3] Prepare Changelog 2015-01-26 20:00:11 +01:00
Nils Adermann
1c6ebcf02b Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [prep-release-3.0.13] Bump version numbers for 3.0.13 release
  [prep-release-3.0.13] Highlight security relevant changes

Conflicts:
	build/build.xml
	phpBB/install/database_update.php
2015-01-26 19:01:34 +01:00
Nils Adermann
4b42589cfa [prep-release-3.0.13] Highlight security relevant changes 2015-01-26 17:53:43 +01:00
Andreas Fischer
7ed065a630 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [develop-olympus] Increment version number to 3.0.14-dev.
  [develop-olympus] Add changelog for 3.0.13 release.
  [develop-olympus] Bump version numbers for 3.0.13-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.13 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-01-21 16:07:12 +01:00
Andreas Fischer
2c9e178a42 [develop-olympus] Add changelog for 3.0.13 release. 2015-01-21 01:45:23 +01:00