aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' into ticket/11215David King2013-07-141-1/+1
|\ | | | | | | | | * develop: [ticket/11694] Do not locate assets with root path
| * Merge remote-tracking branch 'cyberalien/ticket/11694' into developDavid King2013-07-131-1/+1
| |\ | | | | | | | | | | | | * cyberalien/ticket/11694: [ticket/11694] Do not locate assets with root path
| | * [ticket/11694] Do not locate assets with root pathVjacheslav Trushkin2013-07-131-1/+1
| |/ | | | | | | | | | | Do not locate assets that start with ./ PHPBB3-11694
* | Merge branch 'develop' into ticket/11215David King2013-07-1313-60/+229
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: [ticket/11675] Fix template loop [ticket/11690] Old module class names may get autoloaded by class_exists [ticket/9649] Display information on index for moderators on unapproved posts [ticket/11686] Not checking for phpBB Debug errors on functional tests [ticket/11553] Typo [ticket/11553] Replace bullet with unicode [ticket/11553] Move bulletin points to pseudo class [ticket/11600] Remove duplicate test case [ticket/11600] Use lowercase null and remove duplicate test cases [ticket/11600] Use local variable for $user in test_localize_errors [ŧicket/11600] Split get driver tests into tests for all and only enabled ones [ticket/11600] Increase code test coverage of avatar manager
| * Merge pull request #1554 from EXreaction/ticket/11675Nils Adermann2013-07-131-1/+1
| |\ | | | | | | [ticket/11675] Fix template loop
| | * [ticket/11675] Fix template loopNathaniel Guse2013-07-131-1/+1
| |/ | | | | | | PHPBB3-11675
| * Merge pull request #1429 from cyberalien/ticket/11553Nathan Guse2013-07-136-29/+85
| |\ | | | | | | Move bulletin points for linklist lists to pseudo classes
| | * [ticket/11553] TypoVjacheslav Trushkin2013-07-111-1/+1
| | | | | | | | | | | | PHPBB3-11553
| | * [ticket/11553] Replace bullet with unicodeVjacheslav Trushkin2013-07-111-2/+2
| | | | | | | | | | | | PHPBB3-11553
| | * [ticket/11553] Move bulletin points to pseudo classVjacheslav Trushkin2013-07-116-29/+85
| | | | | | | | | | | | | | | | | | | | | Move bulletin points for .linklist lists to pseudo class Group pseudo classes for .linklist.bulletin and .icon-notification PHPBB3-11553
| * | Merge pull request #1553 from naderman/ticket/11690Nathan Guse2013-07-131-5/+12
| |\ \ | | | | | | | | [ticket/11690] Old module class names may get autoloaded by class_exists
| | * | [ticket/11690] Old module class names may get autoloaded by class_existsNils Adermann2013-07-131-5/+12
| | | | | | | | | | | | | | | | PHPBB3-11690
| * | | Merge branch 'develop-olympus' into developNils Adermann2013-07-131-0/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | * develop-olympus: [ticket/11686] Not checking for phpBB Debug errors on functional tests
| | * | Merge remote-tracking branch 'github-exreaction/ticket/11686' into ↵Nils Adermann2013-07-131-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-exreaction/ticket/11686: [ticket/11686] Not checking for phpBB Debug errors on functional tests
| | | * | [ticket/11686] Not checking for phpBB Debug errors on functional testsNathaniel Guse2013-07-131-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11686
| * | | | Merge pull request #1473 from marc1706/ticket/11600Nathan Guse2013-07-131-22/+108
| |\ \ \ \ | | | | | | | | | | | | [ticket/11600] Increase code test coverage of avatar manager
| | * | | | [ticket/11600] Remove duplicate test caseMarc Alexander2013-07-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11600
| | * | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11600Marc Alexander2013-07-0483-1542/+3338
| | |\ \ \ \
| | * | | | | [ticket/11600] Use lowercase null and remove duplicate test casesMarc Alexander2013-06-251-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11600
| | * | | | | [ticket/11600] Use local variable for $user in test_localize_errorsMarc Alexander2013-06-251-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11600
| | * | | | | [ŧicket/11600] Split get driver tests into tests for all and only enabled onesMarc Alexander2013-06-251-10/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11600
| | * | | | | [ticket/11600] Increase code test coverage of avatar managerMarc Alexander2013-06-101-22/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, not all methods and their possible behaviors are tested with unit tests. Add them for better code coverage. PHPBB3-11600
| * | | | | | Merge pull request #1550 from nickvergessen/ticket/9649Nathan Guse2013-07-133-3/+22
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/9649] Display information on index for moderators on unapproved posts
| | * | | | | | [ticket/9649] Display information on index for moderators on unapproved postsJoas Schilling2013-07-133-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9649
* | | | | | | | Merge branch 'develop' into ticket/11215David King2013-07-13128-1606/+6060
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (214 commits) [ticket/10999] Fix assets_version in ACP [prep-release-3.0.12] More changelog items for the 3.0.12 release. [ticket/11687] Add assets_version to phpbb_config [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)". [ticket/11674] Do not include vendor folder if there are no dependencies. [ticket/11685] Remove logout confirmation page [ticket/11684] Remove useless confirmation page after login and admin login [ticket/9657] Define user before injecting [ticket/9657] Remove old code [ticket/9657] Keep approval state of posts/topics when copying them [ticket/9657] Add functional tests for forking a copy [ticket/9657] Add functional test for splitting topic [ticket/11112] Do not change opensource.org link to https [ticket/9657] Add functional test for restoring a post/topic [ticket/11112] Use https for user-visible links to phpbb.com [ticket/9657] Fix a little error when moving softdeleted topics [ticket/9657] Add unit tests for softdeleting and moving posts/topics [ticket/9657] Remove last references to m_restore permission [ticket/9657] Fix english language :( [ticket/9657] Notifications do not require emails or jabber anymore ...
| * | | | | | | Merge pull request #1436 from cyberalien/ticket/11563Nathan Guse2013-07-135-50/+50
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix subPanels() in forum_fn.js
| | * | | | | | | [ticket/11563] Remove duplicate codeVjacheslav Trushkin2013-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11563
| | * | | | | | | [ticket/11563] Dynamically generate panels listVjacheslav Trushkin2013-07-113-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11563
| | * | | | | | | [ticket/11563] Remove unused JS variablesVjacheslav Trushkin2013-07-111-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused JS variables from posting_buttons PHPBB3-11563
| | * | | | | | | [ticket/11563] Fix subPanels()Vjacheslav Trushkin2013-07-114-47/+47
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix subPanels() code Modernize subPanels() with jQuery Use HTML5 data attributes instead of including JS PHPBB3-11563
| * | | | | | | Merge pull request #1541 from nickvergessen/ticket/11684Nathan Guse2013-07-132-4/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/11684] Remove useless confirmation page after login and admin login
| | * | | | | | | [ticket/11684] Remove useless confirmation page after login and admin loginJoas Schilling2013-07-132-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11684
| * | | | | | | | Merge pull request #1543 from nickvergessen/ticket/11685Nathan Guse2013-07-134-12/+8
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ticket/11685] Remove logout confirmation page
| | * | | | | | | | [ticket/11685] Remove logout confirmation pageJoas Schilling2013-07-134-12/+8
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11685
| * | | | | | | | Merge pull request #1549 from cyberalien/ticket/10999Nathan Guse2013-07-132-1/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ticket/10999] Fix assets_version in ACP
| | * | | | | | | | [ticket/10999] Fix assets_version in ACPVjacheslav Trushkin2013-07-132-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10999
| * | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-131-0/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | / / | | | |_|_|_|_|/ / | | |/| | | | | | * develop-olympus: [prep-release-3.0.12] More changelog items for the 3.0.12 release.
| | * | | | | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-131-0/+3
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] More changelog items for the 3.0.12 release.
| | | * | | | | | | [prep-release-3.0.12] More changelog items for the 3.0.12 release.Andreas Fischer2013-07-131-0/+3
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'github-phpbb/develop' into developNils Adermann2013-07-131-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: [ticket/11687] Add assets_version to phpbb_config
| | * \ \ \ \ \ \ \ \ Merge pull request #1548 from cyberalien/ticket/11687Nathan Guse2013-07-131-0/+1
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11687] Add assets_version to phpbb_config
| | | * | | | | | | | | [ticket/11687] Add assets_version to phpbb_configVjacheslav Trushkin2013-07-131-0/+1
| | | | |_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11687
| * | | | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-07-1315-44/+44
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | / / / / / / / | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11112] Do not change opensource.org link to https [ticket/11112] Use https for user-visible links to phpbb.com Conflicts: phpBB/language/en/install.php phpBB/language/en/ucp.php
| | * | | | | | | | Merge branch 'prep-release-3.0.12' into develop-olympusNils Adermann2013-07-1315-44/+44
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11112] Do not change opensource.org link to https [ticket/11112] Use https for user-visible links to phpbb.com
| | | * | | | | | | Merge remote-tracking branch 'github-marc1706/ticket/11112' into ↵Nils Adermann2013-07-1315-44/+44
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.12 * github-marc1706/ticket/11112: [ticket/11112] Do not change opensource.org link to https [ticket/11112] Use https for user-visible links to phpbb.com
| | | | * | | | | | | [ticket/11112] Do not change opensource.org link to httpsMarc Alexander2013-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11112
| | | | * | | | | | | [ticket/11112] Use https for user-visible links to phpbb.comMarc Alexander2013-07-1215-44/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11112
| * | | | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-07-131-13/+29
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11674] Do not include vendor folder if there are no dependencies.
| | * | | | | | | | | Merge branch 'prep-release-3.0.12' into develop-olympusNils Adermann2013-07-131-13/+29
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11674] Do not include vendor folder if there are no dependencies.
| | | * | | | | | | | Merge remote-tracking branch 'github-bantu/ticket/11674' into ↵Nils Adermann2013-07-131-13/+29
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.12 * github-bantu/ticket/11674: [ticket/11674] Do not include vendor folder if there are no dependencies.
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-04 00:24:52 +0000