aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge PR #917 branch 'develop-olympus' into developOleg Pudeyev2012-10-161-1/+3
|\ | | | | | | | | * develop-olympus: [ticket/10967] adding $root_path to posting_get_topic_icons
| * Merge PR #917 branch 'Senky/ticket/10967' into develop-olympusOleg Pudeyev2012-10-161-2/+4
| |\ | | | | | | | | | | | | * Senky/ticket/10967: [ticket/10967] adding $root_path to posting_get_topic_icons
| | * [ticket/10967] adding $root_path to posting_get_topic_iconsSenky2012-10-111-2/+4
| | | | | | | | | | | | PHPBB3-10967
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-161-1/+2
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/11093] acp_users_overview.html has a wrongly placed </dd>
| * | [ticket/11093] acp_users_overview.html has a wrongly placed </dd>westr2012-10-161-1/+2
| | | | | | | | | | | | | | | | | | Amended the closing dd tag to the appropriate line: line 145 instead of 141 PHPBB3-11093
* | | Merge remote-tracking branch 'mvinny/ticket/11139' into developAndreas Fischer2012-10-151-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | * mvinny/ticket/11139: [ticket/11139] Adding the $phpbb_admin_path variable [ticket/11139] Fix fatal error on colour swatch window
| * | | [ticket/11139] Adding the $phpbb_admin_path variableVinny2012-10-151-0/+2
| | | | | | | | | | | | | | | | PHPBB3-11139
| * | | [ticket/11139] Fix fatal error on colour swatch windowVinny2012-10-091-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11139
* | | | Merge PR #956 branch 'dhruvgoel92/ticket/11051' into developOleg Pudeyev2012-10-105-18/+148
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11051: [ticket/11051] fix spaces [ticket/11051] add common_words variable [ticket/11051] remove unnecessary comment [ticket/11051] add get_word_len() in sphinx search [ticket/11051] use get_word_length in search backend [ticket/11051] use get_common_words in search backend [ticket/11051] function instead of accessing property in search [ticket/11051] add public functions for public properties
| * | | | [ticket/11051] fix spacesDhruv2012-10-081-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11051
| * | | | [ticket/11051] add common_words variableDhruv2012-10-041-2/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11051
| * | | | [ticket/11051] remove unnecessary commentDhruv2012-10-041-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-11051
| * | | | [ticket/11051] add get_word_len() in sphinx searchDhruv2012-10-042-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_word_len() for sphinx search backend returns false always and triggers proper error. PHPBB3-11051
| * | | | [ticket/11051] use get_word_length in search backendDhruv2012-08-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use get_word_length() instead od accessing the word_length property directly as it is now protected. PHPBB3-11051
| * | | | [ticket/11051] use get_common_words in search backendDhruv2012-08-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use get_common_words() instead of accessing the common_words property directly as it is now protected. PHPBB3-11051
| * | | | [ticket/11051] function instead of accessing property in searchDhruv2012-08-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use get_search_query() instead of accessing the search_query property directly as it is now protected. PHPBB3-11051
| * | | | [ticket/11051] add public functions for public propertiesDhruv2012-08-154-12/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | public retrieval functions for all public properties and change the properties to protected in all search backends. PHPBB3-11051
* | | | | Merge PR #973 branch 'develop-olympus' into developOleg Pudeyev2012-10-101-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * develop-olympus: [ticket/11069] Add closing span back to credit line in subsilver2 simple footer
| * | | | Merge PR #973 branch 'bantu/ticket/11069' into develop-olympusOleg Pudeyev2012-10-101-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11069: [ticket/11069] Add closing span back to credit line in subsilver2 simple footer
| | * | | | [ticket/11069] Add closing span back to credit line in subsilver2 simple footerAndreas Fischer2012-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression from 0ceb77fb995e7433242a87c1fe0c22840a2b23e1. PHPBB3-11069
* | | | | | Merge PR #990 branch 'bantu/ticket/11100' into developOleg Pudeyev2012-10-101-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11100: [ticket/11100] Mark can_use_ssl() and can_use_tls() as static.
| * | | | | | [ticket/11100] Mark can_use_ssl() and can_use_tls() as static.Andreas Fischer2012-09-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11100
* | | | | | | Merge PR #993 branch 'bantu/ticket/8713' into developOleg Pudeyev2012-10-109-60/+156
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/8713: [ticket/8713] Update untrimmed_variable() doc block. [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users. [ticket/8713] Trim password in auth_db to keep compatibility. [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords. [ticket/8713] Rename untrimed_variable() to untrimmed_variable(). [ticket/8713] DRY: variable() and untrimed_variable() into a protected method. [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc. [ticket/8713] Always trim array keys. [ticket/8713] Add simple (non-nested) test case for untrimmed set_var(). [ticket/8713] Use \t in double quotes instead of tabs. [ticket/8713] Use correct parameter for nested data. [ticket/8713] Adjust test method name to other recursive_set_var() tests. [ticket/8713] Do not trim login inputs
| * | | | | | | [ticket/8713] Update untrimmed_variable() doc block.Andreas Fischer2012-09-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | | | [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.Andreas Fischer2012-09-093-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only auth_db is supported there and the password needs to be trimmed for compatibility because user_password stores phpbb_hash(htmlspecialchars(trim($password))) Setting passwords for other auth modules is currently not supported. Once setting/changing passwords is supported by auth plugins, the untrimmed_variable() should be used here and the result should be passed to the auth plugin. PHPBB3-8713
| * | | | | | | [ticket/8713] Trim password in auth_db to keep compatibility.Andreas Fischer2012-09-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | | | [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.Andreas Fischer2012-09-082-5/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | | | [ticket/8713] Rename untrimed_variable() to untrimmed_variable().Andreas Fischer2012-09-087-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | | | [ticket/8713] DRY: variable() and untrimed_variable() into a protected method.Andreas Fischer2012-09-081-80/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | | | [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc.Andreas Fischer2012-09-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | | | [ticket/8713] Always trim array keys.Andreas Fischer2012-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| * | | | | | | [ticket/8713] Do not trim login inputsNathaniel Guse2012-09-038-21/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a function to request variables which are not trimmed. All requests for passwords (except forum passwords) now use the untrimmed request function. PHPBB3-8713
* | | | | | | | [ticket/11140] Fix an error from an incorrect variable nameNathan Guse2012-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11140
* | | | | | | | Merge PR #1004 branch 'develop-olympus' into developOleg Pudeyev2012-10-091-1/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11131] Correctly use indefinite article for "warning".
| * | | | | | | Merge PR #1004 branch 'bantu/ticket/11131' into develop-olympusOleg Pudeyev2012-10-091-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11131: [ticket/11131] Correctly use indefinite article for "warning".
| | * | | | | | | [ticket/11131] Correctly use indefinite article for "warning".Andreas Fischer2012-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11131
* | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-0610-10/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | / / | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11135] Full replacement of credit link to https Conflicts: phpBB/install/convertors/convert_phpbb20.php
| * | | | | | | [ticket/11135] Full replacement of credit link to httpsVinny2012-10-0510-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11135
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-022-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11112] updating links to phpbb.com to use SSL Conflicts: phpBB/adm/index.php
| * | | | | | | [ticket/11112] updating links to phpbb.com to use SSLSenky2012-10-012-3/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-11112
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-09-291-7/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributors
| * | | | | | [ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributorsJoas Schilling2012-09-271-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11122
* | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11021' into developAndreas Fischer2012-09-156-9/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11021: [ticket/11021] Fix the language changes that were lost previously
| * | | | | | | [ticket/11021] Fix the language changes that were lost previouslyNathan Guse2012-09-156-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change U_HOME to U_SITE_HOME PHPBB3-11021
* | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11021' into developAndreas Fischer2012-09-159-36/+52
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11021: [ticket/11021] Remove unnecessary line spacing in functions.php [ticket/11021] Use L_SITE_HOME instead of L_HOME [ticket/11021] Better language strings for site home url/text [ticket/11021] subsilver2 support [ticket/11021] Add the option to specify a Site home URL and text
| * | | | | | | [ticket/11021] Remove unnecessary line spacing in functions.phpNathan Guse2012-09-151-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11021
| * | | | | | | [ticket/11021] Use L_SITE_HOME instead of L_HOMENathan Guse2012-09-154-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check site home url against !== '', not empty PHPBB3-11021
| * | | | | | | [ticket/11021] Better language strings for site home url/textNathan Guse2012-09-153-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct the logo title to be {L_HOME} if {U_HOME} is used. Check if the Home text is instead of just equal to false when outputting it to the template PHPBB3-11021
| * | | | | | | [ticket/11021] subsilver2 supportNathan Guse2012-07-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11021
| * | | | | | | [ticket/11021] Add the option to specify a Site home URL and textNathan Guse2012-07-227-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11021