forums - The forums.mageia.org Website

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'develop-ascraeus' into develop	Joas Schilling	2014-10-28	1	-2/+2
\|\
\| *	Merge branch 'prep-release-3.1.0' into develop-ascraeus	Joas Schilling	2014-10-28	1	-2/+2
\| \|\
\| \| *	Merge branch 'naderman-ticket/13232' into prep-release-3.1.0	Joas Schilling	2014-10-28	1	-2/+2
\| \| \|\
\| \| \| *	[ticket/13232] Use a cache var with _ to force TTL and shuffle cron tasks	Nils Adermann	2014-10-27	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13232
* \| \| \|	Merge branch 'develop-ascraeus' into develop	Nils Adermann	2014-10-27	1	-2/+2
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	* develop-ascraeus: [ticket/13229] Fix overloading memberlist with redundant SQL queries
\| * \| \|	Merge branch 'prep-release-3.1.0' into develop-ascraeus	Nils Adermann	2014-10-27	1	-2/+2
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	* prep-release-3.1.0: [ticket/13229] Fix overloading memberlist with redundant SQL queries
\| \| * \|	[ticket/13229] Fix overloading memberlist with redundant SQL queries	rxu	2014-10-27	1	-2/+2
\| \| \|/ \| \| \| \| \| \| \| \| \|	PHPBB3-13229
* \| \|	Merge branch 'develop-ascraeus' into develop	Nils Adermann	2014-10-27	1	-2/+5
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* develop-ascraeus: [ticket/13230] Add missing globals and missing request object for path helper [ticket/13226] Add functional test for group ranks [ticket/13226] Fix the usage of $rank_img
\| * \|	Merge branch 'prep-release-3.1.0' into develop-ascraeus	Nils Adermann	2014-10-27	1	-2/+5
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* prep-release-3.1.0: [ticket/13230] Add missing globals and missing request object for path helper [ticket/13226] Add functional test for group ranks [ticket/13226] Fix the usage of $rank_img
\| \| *	[ticket/13230] Add missing globals and missing request object for path helper	Joas Schilling	2014-10-27	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13230
* \| \|	Merge branch 'develop-ascraeus' into develop	Andreas Fischer	2014-10-26	1	-0/+1
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* develop-ascraeus: [ticket/13193] Swap ternary condition members [ticket/13193] Make template more readable [ticket/13193] Add load_search config check [ticket/13193] Add link to post count in PMs
\| * \|	Merge pull request #3054 from Senky/ticket/13193	Andreas Fischer	2014-10-26	1	-0/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/13193] Post count in PMs not a link * Senky/ticket/13193: [ticket/13193] Swap ternary condition members [ticket/13193] Make template more readable [ticket/13193] Add load_search config check [ticket/13193] Add link to post count in PMs
\| \| * \|	[ticket/13193] Swap ternary condition members	Jakub Senko	2014-10-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13193
\| \| * \|	[ticket/13193] Add load_search config check	Jakub Senko	2014-10-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13193
\| \| * \|	[ticket/13193] Add link to post count in PMs	Jakub Senko	2014-10-21	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13193
\| * \| \|	[develop-ascraeus] Update version number to 3.1.1-RC1-dev	Nils Adermann	2014-10-25	1	-1/+1
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'develop-ascraeus' into develop	Nils Adermann	2014-10-25	1	-1/+27
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* develop-ascraeus: [ticket/13207] Add notification manager mock to user_add method in tests [ticket/13207] Move default user notifications settings to user_add() [ticket/13207] Add default subscription options for newly registered users
\| * \|	[ticket/13207] Move default user notifications settings to user_add()	Marc Alexander	2014-10-25	2	-14/+18
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13207
\| * \|	[ticket/13207] Add default subscription options for newly registered users	Marc Alexander	2014-10-25	2	-2/+24
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13207
\| * \|	[prep-release-3.1.0] Update version to 3.1.0	Joas Schilling	2014-10-23	1	-1/+1
\| \| \|
* \| \|	Merge branch 'develop-ascraeus' into develop	Joas Schilling	2014-10-23	1	-1/+0
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
\| * \|	[prep-release-3.1.0-RC6] Update phpBB Version for RC7 development	Joas Schilling	2014-10-23	1	-1/+1
\| \| \|
\| * \|	[prep-release-3.1.0-RC6] Update version to 3.1.0-RC6	Joas Schilling	2014-10-23	1	-1/+1
\| \| \|
* \| \|	Merge branch 'develop-ascraeus' into develop	Joas Schilling	2014-10-23	1	-5/+14
\|\ \ \ \| \|/ /
\| * \|	Merge pull request #3 from phpbb/ticket/security-161	Joas Schilling	2014-10-23	1	-5/+14
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/security-161] Add form token to styles management form.
\| \| * \|	[ticket/security-161] Add form token to styles management form.	Cesar G	2014-10-22	1	-5/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SECURITY-161
* \| \| \|	Merge branch 'develop-ascraeus' into develop	Marc Alexander	2014-10-22	2	-1/+41
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge pull request #3058 from naderman/ticket/13205	Marc Alexander	2014-10-22	2	-1/+41
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/13205] Add a mark all messages read link to PM folders
\| \| * \| \|	[ticket/13205] Explicitly cast ids to integers and reformat SQL	Nils Adermann	2014-10-22	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13205
\| \| * \| \|	[ticket/13205] Remove superfluous newline	Nils Adermann	2014-10-22	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13205
\| \| * \| \|	[ticket/13205] Add a mark all messages read link to PM folders	Nils Adermann	2014-10-22	2	-1/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13205
* \| \| \| \|	Merge branch 'develop-ascraeus' into develop	Nils Adermann	2014-10-22	1	-2/+7
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* develop-ascraeus: [ticket/security-159] Only show first 8 characters of login keys in UCP
\| * \| \| \|	[ticket/security-159] Only show first 8 characters of login keys in UCP	Marc Alexander	2014-10-22	1	-2/+7
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	SECURITY-159
* \| \| \|	Merge branch 'develop-ascraeus' into develop	Marc Alexander	2014-10-21	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge pull request #3053 from Senky/ticket/13194	Marc Alexander	2014-10-21	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/13194] BBCode isn't parsed when issuing a warning for a post
\| \| * \| \|	[ticket/13194] Use correct array to access bbcode_bitfield	Jakub Senko	2014-10-21	1	-1/+1
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	PHPBB3-13194
* \| \| \|	Merge branch 'develop-ascraeus' into develop	Nils Adermann	2014-10-21	1	-24/+14
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	* develop-ascraeus: [ticket/13189] Do not use confirm box for marking all notifications read
\| * \| \|	[ticket/13189] Do not use confirm box for marking all notifications read	Marc Alexander	2014-10-20	1	-24/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We already use a token for preventing CSRF when marking notifications read. Making a user confirm the marking read action serves no real purpose. No information will be lost by just marking the notifications read but it will prevent users from always having to confirm this action. PHPBB3-13189
* \| \| \|	Merge branch 'develop-ascraeus' into develop	Andreas Fischer	2014-10-20	1	-2/+2
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	* develop-ascraeus: [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
\| * \| \|	Merge branch 'develop-olympus' into develop-ascraeus	Andreas Fischer	2014-10-20	1	-2/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* develop-olympus: [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
\| \| * \ \	Merge pull request #3047 from Elsensee/ticket/13168	Andreas Fischer	2014-10-20	1	-2/+2
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility * Elsensee/ticket/13168: [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
\| \| \| * \| \|	[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility	Oliver Schramm	2014-10-20	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13168
\| \| * \| \| \|	[ticket/13138] Do not use cookie data and autologin while forcing a user_id	Joas Schilling	2014-10-16	1	-28/+31
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13138
\| \| * \| \|	Merge pull request #2460 from Nicofuma/ticket/11224	Joas Schilling	2014-10-06	1	-2/+14
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/11224] SQL cache destroy does not destroy queries to tables joined
\| \| \| * \| \|	[ticket/11224] Remove new line in acm_memory.php	Tristan Darricau	2014-05-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11224
\| \| \| * \| \|	[ticket/11224] Fix coding style	Tristan Darricau	2014-05-15	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11224
\| \| \| * \| \|	[ticket/11224] Fix the blank line after ?>	Tristan Darricau	2014-05-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11224
\| \| \| * \| \|	[ticket/11224] Fix returned data	Tristan Darricau	2014-05-14	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11224
\| \| \| * \| \|	[ticket/11224] SQL cache destroy does not destroy queries to tables joined	Tristan Darricau	2014-05-14	1	-3/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://tracker.phpbb.com/browse/PHPBB3-11224 PHPBB3-11224
\| \| * \| \| \|	[ticket/13096] Add phpbb_ prefix to ldap_escape()	Jakub Senko	2014-09-23	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13096