forums - The forums.mageia.org Website

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'develop-ascraeus' into develop	Andreas Fischer	2015-02-03	1	-5/+6
\|\ \| \| \| \| \| \| \| \| \| \|	* develop-ascraeus: [ticket/13348] Remove unnecessary global $cache [ticket/13348] Use close method to free query result handle
\| *	Merge branch 'ticket/13348-olympus' into ticket/13348	Marc Alexander	2015-02-03	1	-5/+6
\| \| \| \| \| \| \| \| \| \|	Conflicts: phpBB/feed.php
* \|	Merge branch 'develop-ascraeus' into develop	Andreas Fischer	2015-02-03	3	-1/+3
\|\ \ \| \|/ \| \| \| \| \| \|	* develop-ascraeus: [ticket/13569] Add missing sql_freeresults and remove unneeded results
\| *	[ticket/13569] Add missing sql_freeresults and remove unneeded results	Marc Alexander	2015-02-02	3	-1/+3
\| \| \| \| \| \| \| \|	PHPBB3-13569
* \|	[ticket/13139] Fix tests	Nicofuma	2015-02-03	1	-0/+7
\| \| \| \| \| \| \| \|	PHPBB3-13139
* \|	[ticket/13494] Update calls to `set_config()`	Gaëtan Muller	2015-02-02	12	-22/+29
\| \| \| \| \| \| \| \|	PHPBB3-13494
* \|	Merge branch 'develop-ascraeus' into develop	Joas Schilling	2015-02-01	1	-0/+31
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: build/build.xml
\| *	[prep-release-3.1.3] Add migration for 3.1.3	Joas Schilling	2015-02-01	1	-0/+31
\| \|
* \|	Merge pull request #3352 from VSEphpbb/ticket/10388	Marc Alexander	2015-01-31	2	-4/+5
\|\ \ \| \| \| \| \| \| \| \| \|	Ticket/10388 Use Twig's JS escape filter instead of addslashes on LA_ keys
\| * \|	[ticket/10388] Update deprecation comment	Matt Friedman	2015-01-31	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10388
\| * \|	[ticket/10388] Update deprecation date for addslashes	Matt Friedman	2015-01-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10388
\| * \|	[ticket/10388] Use TWIG escape JS filter instead of addslashes	Matt Friedman	2015-01-29	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10388
* \| \|	Merge branch 'develop-ascraeus' into develop	Joas Schilling	2015-01-31	1	-0/+32
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
\| * \|	[prep-release-3.1.3] Add migration for 3.1.3-RC2	Joas Schilling	2015-01-31	1	-0/+32
\| \| \|
* \| \|	Merge branch 'develop-ascraeus' into develop	Joas Schilling	2015-01-31	1	-7/+9
\|\ \ \ \| \|/ /
\| * \|	[ticket/13553] Use defined title value in page headers too	Matt Friedman	2015-01-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13553
\| * \|	[ticket/13553] Make title var accept a lang key var	Matt Friedman	2015-01-31	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13553
\| * \|	[ticket/13553] Message helper should accept a lang key var	Matt Friedman	2015-01-31	1	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13553
* \| \|	Merge branch 'develop-ascraeus' into develop	Joas Schilling	2015-01-31	2	-0/+74
\|\ \ \ \| \|/ /
\| * \|	[ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1	Joas Schilling	2015-01-30	2	-0/+74
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13557
* \| \|	Merge branch 'develop-ascraeus' into develop	Andreas Fischer	2015-01-30	2	-5/+6
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	* develop-ascraeus: [ticket/13556] Fix exception translation with filedownloader
\| * \|	[ticket/13556] Fix exception translation with filedownloader	Joas Schilling	2015-01-30	2	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13556
* \| \|	Merge branch 'develop-ascraeus' into develop	Joas Schilling	2015-01-30	1	-1/+2
\|\ \ \ \| \|/ /
\| * \|	Merge pull request #3341 from brunoais/ticket/13544	Joas Schilling	2015-01-30	1	-1/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/13544] Fixing wrong SQL query for permission_unset() for roles
\| \| * \|	[ticket/13544] Use integer case because $role_id is an int	brunoais	2015-01-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13544
\| \| * \|	[ticket/13544] Fixing wrong SQL query for permission_unset for roles	brunoais	2015-01-26	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13544
\| * \| \|	Merge branch 'prep-release-3.0.13' into prep-release-3.1.3	Andreas Fischer	2015-01-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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
* \| \| \|	Merge branch 'develop-ascraeus' into develop	Andreas Fischer	2015-01-30	2	-1/+51
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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
\| * \| \|	Merge branch 'prep-release-3.1.3' into develop-ascraeus	Dhruv	2015-01-30	2	-1/+51
\| \|\ \ \ \| \| \|/ /
\| \| * \|	[ticket/13553] Add a method to the controller helper to display a message	Joas Schilling	2015-01-29	1	-1/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13553
\| \| * \|	[prep-release-3.1.3] Add migration for 3.1.3-RC1	Joas Schilling	2015-01-26	1	-0/+35
\| \| \|/
* \| \|	Merge branch 'develop-ascraeus' into develop	Andreas Fischer	2015-01-29	1	-1/+1
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	* develop-ascraeus: [ticket/12933] Add test cases for * wildcard searches [ticket/12933] Handle case when * is last character of word
\| * \|	Merge branch 'ticket/12933-olympus' into ticket/12933	Dhruv	2015-01-28	1	-1/+1
\| \|/
* \|	[ticket/13468] Update calls to `add_log()`	Gaëtan Muller	2015-01-27	9	-27/+38
\| \| \| \| \| \| \| \|	PHPBB3-13468
* \|	Merge pull request #3179 from Nicofuma/ticket/13372	Marc Alexander	2015-01-24	1	-28/+17
\|\ \ \| \| \| \| \| \| \| \| \|	[ticket/13372] Fix Url Generator/Matcher generation
\| * \|	[ticket/13372] Fix require_once CS	Tristan Darricau	2014-11-25	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13372
\| * \|	[ticket/13372] Fix Url Generator/Matcher generation	Tristan Darricau	2014-11-25	1	-28/+17
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13372
* \| \|	Merge branch 'develop-ascraeus' into develop	Joas Schilling	2015-01-23	1	-1/+9
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge pull request #3321 from marc1706/ticket/13282	Joas Schilling	2015-01-23	1	-1/+9
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/13282] Use 0 as default for integer type columns in postgresql
\| \| * \|	[ticket/13282] Use strpos() instead of preg_match()	Marc Alexander	2015-01-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13282
\| \| * \|	[ticket/13282] Use 0 as default for integer type columns in postgresql	Marc Alexander	2015-01-22	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13282
* \| \| \|	Merge pull request #3275 from nickvergessen/ticket/13487	Marc Alexander	2015-01-22	1	-0/+35
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/13487] Add factory for db tool class
\| * \| \| \|	[ticket/13487] Add factory for db tool class	Joas Schilling	2015-01-10	1	-0/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows us to split up the large file one by one easily. PHPBB3-13487
* \| \| \| \|	Merge branch 'develop-ascraeus' into develop	Nils Adermann	2015-01-22	5	-13/+199
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* develop-ascraeus: [ticket/13361] Rename exception to runtime_exception [ticket/13361] Fix the JsonResponse in the exception listener [ticket/13361] Add tests [ticket/13361] Support ajax request (send a json response) [ticket/13361] Improve the exception listener
\| * \| \| \|	Merge pull request #3173 from Nicofuma/ticket/13361	Nils Adermann	2015-01-22	5	-13/+199
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|	[ticket/13361] Improve the exception listener
\| \| * \| \|	[ticket/13361] Rename exception to runtime_exception	Tristan Darricau	2015-01-21	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13361
\| \| * \| \|	[ticket/13361] Fix the JsonResponse in the exception listener	Tristan Darricau	2015-01-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13361
\| \| * \| \|	[ticket/13361] Add tests	Tristan Darricau	2015-01-11	2	-5/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13361
\| \| * \| \|	[ticket/13361] Support ajax request (send a json response)	Tristan Darricau	2015-01-10	1	-9/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13361
\| \| * \| \|	[ticket/13361] Improve the exception listener	Tristan Darricau	2014-11-23	5	-4/+168
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13361