aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11388] Fix typoNathaniel Guse2013-07-111-3/+3
| | | | PHPBB3-11388
* [ticket/11388] Remove typehints (causing tests to fail)Nathaniel Guse2013-07-111-1/+1
| | | | PHPBB3-11388
* [ticket/11388] Disable cache if IN_INSTALL definedNathaniel Guse2013-07-111-1/+1
| | | | PHPBB3-11388
* [ticket/11388] Do not modify by referenceNathaniel Guse2013-07-111-6/+8
| | | | PHPBB3-11388
* [ticket/11388] typehitsNathaniel Guse2013-07-111-1/+1
| | | | PHPBB3-11388
* [ticket/11388] INCLUDEJS supports //(url)Nathaniel Guse2013-07-111-1/+1
| | | | PHPBB3-11388
* [ticket/11388] includejs inherit from includeassetNathaniel Guse2013-07-102-31/+73
| | | | | | | | | Copied from the INCLUDECSS PR, since this needed to be modified. Added checks for argument strings/anchors/http/https paths in asset files to load files properly PHPBB3-11388
* [feature/twig] Variable regular expressions should be lazyNathan Guse2013-07-081-3/+3
| | | | PHPBB3-11598
* [feature/twig] If DEBUG, EVENT will always look for new/missing tpl event filesNathan Guse2013-07-061-3/+23
| | | | | | | | | If debug mode is enabled, lets check for new/removed EVENT templates on page load rather than at compile. This is slower, but makes developing extensions easier (no need to purge the cache when a new event template file is added) PHPBB3-11598
* [feature/twig] Use Twig mask for IF statements instead of our own tokenparserNathan Guse2013-07-053-90/+6
| | | | PHPBB3-11598
* [feature/twig] context_recursive_loop_builder isn't used anymore, removing itNathan Guse2013-07-051-22/+0
| | | | PHPBB3-11598
* [feature/twig] Add check for defined IN_PHPBB in all new Twig related filesNathan Guse2013-07-0515-0/+135
| | | | PHPBB3-11598
* [feature/twig] Can't use typehint here, causes tests to failNathan Guse2013-07-051-1/+1
| | | | PHPBB3-11598
* [feature/twig] Fix S_NUM_ROWS assignmentNathan Guse2013-07-051-1/+1
| | | | PHPBB3-11598
* [feature/twig] Remove style dependency for controller helperNathan Guse2013-07-051-24/+1
| | | | | | If a controller wants to use set_style, it can just use phpbb_style PHPBB3-11598
* [feature/twig] Clarify commentNathan Guse2013-07-051-1/+1
| | | | PHPBB3-11598
* [feature/twig] SpacingNathan Guse2013-07-051-1/+1
| | | | PHPBB3-11598
* [feature/twig] Nicer code for get_user_style.php()Nathan Guse2013-07-051-4/+9
| | | | PHPBB3-11598
* [feature/twig] Docs/typehinting for Twig extensionNathan Guse2013-07-051-1/+13
| | | | PHPBB3-11598
* [feature/twig] Removing template/renderer.php (no longer used)Nathan Guse2013-07-051-35/+0
| | | | PHPBB3-11598
* [feature/twig] SpacingNathaniel Guse2013-07-041-1/+1
| | | | PHPBB3-11598
* [feature/twig] acp module tpls are in ext/adm, ucp/mcp in styles/Nathaniel Guse2013-07-041-17/+35
| | | | PHPBB3-11598
* [feature/twig] Fix copy/pasted codeNathaniel Guse2013-07-041-1/+1
| | | | PHPBB3-11598
* [feature/twig] Attempt to automatically set style dir for ext modulesNathaniel Guse2013-07-041-1/+19
| | | | | | Extension authors can change it themselves if necessary PHPBB3-11598
* [feature/twig] Fix a regular expressionNathaniel Guse2013-07-041-1/+1
| | | | PHPBB3-11598
* [feature/twig] Fix debug codeNathaniel Guse2013-07-041-1/+1
| | | | PHPBB3-11598
* [feature/twig] Support using Twig filters on {VAR}, add masks for Twig tagsNathaniel Guse2013-07-042-7/+71
| | | | | | | | | | Now we can do {L_TITLE|upper}, {SITENAME|lower}, etc We can also use all the Twig tags in our own syntax. E.g. <!-- BLOCK foo --> = {% block foo %]. All tags are the same as the Twig tag names, but are in uppercase. PHPBB3-11598
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-0413-1005/+1154
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (44) and others # Via Joas Schilling (4) and others * 'develop' of https://github.com/phpbb/phpbb3: (63 commits) [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 [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 [ticket/11566] Rename var to $visual_confirmation_response [ticket/11566] Revert forum permission changes [ticket/11566] Use language variable instead of hardcode [ticket/11566] add tests for reporting post [ticket/11566] add captcha reset and hidden fields [ticket/11566] display error instead of trigger_error [ticket/11566] add error in template [ticket/11566] add error functionality [ticket/11566] add interface for captcha ...
| * Merge remote-tracking branch 'Hardolaf/feature/auth-refactor' into developDavid King2013-07-0310-1004/+1150
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Fix comment grammarJoseph Warner2013-07-021-1/+1
| | | | | | | | | | | | PHPBB3-9734
| | * [feature/auth-refactor] Fix the actual cause of test failuresJoseph Warner2013-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Enables super globals before the new container is instantiated in the final step of installation to prevent issues caused by trying to create a phpbb_request object when super globals are disabled. PHPBB3-9734
| | * [feature/auth-refactor] A possible fix for the functional test failuresJoseph Warner2013-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | I don't like this fix as it really shouldn't be needed. But it makes the functional tests pass. PHPBB3-9734
| | * [feature/auth-refactor] Forgot @inheritdoc on methodsJoseph Warner2013-06-283-0/+54
| | | | | | | | | | | | PHPBB3-9734
| | * [feature/auth-refactor] Finish and clean up documentationJoseph Warner2013-06-274-74/+43
| | | | | | | | | | | | PHPBB3-9734
| | * [feature/auth-refactor] Change phpEx to php_ext in new classesJoseph Warner2013-06-262-9/+9
| | | | | | | | | | | | PHPBB3-9734
| | * [feature/auth-refactor] Removed no longer used variableJoseph Warner2013-06-261-1/+0
| | | | | | | | | | | | PHPBB3-9734
| | * [feature/auth-refactor] Fix errors in acp_boardJoseph Warner2013-06-251-2/+2
| | | | | | | | | | | | | | | | | | Fixes errors introduced by the last several commits. PHPBB3-9734
| | * [feature/auth-refactor] Fix indentation on acp_boardJoseph Warner2013-06-251-41/+38
| | | | | | | | | | | | PHPBB3-9734
| | * [feature/auth-refactor] Refactor auth in acp_boardJoseph Warner2013-06-251-22/+3
| | | | | | | | | | | | | | | | | | | | | | | | Changes the acp_board code to directly call the auth providers out of the $auth_providers variable that is populated by the phpbb_container. PHPBB3-9734
| | * [feature/auth-refactor] Don't truncate name then reattach same thingJoseph Warner2013-06-251-4/+4
| | | | | | | | | | | | PHPBB3-9734
| | * [feature/auth-refactor] Remove old auth pluginsJoseph Warner2013-06-253-886/+0
| | | | | | | | | | | | PHPBB3-9734
| | * [feature/auth-refactor] Remove references to old auth pluginsJoseph Warner2013-06-251-29/+9
| | | | | | | | | | | | | | | | | | | | | Removes what is hopefully the last references to the old auth plugins in the code base. PHPBB3-9734
| | * [feature/auth-refactor] Refactor code to use servicesJoseph Warner2013-06-213-40/+24
| | | | | | | | | | | | | | | | | | | | | Refactors all loading of auth providers to use services instead of directly calling the class. PHPBB3-9734
| | * [feature/auth-refactor] Convert provider_apache to a serviceJoseph Warner2013-06-201-40/+49
| | | | | | | | | | | | | | | | | | Removes globals from provider_apache and turns it into a service. PHPBB3-9734
| | * [feature/auth-refactor] Convert provider_ldap to a serviceJoseph Warner2013-06-201-58/+64
| | | | | | | | | | | | | | | | | | Removes globals from provider_ldap and converts it into a service. PHPBB3-9734
| | * [feature/auth-refactor] Turn provider_db into a serviceJoseph Warner2013-06-201-41/+57
| | | | | | | | | | | | | | | | | | Removes globals from provider_db and turns it into a service. PHPBB3-9734
| | * [feature/auth-refactor] Fix LDAP conversion errorJoseph Warner2013-06-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | I messed up when converting over auth_ldap this commit fixes that error. I have not been able to extensively test ldap due to not having ldap set up on this computer yet. Apache authentication appears to work. PHPBB3-9734
| | * [feature/auth-refactor] Finish refactoring auth pluginsJoseph Warner2013-06-195-10/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I believe that this commit should have final minimal changes needed to replace the old auth plugins with the refactored auth plugins. Added a few more elements to the interface based on the old auth plugins. Documentation is not complete and need works on these new elements. PHPBB3-9734
| | * [feature/auth-refactor] Refactor session for new auth interfaceJoseph Warner2013-06-191-4/+4
| | | | | | | | | | | | | | | | | | Refactors phpbb_session to use the new auth interface. PHPBB3-9734