aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | [feature/twig] Add a comment to tpl output if PHP used, but disabledNathaniel Guse2013-06-251-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | | | [feature/twig] Pass parameters required to twig env via constructorNathaniel Guse2013-06-252-43/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of creating set functions PHPBB3-11598
| * | | | | | | [feature/twig] PHP token supportNathaniel Guse2013-06-254-0/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | | | [feature/twig] Append assets_version to includejs tagNathaniel Guse2013-06-245-12/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some fixes for main template parser PHPBB3-11598
| * | | | | | | [feature/twig] Working on fixing testsNathan Guse2013-06-244-31/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into feature/twigNathan Guse2013-06-246-15/+36
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv (35) and others # Via Andreas Fischer (15) and others * 'develop' of github.com:phpbb/phpbb3: (75 commits) [ticket/10776] update min php version 5.3.3 in readme [ticket/11503] similar implementation for mssql_native and odbc [ticket/11603] Fix out dated comment [ticket/11603] Fix usage note [ticket/11604] Skip installer step where config.php is created. [ticket/11603] Throw RuntimeExceptions instead of using exit() [ticket/11603] Avoid using cURL [ticket/11604] Fix case where config.php is not generated by phpBB. [ticket/11604] Use variables for config.php filesnames. [ticket/11561] Specify used tables in notification fixture, so they are emptied [ticket/11094] Add textbox for jabber while memberlist search [ticket/10820] fix if condition to check for IE [ticket/11603] Split api_request into two functions (query only vs. full url) [ticket/11603] Fix spacing and add some comments [ticket/10820] Add additional check for IE in condition [ticket/11603] Fix github API calls [ticket/11603] Rename network to forks and fix handling [ticket/11603] Fix github api url and use curl with valid user agent [ticket/10820] Fix function docblock [ticket/10820] Inject IE version in function ...
| * | | | | | | | [feature/twig] Only set extensions if extension manager is loadedNathan Guse2013-06-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | | | | [feature/twig] Fixing file header copyrightsNathan Guse2013-06-245-105/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | | | | [feature/twig] Changing INCLUDEJS behaviorNathan Guse2013-06-242-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was: <!-- INCLUDEJS template/foo.js --> Now: <!-- INCLUDEJS T_TEMPLATE_PATH ~ '/foo.js' --> Reasons for this: 1. INCLUDEJS is 3.1-dev only 2. INCLUDEJS has odd behavior to begin with (arbitrary setting root path to styles/name/ directory) 3. INCLUDEJS could not include files from outside directories or anywhere else 4. It was easier to change INCLUDEJS behavior to something more flexible and useful than hack around it to make it work as it was with Twig. PHPBB3-11598
| * | | | | | | | [feature/twig] Fix <!-- .blah since the being node was changedNathan Guse2013-06-242-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | | | | [feature/twig] Able to set chain of namespaces to search for loadTemplate()Nathan Guse2013-06-244-3/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done so that when event template files are included, if they include files themselves, that namespace is checked first, then __main__ is checked to include the correct template file. Also, when template files are included from a particular namespace, this is done so that the files from that namespace are included first, then the main namespace is checked. We may want to change this behavior in the future to allow choosing which locations have priority, but for now, this is what I am doing to make sure the behavior is simple and always the same. PHPBB3-11598
| * | | | | | | | [feature/twig] Use twig->display rather than echo twig->renderNathan Guse2013-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | | | | [feature/twig] Event template tagNathan Guse2013-06-244-40/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | | | | [feature/twig] Changing method for begin node to not use anonymous functionNathan Guse2013-06-233-3/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The way it was setup would actually require PHP 5.4, which isn't an option right now. Leaving the old code there, just commented out, for now at least. PHPBB3-11598
| * | | | | | | | [feature/twig] Setup the style chain/loader properlyNathaniel Guse2013-06-181-18/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | | | | [feature/twig] Fix begin loops & subloopsNathaniel Guse2013-06-152-43/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | | | | [feature/twig] Throw exceptions (don't catch and ignore)Nathaniel Guse2013-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | | | | [feature/twig] Add && and || supportNathaniel Guse2013-06-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | | | | [feature/twig] Use twig loader filesystem with namespaces to add pathsNathaniel Guse2013-06-143-11/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Twig now handles loading style files on its own PHPBB3-11598
| * | | | | | | | [feature/twig] Use phpbb_template_twig in testsNathan Guse2013-06-122-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace all new phpbb_template( with new phpbb_template_twig( PHPBB3-11598
| * | | | | | | | [feature/twig] Use phpBB's resource locator to find templatesNathan Guse2013-06-122-1/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | | | | [feature/twig] Some additional operators, more stuff for IFNathan Guse2013-06-125-5/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | | | | [feature/twig] Correcting output of INCLUDEJSNathan Guse2013-06-122-57/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | | | | [feature/twig] Fixing IF .blah correctlyNathan Guse2013-06-112-8/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | | | | [feature/twig] Language output assignments, using context class againNathan Guse2013-06-112-33/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | | | | [feature/twig] Replace phpBB template with TwigNathan Guse2013-06-103-395/+897
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move phpbb_template class to phpbb_template_phpbb Changed phpbb_template class to an interface Switch services.yml to load phpbb_template_twig instead of phpbb_template PHPBB3-11598
| * | | | | | | | [feature/twig] BEGIN loops now workNathan Guse2013-06-102-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | | | | [feature/twig] Replace phpBB template code with Twig syntax, then parse w/TwigNathan Guse2013-06-106-67/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing begin token/node, adding includejs token/node PHPBB3-11598
| * | | | | | | | [feature/twig] More work on the lexerNathan Guse2013-06-103-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Committing what I have now to save it as I'm trying another method next PHPBB3-11598
| * | | | | | | | [feature/twig] Working on DEFINENathan Guse2013-06-103-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | | | | [feature/twig] Support our old INCLUDE statements (no quotes)Nathan Guse2013-06-091-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better code for handling IF .blah PHPBB3-11598
| * | | | | | | | [feature/twig] WIP extension/lexer/some tokenparsers/nodesNathan Guse2013-06-097-0/+395
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | | | | [ticket/8319] Add migration file for update changeJoas Schilling2013-07-101-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8319
* | | | | | | | | 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 'remotes/imkingdavid/ticket/11253' into developNathan Guse2013-07-061-0/+51
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By David King # Via David King * remotes/imkingdavid/ticket/11253: [ticket/11253] Put AND clause in correct SQL query [ticket/11253] Fix a few things brought up in the PR [ticket/11253] Fix typo in constant [ticket/11253] Add migration to add auth check to UCP signature module
| * | | | | | | | [ticket/11253] Put AND clause in correct SQL queryDavid King2013-06-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11253
| * | | | | | | | [ticket/11253] Fix a few things brought up in the PRDavid King2013-06-231-7/+6
| | | | | | | | |
| * | | | | | | | [ticket/11253] Fix typo in constantDavid King2013-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11253
| * | | | | | | | [ticket/11253] Add migration to add auth check to UCP signature moduleDavid King2013-06-221-0/+52
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11253
* | | | | | | | Merge branch 'develop-olympus' into developNathan Guse2013-07-051-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Nathan Guse (1) * develop-olympus: [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling. [ticket/11619] Some tests for get_remote_file().
| * | | | | | | [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.Andreas Fischer2013-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11619
* | | | | | | | [feature/auth-refactor] Move auth providers to separate directoryJoseph Warner2013-07-045-0/+10
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the provider files to their own directory per bantu's suggestion. PHPBB3-9734
* | | | | | | 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