forums - The forums.mageia.org Website

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'Hardolaf/feature/oauth' into develop	David King	2013-09-10	51	-42/+3073
\|\
\| *	Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth	Joseph Warner	2013-09-10	21	-169/+253
\| \|\ \| \|/ \|/\|
* \|	Merge branch 'develop-olympus' into develop	Andreas Fischer	2013-09-10	1	-1/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	* develop-olympus: [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
\| * \	Merge branch 'prep-release-3.0.12' into develop-olympus	Andreas Fischer	2013-09-10	1	-1/+0
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* prep-release-3.0.12: [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
\| \| * \|	[prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.	Andreas Fischer	2013-09-10	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A wrong fix version was assigned to PHPBB3-11288.
* \| \| \|	Merge pull request #1703 from cyberalien/ticket/develop/11832	Nathan Guse	2013-09-09	1	-1/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix path detection
\| * \| \| \|	[ticket/develop/11832] Fix path detection	Vjacheslav Trushkin	2013-09-09	1	-1/+7
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up path, do not count first / PHPBB3-11832
* \| \| \|	Merge pull request #1618 from VSEphpbb/ticket/11747	Nathan Guse	2013-09-05	8	-1/+152
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	[ticket/11747] UCP Prefs Core and Template Events
\| * \| \| \|	[ticket/11747] Tweak some of the wording in the events doc	Matt Friedman	2013-07-27	1	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11747
\| * \| \| \|	[ticket/11747] Use _prepend and _append for template events	Matt Friedman	2013-07-26	7	-24/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11747
\| * \| \| \|	[ticket/11747] ucp_prefs_post template events	Matt Friedman	2013-07-26	3	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11747
\| * \| \| \|	[ticket/11747] ucp_prefs_post core events	Matt Friedman	2013-07-26	1	-0/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11747
\| * \| \| \|	[ticket/11747] ucp_prefs_view template events	Matt Friedman	2013-07-26	3	-0/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11747
\| * \| \| \|	[ticket/11747] ucp_prefs_view core events	Matt Friedman	2013-07-26	1	-0/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11747
\| * \| \| \|	[ticket/11747] ucp_prefs_personal template events	Matt Friedman	2013-07-26	3	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11747
\| * \| \| \|	[ticket/11747] ucp_prefs_personal core events	Matt Friedman	2013-07-26	1	-0/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11747
\| * \| \| \|	[ticket/11747] Add $phpbb_dispatcher to global	Matt Friedman	2013-07-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11747
* \| \| \| \|	Merge pull request #1435 from cyberalien/ticket/11562	Nathan Guse	2013-09-05	1	-121/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	forum_fn.js cleanup
\| * \| \| \| \|	[ticket/11562] Use jQuery in subPanels	Vjacheslav Trushkin	2013-08-30	1	-17/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB-11562
\| * \| \| \| \|	[ticket/11562] Remove submit_default_button from forum_fn	Vjacheslav Trushkin	2013-08-30	1	-92/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove submit_default_button() and related functions from forum_fn.js PHPBB3-11562
\| * \| \| \| \|	[ticket/11562] Convert marklist() to jQuery	Vjacheslav Trushkin	2013-08-30	1	-12/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11562
* \| \| \| \| \|	Merge pull request #1695 from dhruvgoel92/ticket/11825	Nathan Guse	2013-09-05	3	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/11825] Move schema_data.php into includes/ instead of phpbb/
\| * \| \| \| \| \|	[ticket/11825] Move schema_data.php into includes/ instead of phpbb/	Dhruv	2013-09-03	3	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11825
* \| \| \| \| \| \|	Merge pull request #1651 from cyberalien/ticket/11782	Nathan Guse	2013-09-05	7	-43/+81
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix layout of notices in posts
\| * \| \| \| \| \| \|	[ticket/11782] Apply line-height correctly	Vjacheslav Trushkin	2013-08-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Apply line-height only to bolded elements inside post notices that are direct child elements of forms. PHPBB3-11782
\| * \| \| \| \| \| \|	[ticket/11782] RTL support for post notices	Vjacheslav Trushkin	2013-08-11	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11782
\| * \| \| \| \| \| \|	[ticket/11782] Change p.rules to p.post-notice in CSS	Vjacheslav Trushkin	2013-08-11	2	-13/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11782
\| * \| \| \| \| \| \|	[ticket/11782] Change p.rules to p.post-notice in templates	Vjacheslav Trushkin	2013-08-11	4	-30/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11782
* \| \| \| \| \| \| \|	Merge branch 'develop-olympus' into develop	Andreas Fischer	2013-09-05	1	-0/+3
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| / / / \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* develop-olympus: [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. Conflicts: build/build.xml phpBB/install/database_update.php
\| * \| \| \| \| \|	Merge branch 'prep-release-3.0.12' into develop-olympus	Andreas Fischer	2013-09-05	3	-2/+11
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* prep-release-3.0.12: [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
\| \| * \| \| \| \|	[prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.	Andreas Fischer	2013-09-02	1	-0/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	[prep-release-3.0.12] Bumping version number for 3.0.12-RC3.	Andreas Fischer	2013-09-02	4	-5/+11
\| \| \| \| \| \| \|
\| \| \| \| \| \| *	[feature/oauth] Fix tabindex	Joseph Warner	2013-09-09	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11673
\| \| \| \| \| \| *	[feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵	Joseph Warner	2013-09-06	239	-5469/+5282
\| \| \| \| \| \| \|\ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/oauth Conflicts: phpBB/composer.json phpBB/composer.lock phpBB/develop/create_schema_files.php phpBB/includes/ucp/ucp_register.php PHPBB3-11673
* \| \| \| \| \| \|	Merge remote-tracking branch 'EXreaction/ticket/11791' into develop	David King	2013-09-02	5	-5/+5
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	[ticket/11791] Load adm/ events from styles/adm/event/	Nathan Guse	2013-09-02	5	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11791
* \| \| \| \| \| \| \|	Merge remote-tracking branch 'EXreaction/ticket/11818' into develop	David King	2013-09-02	2	-160/+349
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	[ticket/11818] Update Symfony dependencies to 2.3.*	Nathan Guse	2013-09-02	2	-160/+349
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11818
* \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'EXreaction/ticket/11755' into develop	David King	2013-09-02	4	-2786/+1456
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	[ticket/11755] MySQL upgrader out of date	Nathan Guse	2013-09-02	4	-2786/+1456
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	De-duplicating code from create_schema_files, mysql_upgrader. New file phpbb/db/schema_data which contains all the current schema data. New function in db_tools public static function get_dbms_type_map() to make the type map available everywhere (without requiring $db be setup already) PHPBB3-11755
* \| \| \| \| \| \| \| \|	Merge pull request #1102 from imkingdavid/ticket/11215	Nathan Guse	2013-09-02	8	-54/+117
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/11215] Correct paths when path info is used for controller access
\| * \| \| \| \| \| \| \| \|	[ticket/11215] Remove unnecessary comment	David King	2013-09-02	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11215
\| * \| \| \| \| \| \| \| \|	Merge branch 'develop' into ticket/11215	David King	2013-09-02	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	[ticket/11215] Fix helper_url_test.php tests	David King	2013-09-02	2	-16/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11215
\| * \| \| \| \| \| \| \| \| \|	[ticket/11215] Add newline back to .htaccess, fix wording	David King	2013-09-02	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11215
\| * \| \| \| \| \| \| \| \| \|	[ticket/11215] Update comment in .htaccess	David King	2013-09-02	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11215
\| * \| \| \| \| \| \| \| \| \|	[ticket/11215] Uncomment rewrite rules in .htaccess	David King	2013-09-02	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because we check to see if the rewrite module is available we don't have to comment the rewrite lines PHPBB3-11215
\| * \| \| \| \| \| \| \| \| \|	[ticket/11215] Make controller helper url() method use correct format	David King	2013-09-02	2	-16/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11215
\| * \| \| \| \| \| \| \| \| \|	[ticket/11215] Add commented-out URL rewrite capability to .htaccess	David King	2013-09-02	2	-4/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11215
\| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into ticket/11215	David King	2013-09-02	6	-36/+17
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \|