forums - The forums.mageia.org Website

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'develop-olympus' into develop	Andreas Fischer	2013-07-13	1	-0/+3
\|\
\| *	Merge branch 'prep-release-3.0.12' into develop-olympus	Andreas Fischer	2013-07-13	1	-0/+3
\| \|\
\| \| *	[prep-release-3.0.12] More changelog items for the 3.0.12 release.	Andreas Fischer	2013-07-13	1	-0/+3
* \| \|	Merge remote-tracking branch 'github-phpbb/develop' into develop	Nils Adermann	2013-07-13	1	-0/+1
\|\ \ \
\| * \ \	Merge pull request #1548 from cyberalien/ticket/11687	Nathan Guse	2013-07-13	1	-0/+1
\| \|\ \ \
\| \| * \| \|	[ticket/11687] Add assets_version to phpbb_config	Vjacheslav Trushkin	2013-07-13	1	-0/+1
* \| \| \| \|	Merge branch 'develop-olympus' into develop	Nils Adermann	2013-07-13	15	-44/+44
\|\ \ \ \ \ \| \|/ / / / \|/\| \| / / \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge branch 'prep-release-3.0.12' into develop-olympus	Nils Adermann	2013-07-13	15	-44/+44
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Merge remote-tracking branch 'github-marc1706/ticket/11112' into prep-release...	Nils Adermann	2013-07-13	15	-44/+44
\| \| \|\ \
\| \| \| * \|	[ticket/11112] Do not change opensource.org link to https	Marc Alexander	2013-07-12	1	-1/+1
\| \| \| * \|	[ticket/11112] Use https for user-visible links to phpbb.com	Marc Alexander	2013-07-12	15	-44/+44
* \| \| \| \|	Merge branch 'develop-olympus' into develop	Nils Adermann	2013-07-13	1	-13/+29
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge branch 'prep-release-3.0.12' into develop-olympus	Nils Adermann	2013-07-13	1	-13/+29
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge remote-tracking branch 'github-bantu/ticket/11674' into prep-release-3....	Nils Adermann	2013-07-13	1	-13/+29
\| \| \|\ \ \
\| \| \| * \| \|	[ticket/11674] Do not include vendor folder if there are no dependencies.	Andreas Fischer	2013-07-13	1	-13/+29
* \| \| \| \| \|	Merge branch 'develop-olympus' into develop	Nils Adermann	2013-07-13	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| / \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Merge branch 'prep-release-3.0.12' into develop-olympus	Nils Adermann	2013-07-13	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge remote-tracking branch 'github-bantu/ticket/11670' into prep-release-3....	Nils Adermann	2013-07-13	1	-1/+1
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| \| * \|	[ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".	Andreas Fischer	2013-07-13	1	-1/+1
\| \| \|/ /
* \| \| \|	Merge pull request #1017 from nickvergessen/feature/softdelete-1-permission	Nathan Guse	2013-07-13	107	-1481/+5918
\|\ \ \ \
\| * \| \| \|	[ticket/9657] Define user before injecting	Joas Schilling	2013-07-13	5	-1/+5
\| * \| \| \|	[ticket/9657] Remove old code	Joas Schilling	2013-07-13	1	-1/+0
\| * \| \| \|	Merge remote-tracking branch 'phpbb/develop' into ticket/9657	Joas Schilling	2013-07-13	122	-2824/+3600
\| \|\ \ \ \
\| * \| \| \| \|	[ticket/9657] Keep approval state of posts/topics when copying them	Joas Schilling	2013-07-13	1	-6/+35
\| * \| \| \| \|	[ticket/9657] Add functional tests for forking a copy	Joas Schilling	2013-07-13	1	-0/+168
\| * \| \| \| \|	[ticket/9657] Add functional test for splitting topic	Joas Schilling	2013-07-12	1	-0/+81
\| * \| \| \| \|	[ticket/9657] Add functional test for restoring a post/topic	Joas Schilling	2013-07-12	1	-0/+73
\| * \| \| \| \|	[ticket/9657] Fix a little error when moving softdeleted topics	Joas Schilling	2013-07-12	1	-1/+0
\| * \| \| \| \|	[ticket/9657] Add unit tests for softdeleting and moving posts/topics	Joas Schilling	2013-07-12	2	-9/+478
\| * \| \| \| \|	[ticket/9657] Remove last references to m_restore permission	Joas Schilling	2013-07-12	2	-4/+2
\| * \| \| \| \|	[ticket/9657] Fix english language :(	Joas Schilling	2013-07-11	2	-2/+2
\| * \| \| \| \|	[ticket/9657] Notifications do not require emails or jabber anymore	Joas Schilling	2013-07-11	1	-2/+2
\| * \| \| \| \|	[ticket/9657] Add type hints for classes	Joas Schilling	2013-07-11	2	-2/+2
\| * \| \| \| \|	[ticket/9657] Remove sql_visibility as it is always non-empty	Joas Schilling	2013-07-11	6	-35/+15
\| * \| \| \| \|	[ticket/9657] Use include instead of include_once	Joas Schilling	2013-07-11	1	-3/+9
\| * \| \| \| \|	[ticket/9657] Initialise variable outside of the loop	Joas Schilling	2013-07-11	1	-0/+1
\| * \| \| \| \|	[ticket/9657] Fix variable naming of phpEx to php_ext	Joas Schilling	2013-07-11	1	-1/+1
\| * \| \| \| \|	[ticket/9657] Fix notification tests	Joas Schilling	2013-07-11	1	-0/+1
\| * \| \| \| \|	[ticket/9657] Fix unit tests	Joas Schilling	2013-07-11	7	-24/+34
\| * \| \| \| \|	[ticket/9657] Use the service instead of the static class	Joas Schilling	2013-07-11	19	-63/+102
\| * \| \| \| \|	[ticket/9657] Make content visibility a service and inject everything	Joas Schilling	2013-07-11	3	-94/+146
\| * \| \| \| \|	[ticket/9657] Add new line after opening diff	Joas Schilling	2013-07-11	1	-2/+4
\| * \| \| \| \|	[ticket/9657] Fix labels on confirm_delete_body.html	Joas Schilling	2013-07-11	1	-3/+3
\| * \| \| \| \|	[ticket/9657] Add , to last element of an array	Joas Schilling	2013-07-11	1	-6/+6
\| * \| \| \| \|	[ticket/9657] DO not use \" inside of double quotes	Joas Schilling	2013-07-11	1	-4/+4
\| * \| \| \| \|	[ticket/9657] Cast topic_id to integer	Joas Schilling	2013-07-11	1	-2/+2
\| * \| \| \| \|	[ticket/9657] Correctly use " vs ' and variables in queries	Joas Schilling	2013-07-11	1	-5/+5
\| * \| \| \| \|	Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permis...	Joas Schilling	2013-07-11	414	-6137/+15910
\| \|\ \ \ \ \
\| * \| \| \| \| \|	[ticket/9657] Check for post visibility when searching with Sphinx	Joas Schilling	2013-03-14	2	-2/+13
\| * \| \| \| \| \|	[ticket/9657] Correctly determine the users permissions when deleting posts	Joas Schilling	2013-03-12	1	-5/+12