1644 Commits

Author	SHA1	Message	Date
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
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
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
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	61fa9dcb9f	Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/search_results.html	2015-02-20 20:42:52 +01: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
Marc Alexander	21c6223eb3	Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/ucp_profile_profile_info.html phpBB/styles/subsilver2/template/ucp_profile_reg_details.html	2015-02-18 17:35:03 +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
Nicofuma	b8939da242	[ticket/13407] Bump minimal version to php 5.3.9 ... PHPBB3-13407	2015-02-04 17:40:18 +01:00
Joas Schilling	7f8a726702	Merge branch 'develop-ascraeus' into develop ... Conflicts: phpBB/styles/subsilver2/template/viewtopic_body.html	2015-02-02 23:07:33 +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	bacb38b161	Merge branch 'develop-ascraeus' into develop ... Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql	2015-01-31 12:12:56 +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	0b8a4e04d3	Merge branch 'develop-ascraeus' into develop ... * develop-ascraeus: [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. Conflicts: build/build.xml	2015-01-30 13:36:55 +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	b78ae290e8	Merge branch 'develop-ascraeus' into develop ... * develop-ascraeus: [ticket/13553] Add a method to the controller helper to display a message [prep-release-3.1.3] Add changelog for 3.1.3-RC1 [prep-release-3.1.3] Prepare Changelog [prep-release-3.1.3] Add migration for 3.1.3-RC1 [prep-release-3.1.3] Update version to 3.1.2-RC1 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-01-30 13:14:33 +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	828aa34ff9	Merge branch 'develop-ascraeus' into develop ... * develop-ascraeus: [prep-release-3.0.13] Bump version numbers for 3.0.13 release [prep-release-3.0.13] Highlight security relevant changes	2015-01-26 19:01:47 +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	768d0a0641	Merge branch 'develop-ascraeus' into develop ... * develop-ascraeus: [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.	2015-01-21 16:07:22 +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
Andreas Fischer	c09023d1db	[develop-olympus] Bumping version numbers to final for 3.0.13 releases.	2015-01-21 01:25:50 +01:00
rxu	10c67fe12a	[ticket/13512] Add template events before/after the post details ... Add template events to viewtopic_body.html to allow extensions adding content before/after the post details. PHPBB3-13512	2015-01-17 16:40:09 +07:00
Joas Schilling	ba90746ce5	Merge branch 'develop-ascraeus' into develop ... Conflicts: phpBB/styles/subsilver2/template/viewtopic_body.html	2015-01-06 11:25:26 +01:00
Kailey Truscott	652a7630bb	[ticket/13437] Change "View" to "view" ... PHPBB3-13437	2015-01-02 10:38:56 -05:00