aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'VSEphpbb/ticket/11617' into develop-olympusAndreas Fischer2013-07-031-0/+2
|\ | | | | | | | | | | * VSEphpbb/ticket/11617: [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php
| * [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
* Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/11566' into ↵Joas Schilling2013-07-025-57/+169
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * remotes/dhruvgoel92/ticket/11566: [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init [ticket/11566] Rename var to $visual_confirmation_response [ticket/11566] Revert forum permission changes [ticket/11566] Use language variable instead of hardcode [ticket/11566] add tests for reporting post [ticket/11566] add captcha reset and hidden fields [ticket/11566] display error instead of trigger_error [ticket/11566] add error in template [ticket/11566] add error functionality [ticket/11566] add interface for captcha
| * [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] Check that guest doesn't have reporting permission by defaultDhruv2013-07-011-0/+4
| | | | | | | | 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] Revert forum permission changesDhruv2013-07-011-3/+4
| | | | | | | | | | | | Revert the f_report permission for guests in the functional tests PHPBB3-11566
| * [ticket/11566] Use language variable instead of hardcodeDhruv2013-07-011-1/+2
| | | | | | | | | | | | Add language variable in tests PHPBB3-11566
| * [ticket/11566] add tests for reporting postDhruv2013-07-011-0/+55
| | | | | | | | | | | | | | Functional test for reporting post and check if captcha validation is required for guests and not for registerted users 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/10838' into develop-olympusAndreas Fischer2013-07-011-4/+34
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/10838: [ticket/10838] Fix URL for wiki and remove irrelevant line [ticket/10838] Remove php 5.4 and builtin server references [ticket/10838] Fix missing data [ticket/10838] separate database used mentioned in unit tests [ticket/10838] Updated RUNNING_TESTS.md
| * | [ticket/10838] Fix URL for wiki and remove irrelevant lineDhruv2013-07-021-2/+2
| | | | | | | | | | | | PHPBB3-10838
| * | [ticket/10838] Remove php 5.4 and builtin server referencesDhruv2013-07-021-7/+1
| | | | | | | | | | | | PHPBB3-10838
| * | [ticket/10838] Fix missing dataDhruv2013-07-021-2/+2
| | | | | | | | | | | | PHPBB3-10838
| * | [ticket/10838] separate database used mentioned in unit testsDhruv2013-07-021-8/+8
| | | | | | | | | | | | | | | | | | | | | Separate database used for tests which is deleted each time tests are run information is added to unit tests. PHPBB3-10838
| * | [ticket/10838] Updated RUNNING_TESTS.mdDhruv2013-06-271-0/+36
| |/ | | | | | | PHPBB3-10838
* | Merge remote-tracking branch 'Hardolaf/ticket/11618' into develop-olympusAndreas Fischer2013-06-271-4/+15
|\ \ | | | | | | | | | | | | * Hardolaf/ticket/11618: [ticket/11618] Replace glob() with scandir() and string matching
| * | [ticket/11618] Replace glob() with scandir() and string matchingJoseph Warner2013-06-261-4/+15
| |/ | | | | | | | | | | | | Removes glob from template tests as glob() does not work on all systems according to PHP documentation as has been noticed by users. PHPBB3-11618
* | Merge remote-tracking branch 'asperous/ticket/11615/creation_test' into ↵Andreas Fischer2013-06-271-3/+4
|\ \ | |/ |/| | | | | | | | | | | | | | | develop-olympus * asperous/ticket/11615/creation_test: [ticket/11615] Fix typo in creation_test [ticket/11615] Remove magic number in creation_test [ticket/11615] Rename class in file to match [ticket/11615] Rename init_test to creation_test for clarity
| * [ticket/11615] Fix typo in creation_testAndy Chase2013-06-261-1/+1
| | | | | | | | PHPBB3-11615
| * [ticket/11615] Remove magic number in creation_testAndy Chase2013-06-261-1/+2
| | | | | | | | | | | | | | | | Removing this magic number to its own variable with clean multiplication makes it clear what the number represents. PHPBB3-11615
| * [ticket/11615] Rename class in file to matchAndy Chase2013-06-261-1/+1
| | | | | | | | PHPBB3-11615
| * [ticket/11615] Rename init_test to creation_test for clarityAndy Chase2013-06-261-0/+0
| | | | | | | | PHPBB3-11615
* | 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 'bantu/ticket/11604' into develop-olympusJoas Schilling2013-06-201-10/+43
|\ \ \ \
| * | | | [ticket/11604] Skip installer step where config.php is created.Andreas Fischer2013-06-191-20/+27
| | | | | | | | | | | | | | | | | | | | PHPBB3-11604
| * | | | [ticket/11604] Fix case where config.php is not generated by phpBB.Andreas Fischer2013-06-181-1/+23
| | | | | | | | | | | | | | | | | | | | PHPBB3-11604
| * | | | [ticket/11604] Use variables for config.php filesnames.Andreas Fischer2013-06-181-6/+10
| |/ / / | | | | | | | | | | | | PHPBB3-11604
* | | | Merge remote-tracking branch 'nickvergessen/ticket/11603' into develop-olympusAndreas Fischer2013-06-201-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11603: [ticket/11603] Fix out dated comment [ticket/11603] Fix usage note
| * | | | [ticket/11603] Fix out dated commentJoas Schilling2013-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11603
| * | | | [ticket/11603] Fix usage noteJoas Schilling2013-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11603
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/11603' into develop-olympusAndreas Fischer2013-06-202-28/+83
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11603: [ticket/11603] Throw RuntimeExceptions instead of using exit() [ticket/11603] Avoid using cURL [ticket/11603] Split api_request into two functions (query only vs. full url) [ticket/11603] Fix spacing and add some comments [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/11603] Throw RuntimeExceptions instead of using exit()Joas Schilling2013-06-192-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11603
| * | | | [ticket/11603] Avoid using cURLJoas Schilling2013-06-192-19/+19
| | | | | | | | | | | | | | | | | | | | PHPBB3-11603
| * | | | [ticket/11603] Split api_request into two functions (query only vs. full url)Joas Schilling2013-06-131-10/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-11603
| * | | | [ticket/11603] Fix spacing and add some commentsJoas Schilling2013-06-131-2/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-11603
| * | | | [ticket/11603] Fix github API callsJoas Schilling2013-06-132-14/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Some URLs changed - Response is a plain array now - Added error messages when API limit is reached PHPBB3-11603
| * | | | [ticket/11603] Rename network to forks and fix handlingJoas Schilling2013-06-131-14/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-11603