aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | [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
* | | | | 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
* | | | | | | [ticket/11050] remove common_words property from sphinxDhruv2012-11-091-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | common_words property is never used in sphinx class hence removed. PHPBB3-11050
* | | | | | | [ticket/11050] add access specifiers to sphinx search propertiesDhruv2012-11-091-2/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
* | | | | | | [ticket/11050] add access specifiers to mysql search propertiesDhruv2012-11-091-3/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11050
* | | | | | | [ticket/11050] add access specifiers to pgsql search propertiesDhruv2012-11-091-3/+61
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | PHPBB3-11050
* | | | | | Merge remote-tracking branch 'github-p/ticket/11174' into developNils Adermann2012-11-091-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-p/ticket/11174: [ticket/11174] Check common words, fix array equality assertion. [ticket/11174] Test for common words. [ticket/11174] More tests. [ticket/11174] Clarify why that is the way it is. [ticket/11174] Started on search tests - keyword splitting.
| * | | | | | [ticket/11174] Started on search tests - keyword splitting.Oleg Pudeyev2012-11-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11174
* | | | | | | Merge remote-tracking branch 'github-p/feature/prune-users' into developNils Adermann2012-11-094-149/+275
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-p/feature/prune-users: (21 commits) [feature/prune-users] $author_id_sql is no longer needed here. [feature/prune-users] Move quote to the correct line. [feature/prune-users] Split one line into two lines for readability. [feature/prune-users] Use empty for checking array size. [feature/prune-users] Fix issues with queries pointed out by bantu. [feature/prune-users] Add spaces inside brackets. [feature/prune-users] Use a map instead of performing array scans. [feature/prune-users] Fix incorrect condition when deleting log entries. [feature/prune-users] Non-cosmetic changes per bantu's review. [feature/prune-users] Cosmetic changes per bantu's review. [feature/prune-users] Minor UI adjustment and bug fixes [feature/prune_users] Moved set_config_count out of user loop. [feature/prune-users] Fixed user id check in undelivered users loop. [feature/prune-users] Call sql_is_set once for author ids in user_delete. [feature/prune-users] Replaced missed occurrences of $user_id with $user_ids. [feature/prune-users] Call sql_is_set for user ids once in user_delete. [feature/prune-users] Fixed whitespace in language file. [feature/prune-users] Apply 904bcb86a054ab6256da565098eb9bd8ab20414b. [feature/prune-users] Adjust some language strings for new features [feature/prune-users] Apply e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5. ...
| * | | | | | | [feature/prune-users] $author_id_sql is no longer needed here.Oleg Pudeyev2012-11-061-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9622
| * | | | | | | Merge remote-tracking branch 'upstream/develop' into feature/prune-usersOleg Pudeyev2012-11-06246-9046/+18021
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (2171 commits) [ticket/11164] Update composer.phar [ticket/10933] Use inheritDoc, eliminate copy pasted docblocks. [ticket/10933] Dependency inject template context. [ticket/10933] Expanded prose documentation for phpbb_extension_provider. [ticket/10933] Specify empty template path for absolute includephp test. [ticket/10933] Useful documentation for template locate function [ticket/10933] Typo fixes [ticket/10933] Initialize template context when template is constructed. [ticket/11099] Mark acp_ban::display_ban_options() as static. [ticket/11158] Require acl_u_sig for ucp signature module. [ticket/11158] Revert old fix in PHPBB3-10186. [ticket/11159] static public is the currently approved order. [ticket/11157] static public is the currently approved order. [ticket/11157] Fix remaining captcha spam. [ticket/11157] get_captcha_types is an instance method. [ticket/11156] Delete "Misc" tab of forum based permissions + move items [ticket/10848] Move include up. [ticket/11014] Fix old pagination assignment [ticket/11018] Fix several paginations in ACP [ticket/11014] Fix IF statements for new template pagination ... Conflicts: phpBB/includes/functions_user.php
| * | | | | | | | [feature/prune-users] Move quote to the correct line.Oleg Pudeyev2012-04-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9622
| * | | | | | | | [feature/prune-users] Split one line into two lines for readability.Oleg Pudeyev2012-04-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9622
| * | | | | | | | [feature/prune-users] Use empty for checking array size.Oleg Pudeyev2012-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9622
| * | | | | | | | [feature/prune-users] Fix issues with queries pointed out by bantu.Oleg Pudeyev2012-04-191-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9622
| * | | | | | | | [feature/prune-users] Use a map instead of performing array scans.Oleg Pudeyev2012-04-191-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9622