aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-08-211-1/+9
|\
| * Merge remote-tracking branch 'nickvergessen/ticket/8177' into develop-olympusAndreas Fischer2011-08-211-1/+9
| |\
| | * [ticket/8177] Display birthdays of 29th february on 28th in non-leap years.Joas Schilling2011-08-211-1/+9
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-08-211-3/+0
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympusAndreas Fischer2011-08-211-3/+0
| |\ \
| | * | [ticket/10240] Reverted a commit which added buggy code.Callum Macrae2011-08-211-3/+0
| | |/
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-08-213-6/+8
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'p/ticket/10309' into develop-olympusAndreas Fischer2011-08-212-1/+1
| |\ \
| | * | [ticket/10309] Update .gitignore and move .gitkeep.Oleg Pudeyev2011-08-202-1/+1
| * | | Merge branch 'develop-olympus' of git://github.com/phpbb/phpbb3 into develop-...Andreas Fischer2011-08-215-7/+7
| |\ \ \ | | | |/ | | |/|
| * | | Merge remote-tracking branch 'p/ticket/10309' into develop-olympusAndreas Fischer2011-08-161-4/+7
| |\ \ \ | | | |/ | | |/|
| | * | [ticket/10309] Coding guidelines fix.Oleg Pudeyev2011-08-091-1/+1
| | * | [ticket/10309] Write unicode data to tests/tmp.Oleg Pudeyev2011-08-071-4/+7
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-08-201-2/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | 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-1823-143/+362
|\ \ \ \ \
| * | | | | [feature/request-class] Fix session_testable_factoryIgor Wiedler2011-08-191-3/+2
| * | | | | [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-186-45/+21
| * | | | | [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-18130-2372/+3557
| |\ \ \ \ \
| * | | | | | [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-184-0/+33
| * | | | | | [feature/request-class] Make server() use the $html_encode parameterIgor Wiedler2011-08-062-2/+46
| * | | | | | [feature/request-class] Remove useless conditionIgor Wiedler2011-07-161-1/+1
| * | | | | | [feature/request-class] Minor spacing CS adjustmentsIgor Wiedler2011-07-162-3/+3
| * | | | | | [feature/request-class] Add server(), header() and is_ajax() to requestIgor Wiedler2011-07-1523-151/+317
* | | | | | | 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-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