aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'imkingdavid/ticket/11824' into developJoas Schilling2013-09-131-0/+48
|\
| * [ticket/11824] Correct a commentDavid King2013-09-061-1/+1
| | | | | | | | PHPBB3-11824
| * [ticket/11824] Add option for mod_rewriteDavid King2013-09-031-0/+48
| | | | | | | | PHPBB3-11824
* | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11373Nathan Guse2013-09-121-0/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (188) and others # Via Andreas Fischer (41) and others * 'develop' of github.com:phpbb/phpbb3: (435 commits) [ticket/11745] Correct language, coding guidelines [ticket/11828] Fix greedy operators in lexer [ticket/11835] Fix ucp_auth_link adding in migration [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved. [ticket/develop/11832] Fix path detection [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE [ticket/11833] Fix bad template loop [feature/oauth] Fix tabindex [ticket/11816] !$DOESNT_EXIST test [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php [ticket/11829] Use report_closed to determine status in MCP report_details [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ [ticket/11215] Remove unnecessary comment [ticket/11755] MySQL upgrader out of date [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. [ticket/11823] Set up nginx server to match PHP files with characters after .php [ticket/11812] Fix empty define [ticket/11818] Update Symfony dependencies to 2.3.* [feature/oauth] Fix bug on ucp_auth_link related to error display ...
| * \ [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Joseph Warner2013-09-064-34/+38
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/oauth Conflicts: phpBB/composer.json phpBB/composer.lock phpBB/develop/create_schema_files.php phpBB/includes/ucp/ucp_register.php PHPBB3-11673
| * | [feature/oauth] Update auth provider interface docs for block vars in ACPJoseph Warner2013-07-231-3/+2
| | | | | | | | | | | | PHPBB3-11673
| * | [feature/oauth] ACP options for OAuth, needs some workJoseph Warner2013-07-231-1/+9
| | | | | | | | | | | | PHPBB3-11673
* | | [ticket/11373] Prune old read notifications with cronNathan Guse2013-07-271-0/+1
| |/ |/| | | | | PHPBB3-11373
* | Merge pull request #1513 from nickvergessen/ticket/11582Nathan Guse2013-07-223-34/+37
|\ \ | | | | | | Ticket/11582 Split permission logic from translations
| * | [ticket/11582] Move global declaration to beginning of blockJoas Schilling2013-07-221-2/+1
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Fix missing closing bracketJoas Schilling2013-07-141-2/+2
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Remove left over calls to lang['acl_*']Joas Schilling2013-07-142-14/+6
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Use member isntead of a new variable everytimeJoas Schilling2013-07-141-11/+9
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Use new methods and remove duplicated entriesJoas Schilling2013-07-143-14/+20
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Add methods to return the language stringJoas Schilling2013-07-143-10/+6
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Use new class for categoriesJoas Schilling2013-07-142-7/+16
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Add new service for permissionsJoas Schilling2013-07-141-3/+6
| |/ | | | | | | | | | | Replace calls to the language-array type with a call to get_types() PHPBB3-11582
* | [ticket/11713] Do not remove module if it couldn't be deletedMarc Alexander2013-07-181-0/+1
|/ | | | | | | | Up to now, the module or module category was always removed with jQuery, even if there was an error. With this change, the modules will not be deleted by jQuery if the return JSON array will have SUCCESS set to false. PHPBB3-11713
* [ticket/11696] Rename db_tools.php so it can be autoloadedJoas Schilling2013-07-141-4/+0
| | | | PHPBB3-11696
* [ticket/11698] Moving all autoloadable files to phpbb/Nils Adermann2013-07-141-1/+1
| | | | PHPBB3-11698
* [ticket/11690] Old module class names may get autoloaded by class_existsNils Adermann2013-07-131-5/+12
| | | | PHPBB3-11690
* Merge pull request #1543 from nickvergessen/ticket/11685Nathan Guse2013-07-131-3/+1
|\ | | | | [ticket/11685] Remove logout confirmation page
| * [ticket/11685] Remove logout confirmation pageJoas Schilling2013-07-131-3/+1
| | | | | | | | PHPBB3-11685
* | Merge branch 'develop-olympus' into developNils Adermann2013-07-132-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | [ticket/11112] Use https for user-visible links to phpbb.comMarc Alexander2013-07-122-2/+2
| | | | | | | | | | | | PHPBB3-11112
* | | Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-133-12/+24
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | Merge remote-tracking branch 'remotes/Hardolaf/ticket/11626' into developNathaniel Guse2013-07-121-7/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner # Via Joseph Warner * remotes/Hardolaf/ticket/11626: [ticket/11626] Remove last reference to template in ldap [ticket/11626] Remove LDAP dependency on template [ticket/11626] Make identifier uppercase per style requirements [ticket/11626] Change the identifier template file in the template [ticket/11626] Call method only one time per provider [ticket/11626] Change interface to match functionality [ticket/11626] Include the template file in acp_board [ticket/11626] LDAP Auth ACP Template File [ticket/11626] Create get_acp_template method for auth providers
| | * | [ticket/11626] Remove LDAP dependency on templateJoseph Warner2013-07-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Returns template vars rather than requiring the template. PHPBB3-11626
| | * | [ticket/11626] Make identifier uppercase per style requirementsJoseph Warner2013-07-111-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11626
| | * | [ticket/11626] Change the identifier template file in the templateJoseph Warner2013-07-111-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11626
| | * | [ticket/11626] Call method only one time per providerJoseph Warner2013-07-111-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11626
| | * | [ticket/11626] Change interface to match functionalityJoseph Warner2013-07-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes the interface so that it matches the new functionality of phpbb_provider_auth_interface::acp(). PHPBB3-11626
| | * | [ticket/11626] Include the template file in acp_boardJoseph Warner2013-07-111-5/+3
| | | | | | | | | | | | | | | | PHPBB3-11626
| * | | Merge pull request #1515 from Hardolaf/feature/auth-refactorNathan Guse2013-07-121-1/+5
| |\ \ \ | | | | | | | | | | [feature/auth-refactor] Use a base class for all authentication providers
| | * | | [feature/auth-refactor] Fix style issueJoseph Warner2013-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9734
| | * | | [feature/auth-refactor] Fix typoJoseph Warner2013-07-111-1/+1
| | |/ / | | | | | | | | | | | | PHPBB3-9734
| | * | [feature/auth-refactor] Remove invalid providers from acp selectJoseph Warner2013-07-111-6/+4
| | | | | | | | | | | | | | | | PHPBB3-9734
| | * | [feature/auth-refactor] Check that providers implement auth interfaceJoseph Warner2013-07-111-0/+6
| | | | | | | | | | | | | | | | PHPBB3-9734
| * | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-121-1/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11548] Fix incorrect usage of array_map on acp groups page Conflicts: tests/functional/common_groups_test.php tests/functional/ucp_groups_test.php
| | * | [ticket/11548] Fix incorrect usage of array_map on acp groups pageMarc Alexander2013-07-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The array_map was only ran on small parts of the actual error array instead of the whole one. This resulted in the output of the language variables' names rather than their actual value. PHPBB3-11548
| | * | Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympusNathaniel Guse2013-07-111-3/+11
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/8319: [ticket/8319] Do not repeat the replacement [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse
| * | \ \ Merge branch 'ticket/8319' into ticket/8319-develop2Joas Schilling2013-07-101-3/+11
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/8319: [ticket/8319] Do not repeat the replacement [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse Conflicts: phpBB/install/database_update.php
| | * | [ticket/8319] Do not repeat the replacementJoas Schilling2013-07-101-9/+5
| | | | | | | | | | | | | | | | PHPBB3-8319
| | * | [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URLJoas Schilling2013-06-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The explanation now states that links are prefixed with the board URL. PHPBB3-8319
| | * | [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL partsJoas Schilling2013-06-031-0/+4
| | | | | | | | | | | | | | | | PHPBB3-8319
| | * | [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuseJoas Schilling2013-06-031-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The description says: "The URL must be relative to the topic page and cannot contain a server name or protocol." We now enforce this and will add a new token with the current behaviour back. PHPBB3-8319
* | | | Merge remote-tracking branch 'phpbb/develop' into ↵Joas Schilling2013-07-1112-305/+286
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * phpbb/develop: (704 commits) [ticket/11630] Improvements to the PHP lint pre-commit hook [feature/auth-refactor] Move auth providers to separate directory [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling. [ticket/11619] Some tests for get_remote_file(). [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [ticket/10838] Fix URL for wiki and remove irrelevant line [ticket/10838] Remove php 5.4 and builtin server references [ticket/10838] Fix missing data [ticket/10838] separate database used mentioned in unit tests [ticket/11585] Make $auth_admin class property [feature/auth-refactor] A possible fix for the functional test failures [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init ... Conflicts: phpBB/docs/sphinx.sample.conf phpBB/feed.php phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/viewforum_body.html
| * | | Merge remote-tracking branch 'Hardolaf/feature/auth-refactor' into developDavid King2013-07-031-87/+40
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Hardolaf/feature/auth-refactor: (44 commits) [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [feature/auth-refactor] A possible fix for the functional test failures [feature/auth-refactor] Forgot @inheritdoc on methods [feature/auth-refactor] Finish and clean up documentation [feature/auth-refactor] Change phpEx to php_ext in new classes [feature/auth-refactor] Fix two session tests broken by changes [feature/auth-refactor] Removed no longer used variable [feature/auth-refactor] Fix errors in acp_board [feature/auth-refactor] Fix indentation on acp_board [feature/auth-refactor] Refactor auth in acp_board [feature/auth-refactor] Don't truncate name then reattach same thing [feature/auth-refactor] Remove old auth plugins [feature/auth-refactor] Remove references to old auth plugins [feature/auth-refactor] Fix auth tests to use mock objects correctly [feature/auth-refactor] Test validate_session on provider_apache [feature/auth-refactor] Test autologin() on provider_apache [feature/auth-refactor] Test login() for provider_apache [feature/auth-refactor] Test for init on provider_apache ...
| | * | | [feature/auth-refactor] Fix code style issueJoseph Warner2013-07-021-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-9734
| | * | | [feature/auth-refactor] Removed no longer used variableJoseph Warner2013-06-261-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-9734
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-21 22:13:18 +0000