aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge remote-tracking branch 'erikfrerejean/ticket/10312' into developAndreas Fischer2011-08-162-2/+2
|\ \ \ \ \
| * | | | | [ticket/10312] Un-check the shadow option while moving.Erik Frèrejean2011-08-102-2/+2
* | | | | | Merge remote-tracking branch 'erikfrerejean/ticket/10316' into developAndreas Fischer2011-08-161-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/10316] Resolve inconsistent move topic behaviorErik Frèrejean2011-08-151-1/+1
| |/ / / / /
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-08-161-3/+11
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge remote-tracking branch 'p/ticket/9976' into develop-olympusAndreas Fischer2011-08-161-3/+11
| |\ \ \ \ \
| | * | | | | [ticket/9976] Fix link to post when two posts have the same post_time.Joas Schilling2011-07-301-3/+11
* | | | | | | Merge remote-tracking branch 'igorw/ticket/9608' into developOleg Pudeyev2011-08-1412-23/+22
|\ \ \ \ \ \ \
| * | | | | | | [ticket/9608] Remove use of references in topic_reviewIgor Wiedler2011-08-141-1/+1
| * | | | | | | [ticket/9608] Revert changes to normalizerIgor Wiedler2011-08-081-5/+5
| * | | | | | | [ticket/9608] Remove blank lineIgor Wiedler2011-07-171-1/+0
| * | | | | | | [ticket/9608] Remove use of references in captcha and other placesIgor Wiedler2011-07-1312-27/+27
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-08-142-11/+107
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge remote-tracking branch 'bantu/ticket/9297' into develop-olympusOleg Pudeyev2011-08-142-11/+107
| |\ \ \ \ \ \
| | * | | | | | [ticket/9297] Add network to class name of unit tests.Andreas Fischer2011-08-141-1/+1
| | * | | | | | [ticket/9297] Fix typo in localhost.Andreas Fischer2011-08-141-1/+1
| | * | | | | | [ticket/9297] Rename test class to reflect its contents.Oleg Pudeyev2011-08-141-1/+1
| | * | | | | | [ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to work.Oleg Pudeyev2011-08-141-5/+3
| | * | | | | | [ticket/9297] Fix markTestSkipped call in setUpBeforeClass.Oleg Pudeyev2011-08-141-1/+1
| | * | | | | | [ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails.Oleg Pudeyev2011-08-141-1/+10
| | * | | | | | [ticket/9297] Separate ipv4 and ipv6 tests into separate functions.Oleg Pudeyev2011-08-141-4/+13
| | * | | | | | [ticket/9297] Update copyright year of unit test file.Andreas Fischer2011-08-141-1/+1
| | * | | | | | [ticket/9297] Make EPSV unit tests work without IPv6.Andreas Fischer2011-08-111-10/+9
| | * | | | | | [ticket/9297] Unit tests for ftp_fsock PASV and EPSV.Andreas Fischer2011-08-111-0/+48
| | * | | | | | [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class.Andreas Fischer2011-08-111-11/+44
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge remote-tracking branch 'github-p/feature/template-engine' into developNils Adermann2011-08-1343-1712/+2771
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | [feature/template-engine] Delete _get_locator function.Oleg Pudeyev2011-08-131-13/+0
| * | | | | | [feature/template-engine] Clean up template locator usage in bbcode.Oleg Pudeyev2011-08-131-3/+2
| * | | | | | [feature/template-engine] Need to call set_template on template.Oleg Pudeyev2011-08-091-1/+1
| * | | | | | [feature/template-engine] Update installer for template engine changes.Oleg Pudeyev2011-08-091-1/+2
| * | | | | | [feature/template-engine] Dependency inject locator into template.Oleg Pudeyev2011-08-096-7/+14
| * | | | | | [feature/template-engine] Delete useless code from set_template.Oleg Pudeyev2011-08-091-7/+1
| * | | | | | [feature/template-engine] Delete no longer used $template_filename property.Oleg Pudeyev2011-08-091-1/+0
| * | | | | | [feature/template-engine] Delete useless $template globalization.Oleg Pudeyev2011-08-091-1/+1
| * | | | | | [feature/template-engine] Use template engine class in bbcode class.Oleg Pudeyev2011-08-072-17/+19
| * | | | | | [feature/template-engine] Corrected an error message in template locator.Oleg Pudeyev2011-08-071-1/+1
| * | | | | | [feature/template-engine] Remaining documentation.Oleg Pudeyev2011-08-077-1/+57
| * | | | | | [feature/template-engine] More documentation for template class.Oleg Pudeyev2011-08-071-8/+35
| * | | | | | [feature/template-engine] Create load_and_render to reduce code duplication.Oleg Pudeyev2011-08-071-7/+13
| * | | | | | [feature/template-engine] Get rid of orig_tpl_* in template engine.Oleg Pudeyev2011-08-042-68/+28
| * | | | | | [feature/template-engine] Delete $style_name param from locator's set_custom_...Oleg Pudeyev2011-08-042-5/+3
| * | | | | | [feature/template-engine] Add constructor to template locator.Oleg Pudeyev2011-08-042-1/+9
| * | | | | | [feature/template-engine] Factor template locator out of template class.Oleg Pudeyev2011-07-303-120/+285
| * | | | | | [feature/template-engine] Delete $files_template property.Oleg Pudeyev2011-07-301-4/+0
| * | | | | | [feature/template-engine] Rename is_absolute to phpbb_is_absolute.Oleg Pudeyev2011-07-243-4/+4
| * | | | | | [feature/template-engine] Test template DEFINE statements across filesNils Adermann2011-07-173-1/+7
| * | | | | | [feature/template-engine] Docblocks, no more constructor for filterIgor Wiedler2011-07-161-6/+18
| * | | | | | [feature/template-engine] Add ampersands to return refs by reference.Oleg Pudeyev2011-07-101-2/+2
| * | | | | | [feature/template-engine] Delete useless assignment by reference for $lang.Oleg Pudeyev2011-07-102-2/+2
| * | | | | | [feature/template-engine] Remove $include_once argument of display()Igor Wiedler2011-07-103-12/+9