aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1513 from nickvergessen/ticket/11582Nathan Guse2013-07-223-34/+37
|\
| * [ticket/11582] Move global declaration to beginning of blockJoas Schilling2013-07-221-2/+1
| * [ticket/11582] Fix missing closing bracketJoas Schilling2013-07-141-2/+2
| * [ticket/11582] Remove left over calls to lang['acl_*']Joas Schilling2013-07-142-14/+6
| * [ticket/11582] Use member isntead of a new variable everytimeJoas Schilling2013-07-141-11/+9
| * [ticket/11582] Use new methods and remove duplicated entriesJoas Schilling2013-07-143-14/+20
| * [ticket/11582] Add methods to return the language stringJoas Schilling2013-07-143-10/+6
| * [ticket/11582] Use new class for categoriesJoas Schilling2013-07-142-7/+16
| * [ticket/11582] Add new service for permissionsJoas Schilling2013-07-141-3/+6
* | [ticket/11713] Do not remove module if it couldn't be deletedMarc Alexander2013-07-181-0/+1
|/
* [ticket/11696] Rename db_tools.php so it can be autoloadedJoas Schilling2013-07-141-4/+0
* [ticket/11698] Moving all autoloadable files to phpbb/Nils Adermann2013-07-141-1/+1
* [ticket/11690] Old module class names may get autoloaded by class_existsNils Adermann2013-07-131-5/+12
* Merge pull request #1543 from nickvergessen/ticket/11685Nathan Guse2013-07-131-3/+1
|\
| * [ticket/11685] Remove logout confirmation pageJoas Schilling2013-07-131-3/+1
* | Merge branch 'develop-olympus' into developNils Adermann2013-07-132-2/+2
|\ \
| * | [ticket/11112] Use https for user-visible links to phpbb.comMarc Alexander2013-07-122-2/+2
* | | Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-133-12/+24
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'remotes/Hardolaf/ticket/11626' into developNathaniel Guse2013-07-121-7/+6
| |\ \
| | * | [ticket/11626] Remove LDAP dependency on templateJoseph Warner2013-07-121-1/+2
| | * | [ticket/11626] Make identifier uppercase per style requirementsJoseph Warner2013-07-111-1/+1
| | * | [ticket/11626] Change the identifier template file in the templateJoseph Warner2013-07-111-1/+1
| | * | [ticket/11626] Call method only one time per providerJoseph Warner2013-07-111-1/+1
| | * | [ticket/11626] Change interface to match functionalityJoseph Warner2013-07-111-2/+2
| | * | [ticket/11626] Include the template file in acp_boardJoseph Warner2013-07-111-5/+3
| * | | Merge pull request #1515 from Hardolaf/feature/auth-refactorNathan Guse2013-07-121-1/+5
| |\ \ \
| | * | | [feature/auth-refactor] Fix style issueJoseph Warner2013-07-111-1/+1
| | * | | [feature/auth-refactor] Fix typoJoseph Warner2013-07-111-1/+1
| | |/ /
| | * | [feature/auth-refactor] Remove invalid providers from acp selectJoseph Warner2013-07-111-6/+4
| | * | [feature/auth-refactor] Check that providers implement auth interfaceJoseph Warner2013-07-111-0/+6
| * | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-121-1/+2
| |\ \ \ | | | |/ | | |/|
| | * | [ticket/11548] Fix incorrect usage of array_map on acp groups pageMarc Alexander2013-07-121-1/+2
| | * | Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympusNathaniel Guse2013-07-111-3/+11
| | |\ \
| * | \ \ Merge branch 'ticket/8319' into ticket/8319-develop2Joas Schilling2013-07-101-3/+11
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
| | * | [ticket/8319] Do not repeat the replacementJoas Schilling2013-07-101-9/+5
| | * | [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URLJoas Schilling2013-06-031-2/+2
| | * | [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL partsJoas Schilling2013-06-031-0/+4
| | * | [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuseJoas Schilling2013-06-031-1/+9
* | | | Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permis...Joas Schilling2013-07-1112-305/+286
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'Hardolaf/feature/auth-refactor' into developDavid King2013-07-031-87/+40
| |\ \ \
| | * | | [feature/auth-refactor] Fix code style issueJoseph Warner2013-07-021-2/+2
| | * | | [feature/auth-refactor] Removed no longer used variableJoseph Warner2013-06-261-1/+0
| | * | | [feature/auth-refactor] Fix errors in acp_boardJoseph Warner2013-06-251-2/+2
| | * | | [feature/auth-refactor] Fix indentation on acp_boardJoseph Warner2013-06-251-41/+38
| | * | | [feature/auth-refactor] Refactor auth in acp_boardJoseph Warner2013-06-251-22/+3
| | * | | [feature/auth-refactor] Don't truncate name then reattach same thingJoseph Warner2013-06-251-4/+4
| | * | | [feature/auth-refactor] Remove references to old auth pluginsJoseph Warner2013-06-251-29/+9
| | * | | [feature/auth-refactor] Refactor code to use servicesJoseph Warner2013-06-211-9/+6
| | * | | [feature/auth-refactor] Refactor acp_board for new auth interfaceJoseph Warner2013-06-191-18/+17
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-031-0/+2
| |\ \ \ \ | | | |_|/ | | |/| |