forums - The forums.mageia.org Website

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '3.1.x'	Cesar G	2015-05-31	2	-2/+6
\|\ \| \| \| \| \| \| \| \|	* 3.1.x: [ticket/13905] Don't load loading.gif until needed.
\| *	Merge remote-tracking branch 'callumacrae/ticket/13905' into 3.1.x	Cesar G	2015-05-31	2	-2/+6
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	* callumacrae/ticket/13905: [ticket/13905] Don't load loading.gif until needed.
\| \| *	[ticket/13905] Don't load loading.gif until needed.	Callum Macrae	2015-05-31	2	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13905
* \| \|	Merge branch '3.1.x'	Marc Alexander	2015-05-31	6	-96/+218
\|\ \ \ \| \|/ /
\| * \|	Merge pull request #3668 from callumacrae/js-linting	Marc Alexander	2015-05-31	6	-96/+218
\| \|\ \ \| \| \|/ \| \|/\| \| \| \|	[ticket/13898] js coding standards
\| \| *	[ticket/13898] Moved jshint and jscs rcs to correct dir.	Callum Macrae	2015-05-31	2	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13898
\| \| *	[ticket/13898] Fixed all the forum_fn.js violations I understood	Callum Macrae	2015-05-30	1	-25/+37
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13898
\| \| *	[ticket/13898] Allow underscores :(	Callum Macrae	2015-05-30	2	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13898
\| \| *	[ticket/13898] 4 spaces, not 2	Callum Macrae	2015-05-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13898
\| \| *	[ticket/13898] js coding standaaards	Callum Macrae	2015-05-30	5	-70/+181
\| \|/ \| \| \| \| \| \|	PHPBB3-13898
* \|	Merge pull request #3670 from s9e/ticket/8420	Marc Alexander	2015-05-31	1	-0/+14
\|\ \ \| \| \| \| \| \| \| \| \|	[ticket/8420] Emoticon removes space before itself when using preview
\| * \|	[ticket/8420] Added regression test	JoshyPHP	2015-05-31	1	-0/+14
\|/ / \| \| \| \| \| \|	PHPBB3-8420
* \|	Merge pull request #3592 from Nicofuma/ticket/13388	Nils Adermann	2015-05-30	6	-10/+157
\|\ \ \| \| \| \| \| \|	[ticket/13388] Integrate routing and di parameters resolution
\| * \|	[ticket/13388] Fix coding style	Tristan Darricau	2015-05-30	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13388
\| * \|	[ticket/13388] Fix deprecations	Tristan Darricau	2015-05-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13388
\| * \|	[ticket/13388] Fix rebase	Tristan Darricau	2015-05-29	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13388
\| * \|	[ticket/13388] Address comments	Tristan Darricau	2015-05-29	1	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13388
\| * \|	[ticket/13388] Integrate routing and di parameters resolution	Tristan Darricau	2015-05-29	6	-10/+156
\| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13388
* \| \|	Merge branch '3.1.x'	Oliver Schramm	2015-05-30	1	-0/+1
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge pull request #3638 from naderman/ticket/13874	Oliver Schramm	2015-05-30	1	-0/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/13874] Add master to sami API docs
\| \| * \|	[ticket/13874] Add master to sami API docs	Nils Adermann	2015-05-28	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13874
* \| \| \|	Merge branch '3.1.x'	Marc Alexander	2015-05-30	4	-261/+199
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: phpBB/styles/subsilver2/template/posting_body.html
\| * \| \|	Merge pull request #3658 from callumacrae/js-refactoring-again	Marc Alexander	2015-05-30	5	-262/+200
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	JS Refactoring
\| \| * \| \|	[ticket/13887] Made readable code DRY	Callum Macrae	2015-05-29	1	-16/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13887
\| \| * \| \|	[ticket/13887] Made unreadable code readable	Callum Macrae	2015-05-29	1	-14/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13887
\| \| * \| \|	[ticket/13887] Minor JS refactoring	Callum Macrae	2015-05-29	5	-58/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13887
\| \| * \| \|	[ticket/13887] Use correct JSDoc syntax	Callum Macrae	2015-05-29	3	-190/+128
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13887
* \| \| \| \|	Merge pull request #3665 from Nicofuma/ticket/13896	Nils Adermann	2015-05-30	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix conding style
\| * \| \| \| \|	[ticket/13896] Fix coding style	Tristan Darricau	2015-05-30	1	-1/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13896
* \| \| \| \|	Merge branch '3.1.x'	Marc Alexander	2015-05-30	1	-2/+9
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge pull request #3545 from VSEphpbb/ticket/13771	Marc Alexander	2015-05-30	1	-2/+9
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/13771] Allow AJAX errors to support exceptions messages
\| \| * \| \| \|	[ticket/13771] Only handle valid JQHXR response objects	Matt Friedman	2015-05-04	1	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13771
\| \| * \| \| \|	[ticket/13771] Allow AJAX errors to support exceptions messages	Matt Friedman	2015-04-21	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13771
* \| \| \| \| \|	Merge branch '3.1.x'	Nils Adermann	2015-05-30	22	-311/+282
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 3.1.x: [ticket/13790] Update phpcs Conflicts: phpBB/composer.json phpBB/composer.lock
\| * \| \| \| \|	Merge pull request #3560 from Nicofuma/ticket/13790	Nils Adermann	2015-05-30	23	-126/+109
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/13790] Update phpcs
\| \| * \| \| \| \|	[ticket/13790] Update phpcs	Tristan Darricau	2015-05-19	23	-126/+109
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13790
* \| \| \| \| \| \|	Merge branch '3.1.x'	Andreas Fischer	2015-05-29	1	-0/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 3.1.x: [ticket/13875] Ignore cache, ext, and store folder in lint test
\| * \| \| \| \| \|	Merge branch '3.0.x' into 3.1.x	Andreas Fischer	2015-05-29	1	-0/+2
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 3.0.x: [ticket/13875] Ignore cache, ext, and store folder in lint test Conflicts: tests/lint_test.php
\| \| * \| \| \| \|	Merge pull request #3639 from marc1706/ticket/13875	Andreas Fischer	2015-05-29	1	-0/+2
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/13875] Ignore cache, ext, and store folder in lint test * marc1706/ticket/13875: [ticket/13875] Ignore cache, ext, and store folder in lint test
\| \| \| * \| \| \| \|	[ticket/13875] Ignore cache, ext, and store folder in lint test	Marc Alexander	2015-05-28	1	-0/+2
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13875
* \| \| \| \| \| \|	Merge pull request #3660 from Nicofuma/ticket/13890	Oliver Schramm	2015-05-29	1	-0/+12
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/13890] Fix di tests
\| * \| \| \| \| \|	[ticket/13890] Fix di tests	Tristan Darricau	2015-05-29	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-13890
* \| \| \| \| \| \|	Merge pull request #3561 from s9e/ticket/10922	Tristan Darricau	2015-05-29	3	-4/+31
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ticket/10922] Added support for body and subject in email BBCode
\| * \| \| \| \| \| \|	[ticket/10922] Added test	JoshyPHP	2015-04-28	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10922
\| * \| \| \| \| \| \|	[ticket/10922] Added test data	JoshyPHP	2015-04-28	2	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10922
\| * \| \| \| \| \| \|	[ticket/10922] Added tests	JoshyPHP	2015-04-28	2	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10922
\| * \| \| \| \| \| \|	[ticket/10922] Replaced urlencode() with rawurlencode()	JoshyPHP	2015-04-28	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RFC-6068 asks for percent-encoding so that seems more correct. Not sure about that one. PHPBB3-10922
\| * \| \| \| \| \| \|	[ticket/10922] Added support for body and subject in email BBCode	JoshyPHP	2015-04-28	3	-4/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10922
* \| \| \| \| \| \| \|	Merge pull request #3383 from nickvergessen/ticket/9109	Tristan Darricau	2015-05-29	5	-15/+181
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ticket/9109 Properly document and calculate the group settings with value 0
\| * \| \| \| \| \| \| \|	[ticket/9109] Improve docblock and fix spelling errors	Marc Alexander	2015-02-08	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-9109