forums - The forums.mageia.org Website

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'develop-ascraeus' into develop	Joas Schilling	2014-11-22	1	-1/+1
\|\
\| *	Merge pull request #3161 from Crizz0/ticket/12885	Joas Schilling	2014-11-22	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \|	[ticket/12885] New if for Index-page - board-index-text switch
\| \| *	[ticket/12885] New if for Index-page - board-index-text switch	Crizzo	2014-11-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-12885
* \| \|	Merge branch 'develop-ascraeus' into develop	Joas Schilling	2014-11-22	1	-0/+2
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'develop-olympus' into develop-ascraeus	Joas Schilling	2014-11-22	1	-0/+2
\| \|\ \
\| \| * \	Merge pull request #3164 from Crizz0/ticket/10442	Joas Schilling	2014-11-22	1	-0/+2
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/10442] Adds <dd> </dd> to <dl> for xhtml correctness
\| \| \| * \|	[ticket/10442] Adds <dd> </dd> to <dl> for xhtml correctness	Crizzo	2014-11-22	1	-0/+2
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10442
* \| \| \|	Merge pull request #3162 from nickvergessen/ticket/13359	Marc Alexander	2014-11-22	1	-1/+29
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/13359] Add phpbb\template\twig\environment to template constructor
\| * \| \| \|	[ticket/13359] Add phpbb\template\twig\environment to template constructor	Joas Schilling	2014-11-22	1	-1/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13359
* \| \| \| \|	Merge branch 'develop-ascraeus' into develop	Marc Alexander	2014-11-22	2	-2/+26
\|\ \ \ \ \ \| \|/ / / / \|/\| / / / \| \|/ / /
\| * \| \|	Merge pull request #3094 from nickvergessen/ticket/10744	Marc Alexander	2014-11-22	2	-2/+26
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \|	Ticket/10744 Prevent installing styles with reserved names
\| \| * \|	[ticket/10744] Fix some doc blocks	Joas Schilling	2014-11-21	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10744
\| \| * \|	[ticket/10744] Type hint objects for IDE usages	Joas Schilling	2014-11-21	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10744
\| \| * \|	[ticket/10744] Prevent installing styles with reserved names	Joas Schilling	2014-11-21	2	-0/+8
\| \|/ / \| \| \| \| \| \| \| \| \|	PHPBB3-10744
* \| \|	Merge branch 'develop-ascraeus' into develop	Joas Schilling	2014-11-21	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	Merge pull request #3127 from omniError/ticket/13323	Joas Schilling	2014-11-21	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/13323] empty auth option in posting.php
\| \| * \|	[ticket/13323] empty auth option in posting.php	omniError	2014-11-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://tracker.phpbb.com/browse/PHPBB3-13323 PHPBB3-13323
* \| \| \|	Merge branch 'develop-ascraeus' into develop	Joas Schilling	2014-11-21	3	-3/+3
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: phpBB/styles/subsilver2/template/memberlist_email.html
\| * \| \|	Merge pull request #3108 from Elsensee/ticket/13284	Joas Schilling	2014-11-21	4	-5/+5
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/13284] Message body not included in email
\| \| * \| \|	[ticket/13284] Set message body in topic form too, so it will be sent	Oliver Schramm	2014-11-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13284
\| \| * \| \|	[ticket/13284] Fix request name so users can cc themselves	Oliver Schramm	2014-11-04	3	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13284
* \| \| \| \|	Merge branch 'develop-ascraeus' into develop	Joas Schilling	2014-11-21	1	-1/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge pull request #3068 from marc1706/ticket/13204	Joas Schilling	2014-11-21	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/13204] Tell user that password was incorrect when exceeding attempts
\| \| * \| \| \|	[ticket/13204] Tell user that password was incorrect when exceeding attempts	Marc Alexander	2014-11-02	1	-1/+1
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	At the end of the login method, the captcha was entered correctly and only the password was incorrect. Therefore, just tell the user that the password was incorrect. He will see that he still needs to enter a captcha. PHPBB3-13204
* \| \| \| \|	Merge branch 'develop-ascraeus' into develop	Joas Schilling	2014-11-21	3	-19/+105
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge pull request #3064 from marc1706/ticket/13197	Joas Schilling	2014-11-21	3	-19/+105
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/13197] Also delete group avatar from users that have it set
\| \| * \| \| \|	[ticket/13197] Fix tabbing	Marc Alexander	2014-11-09	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13197
\| \| * \| \| \|	[ticket/13197] Correctly format sql query	Marc Alexander	2014-11-09	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13197
\| \| * \| \| \|	[ticket/13197] Test that user's group avatar is deleted by group avatar delete	Marc Alexander	2014-10-26	2	-11/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13197
\| \| * \| \| \|	[ticket/13197] Also delete group avatar from users that have it set	Marc Alexander	2014-10-25	1	-7/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13197
* \| \| \| \| \|	Merge branch 'develop-ascraeus' into develop	Joas Schilling	2014-11-21	1	-2/+4
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge pull request #3156 from prototech/ticket/13316	Joas Schilling	2014-11-21	1	-2/+4
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/13316] Ensure Recaptcha image uses https when necessary.
\| \| * \| \| \| \|	[ticket/13316] Ensure Recaptcha image uses https when necessary.	Cesar G	2014-11-21	1	-2/+4
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13316
* \| \| \| \| \|	Merge branch 'develop-ascraeus' into develop	Joas Schilling	2014-11-21	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge pull request #3144 from marc1706/ticket/13337	Joas Schilling	2014-11-21	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/13337] Do not use SQL IN comparison with empty array
\| \| * \| \| \| \|	[ticket/13337] Allow empty array passed to sql_in_set()	Marc Alexander	2014-11-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	is_array() will evaluate to true even if the array is just an empty array. Make sure we also expect an empty array passed to sql_in_set(). PHPBB3-13337
* \| \| \| \| \| \|	Merge branch 'develop-ascraeus' into develop	Joas Schilling	2014-11-21	2	-2/+16
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: phpBB/styles/subsilver2/template/confirm_delete_body.html
\| * \| \| \| \| \|	Merge pull request #3044 from Elsensee/ticket/13100	Joas Schilling	2014-11-21	3	-2/+18
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/13100] Display only confirmation buttons when deleting shadow topic
\| \| * \| \| \| \| \|	[ticket/13100] Remove pointless variable	Oliver Schramm	2014-11-04	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13100
\| \| * \| \| \| \| \|	[ticket/13100] Display only confirmation buttons when deleting shadow topic	Oliver Schramm	2014-10-20	3	-2/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13100
* \| \| \| \| \| \| \|	Merge branch 'develop-ascraeus' into develop	Joas Schilling	2014-11-21	5	-13/+116
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge pull request #3023 from Nicofuma/ticket/13133	Joas Schilling	2014-11-21	5	-13/+116
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/13133] Allow @vendor_name for includecss
\| \| * \| \| \| \| \| \|	[ticket/13133] Rename $ok variable	Tristan Darricau	2014-11-07	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13133
\| \| * \| \| \| \| \| \|	[ticket/13133] Add unit tests	Tristan Darricau	2014-10-09	4	-9/+88
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13133
\| \| * \| \| \| \| \| \|	[ticket/13133] Allow @vendor_name for includecss	Tristan Darricau	2014-10-08	1	-4/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13133
* \| \| \| \| \| \| \| \|	Merge branch 'develop-ascraeus' into develop	Joas Schilling	2014-11-21	4	-14/+78
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge pull request #2765 from Elsensee/ticket/11863	Joas Schilling	2014-11-21	4	-14/+78
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/11863] Set require_activation to none if emails are disabled
\| \| * \| \| \| \| \| \| \|	[ticket/11863] Add functional test	Oliver Schramm	2014-10-17	1	-0/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11863
\| \| * \| \| \| \| \| \| \|	[ticket/11863] Display warning to user because of activation method	Oliver Schramm	2014-10-17	2	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11863
\| \| * \| \| \| \| \| \| \|	[ticket/11863] Grey out unavailable activation methods when emails disabled	Oliver Schramm	2014-10-17	3	-13/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Further fall back to USER_ACTIVATION_DISABLE when emails are disabled but evaluate it at runtime. PHPBB3-11863