aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Merge remote-tracking branch 'callumacrae/ticket/9978' into develop-olympusOleg Pudeyev2011-08-201-2/+2
| |\ \ \ \
| | * | | | [ticket/9978] Added semicolons to JavaScript in overall_header.Callum Macrae2011-08-201-2/+2
* | | | | | Merge remote-tracking branch 'github-igorw/feature/request-class' into developNils Adermann2011-08-1816-113/+213
|\ \ \ \ \ \
| * | | | | | [feature/request-class] Adjust code base to do html decoding manuallyIgor Wiedler2011-08-1810-30/+31
| * | | | | | [feature/request-class] Remove $html_encode arg, force manual decodingIgor Wiedler2011-08-183-28/+16
| * | | | | | [feature/request-class] Do not html escape user agent in header_filenameIgor Wiedler2011-08-181-1/+1
| * | | | | | Merge branch 'develop' into feature/request-classIgor Wiedler2011-08-1898-2166/+2774
| |\ \ \ \ \ \
| * | | | | | | [feature/request-class] Make use of the is_secure() methodIgor Wiedler2011-08-184-5/+5
| * | | | | | | [feature/request-class] Add is_secure method to request for HTTPSIgor Wiedler2011-08-182-0/+17
| * | | | | | | [feature/request-class] Make server() use the $html_encode parameterIgor Wiedler2011-08-061-2/+2
| * | | | | | | [feature/request-class] Remove useless conditionIgor Wiedler2011-07-161-1/+1
| * | | | | | | [feature/request-class] Minor spacing CS adjustmentsIgor Wiedler2011-07-161-1/+1
| * | | | | | | [feature/request-class] Add server(), header() and is_ajax() to requestIgor Wiedler2011-07-1516-123/+217
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-08-184-6/+9
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | Merge remote-tracking branch 'github-bantu/ticket/8571' into develop-olympusNils Adermann2011-08-184-5/+5
| |\ \ \ \ \
| | * | | | | [ticket/8571] Show age as 0 in birthday list when birthday is in the future.Andreas Fischer2011-07-201-1/+1
| | * | | | | [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future.Andreas Fischer2011-07-201-1/+1
| | * | | | | [ticket/8571] Also display age on memberlist/viewprofile when age is 0.Andreas Fischer2011-07-202-3/+3
| | | |/ / / | | |/| | |
* | | | | | 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-141-11/+44
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge remote-tracking branch 'bantu/ticket/9297' into develop-olympusOleg Pudeyev2011-08-141-11/+44
| |\ \ \ \ \ \ \
| | * | | | | | | [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-1318-1531/+2286
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | [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-094-5/+9
| * | | | | | | | [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