aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
* [develop-olympus] Bump version numbers for 3.0.12-RC1 release.Andreas Fischer2013-07-123-5/+5
|
* [develop-olympus] Bumping version numbers to final for 3.0.12 releases.Andreas Fischer2013-07-1210-12/+12
|
* [ticket/11548] Fix incorrect usage of array_map on acp groups pageMarc Alexander2013-07-121-1/+2
| | | | | | | | The array_map was only ran on small parts of the actual error array instead of the whole one. This resulted in the output of the language variables' names rather than their actual value. PHPBB3-11548
* [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-124-6/+6
| | | | PHPBB3-11662
* Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ↵Marc Alexander2013-07-1120-104/+248
|\ | | | | | | ticket/11548
| * Merge remote-tracking branch 'remotes/cyberalien/ticket/10772' into ↵Nathaniel Guse2013-07-111-1/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/10772: [ticket/10772] Remove unnecessary comment [ticket/10772] Functional tests for forum style [ticket/10772] Use forum specific style for trigger_error
| | * [ticket/10772] Remove unnecessary commentVjacheslav Trushkin2013-05-161-1/+0
| | | | | | | | | | | | PHPBB3-10772
| | * [ticket/10772] Use forum specific style for trigger_errorVjacheslav Trushkin2013-05-111-1/+9
| | | | | | | | | | | | PHPBB3-10772
| * | Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympusNathaniel Guse2013-07-113-4/+43
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/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
| | * | [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-032-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | The explanation now states that links are prefixed with the board URL. PHPBB3-8319
| | * | [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on updateJoas Schilling2013-06-031-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To fix http://tracker.phpbb.com/browse/PHPBB3-8319 we changed the second_pass_replace value, so that needs updating for existing ones. 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
| * | | [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.Andreas Fischer2013-07-031-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11619
| * | | [ticket/11617] Remove spaces and tabs from empty linesMatt Friedman2013-07-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11617
| * | | [ticket/11617] Missing U_ACTION in acp_captcha.phpMatt Friedman2013-07-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-11617 PHPBB3-11617
| * | | [ticket/11566] Subsilver template error displayed after table headersDhruv2013-07-011-4/+4
| | | | | | | | | | | | | | | | PHPBB3-11561
| * | | [ticket/11566] Remove extra pair of brackets from conditional statementDhruv2013-07-011-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11566
| * | | [ticket/11566] Add captcha to report post template in subsilverDhruv2013-07-011-0/+8
| | | | | | | | | | | | | | | | PHPBB3-11566
| * | | [ticket/11566] Use the new constant CONFIRM_REPORT for captcha initDhruv2013-07-012-1/+2
| | | | | | | | | | | | | | | | PHPBB3-11566
| * | | [ticket/11566] Rename var to $visual_confirmation_responseDhruv2013-07-011-3/+3
| | | | | | | | | | | | | | | | PHPBB3-11566
| * | | [ticket/11566] add captcha reset and hidden fieldsDhruv2013-07-011-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If captcha is solved and some other error pops up, store the captcha in a hidden field. Reset captcha if reporting the post is successful PHPBB3-11566
| * | | [ticket/11566] display error instead of trigger_errorDhruv2013-07-011-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When the error report is empty display error in the template instead of trigger_error PHPBB3-11566
| * | | [ticket/11566] add error in templateDhruv2013-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if error exists, then display it in the report post template. PHPBB3-11566
| * | | [ticket/11566] add error functionalityDhruv2013-07-011-67/+80
| | | | | | | | | | | | | | | | | | | | | | | | add $error which stores the captcha error when captcha validation fails PHPBB3-11566
| * | | [ticket/11566] add interface for captchaDhruv2013-07-012-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add basic captcha template while reporting post when the user is not a registered user. PHPBB3-11566
| * | | Merge remote-tracking branch 'dhruvgoel92/ticket/10776' into develop-olympusJoas Schilling2013-06-211-15/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/10776: [ticket/10776] update min php version 5.3.3 in readme [ticket/10776] Fixed a couple language changes in docs/README.html. [ticket/10776] Fixed errors in docs/README.html.
| | * | | [ticket/10776] update min php version 5.3.3 in readmeDhruv2013-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10776
| | * | | Merge branch 'ticket/10776' of git://github.com/callumacrae/phpbb3 into ↵Dhruv2013-06-201-15/+15
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/10776 # By Callum Macrae # Via Callum Macrae * 'ticket/10776' of git://github.com/callumacrae/phpbb3: [ticket/10776] Fixed a couple language changes in docs/README.html. [ticket/10776] Fixed errors in docs/README.html. Conflicts: phpBB/docs/README.html
| | | * | | [ticket/10776] Fixed a couple language changes in docs/README.html.Callum Macrae2012-04-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10776
| | | * | | [ticket/10776] Fixed errors in docs/README.html.Callum Macrae2012-04-101-39/+38
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10776
| * | | | | Merge remote-tracking branch 'dhruvgoel92/ticket/11094' into develop-olympusAndreas Fischer2013-06-201-0/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11094: [ticket/11094] Add textbox for jabber while memberlist search
| | * | | | | [ticket/11094] Add textbox for jabber while memberlist searchDhruv2013-06-151-0/+4
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-11094
| * | | | | [ticket/10820] fix if condition to check for IEDhruv2013-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10820
| * | | | | [ticket/10820] Add additional check for IE in conditionDhruv2013-06-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10820
| * | | | | [ticket/10820] Fix function docblockDhruv2013-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10820
| * | | | | [ticket/10820] Inject IE version in functionDhruv2013-06-121-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10820
| * | | | | [ticket/10820] fix regexDhruv2013-06-121-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract IE version from user agent string and then compare it with 7 PHPBB3-10820
| * | | | | [ticket/10820] remove unnecessary parenthesesDhruv2013-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10820
| * | | | | [ticket/10820] fix docblockDhruv2013-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10820
| * | | | | [ticket/10820] add param and return to functionDhruv2013-06-121-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add param and return in function docblock. Rename function parameter to $user_agent. PHPBB3-10820
| * | | | | [ticket/10820] simplify regex and escape dotDhruv2013-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10820
| * | | | | [ticket/10820] Use singular returnDhruv2013-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10820
| * | | | | [ticket/10820] remove unnecessary condition checksDhruv2013-06-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10820
| * | | | | [ticket/10820] add function docblockDhruv2013-06-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10820
| * | | | | [ticket/10820] fix IE check functionDhruv2013-06-121-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add phpbb_ prefix to function name and return boolean value. PHPBB3-10820
| * | | | | [ticket/10820] proper usage of global and local variable browserDhruv2013-06-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10820
| * | | | | [ticket/10820] Image downloader recognize new version of ieriadhchtara2013-06-121-9/+14
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user download image attachement using ie8, the file is displayed. However, when he uses ie version greater than 8, the image is download. A changes are made to phpbb/download/file.php to solve the problem. We check now if the ie version is greater or equal to 8 and not only equal to 8 PHPBB3-10820
| * | | | Merge remote-tracking branch 'marc1706/ticket/11579' into develop-olympusAndreas Fischer2013-06-111-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11579: [ticket/11579] Add method for validating emails for valid MX and mark as slow [ticket/11579] Do not extend validate_data_helper [ticket/11579] Add missing commas to validate_username_test [ticket/11579] Rework calls to validate_data_helper [ticket/11579] Move simple tests into seperate files [ticket/11579] Use test case helper class and use assert prefix for method [ticket/11579] Move tests into seperate files depending on needed fixture [ticket/11579] Remove unnecessary globals from validate_password() [ticket/11579] Add remaining unit tests for validate_data functions [ticket/11579] Add basic set of unit tests for validate_data()