aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11582] Add methods to return the language stringJoas Schilling2013-07-144-10/+35
| | | | PHPBB3-11582
* [ticket/11582] Add event in constructor and add docsJoas Schilling2013-07-142-42/+62
| | | | PHPBB3-11582
* [ticket/11582] Fix event dispatcher class nameJoas Schilling2013-07-141-3/+3
| | | | PHPBB3-11582
* [ticket/11582] Use new class for categoriesJoas Schilling2013-07-144-37/+44
| | | | PHPBB3-11582
* [ticket/11582] Add new service for permissionsJoas Schilling2013-07-144-13/+280
| | | | | | Replace calls to the language-array type with a call to get_types() PHPBB3-11582
* [ticket/11696] Move file to new directoryJoas Schilling2013-07-141-0/+0
| | | | PHPBB3-11696
* [ticket/11696] Rename constructor to __construct()Joas Schilling2013-07-141-1/+1
| | | | PHPBB3-11696
* [ticket/11696] Rename db_tools.php so it can be autoloadedJoas Schilling2013-07-146-26/+2
| | | | PHPBB3-11696
* [ticket/11698] Moving all autoloadable files to phpbb/Nils Adermann2013-07-14251-20/+15
| | | | PHPBB3-11698
* Merge pull request #1555 from EXreaction/ticket/11692Nils Adermann2013-07-131-1/+4
|\ | | | | [ticket/11692] Don't update search_type in dev migration if already appended
| * [ticket/11692] Don't update search_type in dev migration if already appendedNathaniel Guse2013-07-131-1/+4
| | | | | | | | PHPBB3-11692
* | [ticket/11694] Do not locate assets with root pathVjacheslav Trushkin2013-07-131-1/+1
| | | | | | | | | | | | Do not locate assets that start with ./ PHPBB3-11694
* | [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
* | [ticket/11690] Old module class names may get autoloaded by class_existsNils Adermann2013-07-131-5/+12
| | | | | | | | PHPBB3-11690
* | 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 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-131-2/+1
|\ \ \ | | | | | | | | [ticket/11684] Remove useless confirmation page after login and admin login
| * | | [ticket/11684] Remove useless confirmation page after login and admin loginJoas Schilling2013-07-131-2/+1
| | | | | | | | | | | | | | | | PHPBB3-11684
* | | | Merge pull request #1543 from nickvergessen/ticket/11685Nathan Guse2013-07-132-10/+7
|\ \ \ \ | | | | | | | | | | [ticket/11685] Remove logout confirmation page
| * | | | [ticket/11685] Remove logout confirmation pageJoas Schilling2013-07-132-10/+7
| |/ / / | | | | | | | | | | | | 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-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | * develop-olympus: [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
| * | | | | Merge branch 'prep-release-3.0.12' into develop-olympusNils Adermann2013-07-131-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
| | * | | | [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".Andreas Fischer2013-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11670
* | | | | | Merge pull request #1017 from nickvergessen/feature/softdelete-1-permissionNathan Guse2013-07-1392-1472/+3505
|\ \ \ \ \ \ | | | | | | | | | | | | | | Soft delete
| * | | | | | [ticket/9657] Remove old codeJoas Schilling2013-07-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| * | | | | | Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-1377-2321/+2951
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: (216 commits) [ticket/11626] Remove last reference to template in ldap [ticket/11626] Remove LDAP dependency on template [develop-olympus] Increment version number to 3.0.13-dev. [develop-olympus] Add changelog for 3.0.12 release. [develop-olympus] Bump version numbers for 3.0.12-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.12 releases. [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./) [ticket/11668] Run lint test at the end of the test suite [ticket/11548] Fix test errors in groups test on develop [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0 [ticket/11548] Fix incorrect usage of array_map on acp groups page [ticket/11665] Fix test class name [ticket/11664] Stop creating php.html file in root path in tests [ticket/11665] Can't change file names already sent to set_filenames [ticket/11662] Typos: occured -> occurred [ticket/11662] Typos: occured -> occurred [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect) [feature/auth-refactor] Add parent::setUp() in setUp() [feature/auth-refactor] Changes [feature/auth-refactor] DataProvider for acp_board test ...
| * | | | | | | [ticket/9657] Keep approval state of posts/topics when copying themJoas Schilling2013-07-131-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| * | | | | | | [ticket/9657] Fix a little error when moving softdeleted topicsJoas Schilling2013-07-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657