aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | [feature/compiled-dic] Compile the DI Container into a cached classDavid King2012-11-1013-225/+456
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11152
* | | | | | [ticket/11103] Make jabber use short/ email template filesNathaniel Guse2012-11-112-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | [ticket/11103] Move all email templates to the email/ directory & prep shortNathaniel Guse2012-11-116-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare short email templates (to be used in jabber) PHPBB3-11103
* | | | | | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathaniel Guse2012-11-1124-91/+150
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'Fyorl/ticket/10939' into developAndreas Fischer2012-11-107-30/+56
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fyorl/ticket/10939: [ticket/10939] Added documentation for phpbb_request::file [ticket/10939] Added tests for phpbb_request::file [ticket/10939] Modified the default return for $request->file [ticket/10939] Modified fileupload tests to deal with new behaviour [ticket/10939] Modified mock request class to handle deactivated $_FILES [ticket/10939] Modified acp_groups.php to not use $_FILES [ticket/10939] Modified ucp_groups.php to not use $_FILES [ticket/10939] Modified functions_user.php to not use $_FILES [ticket/10939] Modified message_parser.php to not use $_FILES [ticket/10939] Modified functions_upload to not use $_FILES [ticket/10939] Modified request test slightly to include $_FILES [ticket/10939] Added $_FILES handling to phpbb_request
| | * | | | | [ticket/10939] Added documentation for phpbb_request::fileFyorl2012-11-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10939
| | * | | | | [ticket/10939] Modified the default return for $request->fileFyorl2012-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10939
| | * | | | | [ticket/10939] Modified acp_groups.php to not use $_FILESFyorl2012-08-151-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10939
| | * | | | | [ticket/10939] Modified ucp_groups.php to not use $_FILESFyorl2012-08-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10939
| | * | | | | [ticket/10939] Modified functions_user.php to not use $_FILESFyorl2012-08-151-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10939
| | * | | | | [ticket/10939] Modified message_parser.php to not use $_FILESFyorl2012-08-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10939
| | * | | | | [ticket/10939] Modified functions_upload to not use $_FILESFyorl2012-08-151-20/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10939
| | * | | | | [ticket/10939] Added $_FILES handling to phpbb_requestFyorl2012-08-152-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10939
| * | | | | | Merge remote-tracking branch 'EXreaction/ticket/11189' into developAndreas Fischer2012-11-1016-45/+43
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11189: [ticket/11189] Replace DEBUG_EXTRA with DEBUG [ticket/11189] Always log critical errors when in cron or in image output
| | * | | | | | [ticket/11189] Replace DEBUG_EXTRA with DEBUGNathaniel Guse2012-11-1016-44/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11189
| | * | | | | | [ticket/11189] Always log critical errors when in cron or in image outputNathaniel Guse2012-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11189
| * | | | | | | Merge pull request #881 from Fyorl/ticket/10970Nils Adermann2012-11-102-16/+51
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Allow INCLUDE template macros to accept paths of the form {FOO}/a/{BAR}/c
| | * | | | | | [ticket/10970] Added extra documentation to parse_dynamic_path.Fyorl2012-11-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10970
| | * | | | | | [ticket/10970] Added newline in docblockFyorl2012-08-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10970
| | * | | | | | [ticket/10970] Removed unused $varsFyorl2012-08-101-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10970
| | * | | | | | [ticket/10970] Fixed a problem with prepending root pathsFyorl2012-07-241-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10970
| | * | | | | | [ticket/10970] Added missing initialisations and modified the regexFyorl2012-07-241-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-existent variables now become empty strings. PHPBB3-10970
| | * | | | | | [ticket/10970] Added support for forms such as {FOO}bar.{EXT}Fyorl2012-07-081-21/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10970
| | * | | | | | [ticket/10970] Paths of the form {FOO}/a/{BAR}/b parsed correctlyFyorl2012-07-081-15/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new method to handle this type of path was added and compile_tag_include, compile_tag_include_php and compile_tag_include_js were modified to use it appropriately. Tests were added for these three macros also. PHPBB3-10970
* | | | | | | | [ticket/11103] Fix failed automergeNathaniel Guse2012-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathaniel Guse2012-11-1046-392/+739
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/schemas/mssql_schema.sql phpBB/report.php phpBB/styles/prosilver/template/ucp_prefs_personal.html phpBB/styles/subsilver2/template/ucp_prefs_personal.html
| * | | | | | | Merge remote-tracking branch 'igorw/ticket/11183' into developAndreas Fischer2012-11-104-63/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/11183: [ticket/11183] Remove $load_extensions and weird dl() calls
| | * | | | | | | [ticket/11183] Remove $load_extensions and weird dl() callsIgor Wiedler2012-11-104-63/+10
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | PHPBB3-11183
| * | | | | | | [ticket/10780] Use L_COLON on LDAP page.Andreas Fischer2012-11-101-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10780
| * | | | | | | [ticket/10780] Use L_COLON on search backend ACP pages.Andreas Fischer2012-11-104-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10780
| * | | | | | | [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.Andreas Fischer2012-11-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10780
| * | | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-11-091-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
| | * | | | | | Merge remote-tracking branch 'github-igorw/ticket/11181-olympus' into ↵Nils Adermann2012-11-091-1/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-igorw/ticket/11181-olympus: [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
| | | * | | | | | [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]Igor Wiedler2012-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11181
| * | | | | | | | Merge PR #1043 branch 'dhruvgoel92/ticket/11177' into developOleg Pudeyev2012-11-091-0/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11177: [ticket/11177] return no results when query has only negation
| | * | | | | | | | [ticket/11177] return no results when query has only negationDhruv2012-11-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If search query has only -foo then instead of displaying all results that do not have foo, should display no results found. PHPBB3-11177
| * | | | | | | | | [ticket/11050] make all properties protected in all search backendsDhruv2012-11-094-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB-11050
| * | | | | | | | | [ticket/11050] get_common_words() returns empty array for sphinxDhruv2012-11-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB-11050
| * | | | | | | | | [ticket/11050] fix tidied search query docblock languageDhruv2012-11-094-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
| * | | | | | | | | [ticket/11050] fix min/max length docblock languageDhruv2012-11-093-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
| * | | | | | | | | [ticket/11050] multi sentences separated by period in docblocksDhruv2012-11-093-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting of each sentence should be capitalized. PHPBB3-11050
| * | | | | | | | | [ticket/11050] fix separated spelling in docblockDhruv2012-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
| * | | | | | | | | [ticket/11050] fix split words doc block languageDhruv2012-11-093-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
| * | | | | | | | | [ticket/11050] remove class word from docblocksDhruv2012-11-094-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
| * | | | | | | | | [ticket/11050] add missing @var in native searchDhruv2012-11-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
| * | | | | | | | | [ticket/11050] replace user by phpbb_userDhruv2012-11-094-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
| * | | | | | | | | [ticket/11050] fix minor comment/docblocks issuesDhruv2012-11-094-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No comments should end with a period. All occurences like PostgreSQL should have proper case. PHPBB3-11050
| * | | | | | | | | [ticket/11050] add access specifiers to native search propertiesDhruv2012-11-091-3/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
| * | | | | | | | | [ticket/11050] fix docblocks with description before @varDhruv2012-11-093-13/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
| * | | | | | | | | [ticket/11050] add missing @varDhruv2012-11-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050