aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2011-08-262-0/+12
|\
| * Merge remote-tracking branch 'github-bantu/ticket/10335' into develop-olympusNils Adermann2011-08-262-0/+12
| |\
| | * [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.Andreas Fischer2011-08-242-0/+12
* | | Merge branch 'develop-olympus' into developNils Adermann2011-08-253-24/+40
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'github-bantu/ticket/10320' into develop-olympusNils Adermann2011-08-253-24/+40
| |\ \
| | * | [ticket/10320] Exclude passworded forums when determining "Most active topic".Andreas Fischer2011-08-251-1/+5
| | * | [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.Andreas Fischer2011-08-252-23/+35
| | |/
* | | Merge branch 'develop-olympus' into developNils Adermann2011-08-251-15/+27
|\ \ \ | |/ /
| * | [ticket/9995] Do not run forum SQL query when marking the whole board read.Andreas Fischer2011-08-261-14/+27
| * | [ticket/9995] Always continue when harvesting $forum_ids for markread().Andreas Fischer2011-08-261-1/+2
| * | [ticket/9995] Remove useless statement from display_forums()Andreas Fischer2011-08-261-2/+0
| |/
* | Merge remote-tracking branch 'bantu/ticket/10329' into developIgor Wiedler2011-08-214-6/+6
|\ \
| * | [ticket/10329] Add phpbb_ prefix to new pcre_utf8_support() function.Andreas Fischer2011-08-214-6/+6
* | | 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
|\ \ \ | |/ /
| * | [ticket/10240] Reverted a commit which added buggy code.Callum Macrae2011-08-211-3/+0
| |/
* | 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-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
|\ \ \ \ \ \ | | |/ / / / | |/| | | |