aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-09-062-2/+3
|\
| * Merge remote-tracking branch 'bantu/ticket/10294' into develop-olympusAndreas Fischer2011-09-061-1/+1
| |\
| | * [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.Andreas Fischer2011-07-281-1/+1
| * | Merge remote-tracking branch 'Noxwizard/ticket/10351' into develop-olympusAndreas Fischer2011-09-061-1/+1
| |\ \
| | * | [ticket/10351] Fix Oracle's sql_column_remove()Patrick Webster2011-09-041-1/+1
| * | | Merge remote-tracking branch 'Noxwizard/ticket/10352' into develop-olympusAndreas Fischer2011-09-061-0/+1
| |\ \ \
| | * | | [ticket/10352] Add missing break for Oracle's sql_table_drop()Patrick Webster2011-09-041-0/+1
| | |/ /
* | | | Merge remote-tracking branch 'igorw/ticket/10155' into developOleg Pudeyev2011-09-051-0/+1
|\ \ \ \
| * | | | [ticket/10155] Add jQuery, introduce global assets pathIgor Wiedler2011-07-111-0/+1
* | | | | Merge remote-tracking branch 'cyberalien/ticket/10350' into developOleg Pudeyev2011-09-051-1/+1
|\ \ \ \ \
| * | | | | [ticket/10350] Fix for class phpbb_template_renderer_evalVjacheslav Trushkin2011-09-041-1/+1
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-09-051-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10321' into develop-olympusOleg Pudeyev2011-09-051-0/+6
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | [ticket/10321] Do not append the ? if the param-list is empty anyway.Joas Schilling2011-08-211-0/+6
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-08-291-0/+17
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/10346] Add drop_tables to perform_schema_changes and add testsNils Adermann2011-08-291-0/+17
* | | | | Merge branch 'develop-olympus' into developNils Adermann2011-08-261-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'github-bantu/ticket/10335' into develop-olympusNils Adermann2011-08-261-0/+6
| |\ \ \ \
| | * | | | [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.Andreas Fischer2011-08-241-0/+6
* | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-08-252-1/+38
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'github-bantu/ticket/10320' into develop-olympusNils Adermann2011-08-252-1/+38
| |\ \ \ \ \
| | * | | | | [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-251-0/+33
| | |/ / / /
* | | | | | 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
| |/ / / /
* | | | | [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-3/+0
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/10240] Reverted a commit which added buggy code.Callum Macrae2011-08-211-3/+0
| |/ / /
* | | | [feature/request-class] Adjust code base to do html decoding manuallyIgor Wiedler2011-08-186-21/+22
* | | | [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-1840-1638/+2538
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'igorw/ticket/9608' into developOleg Pudeyev2011-08-149-20/+19
| |\ \ \ \
| | * | | | [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-139-24/+24
| | | |/ / | | |/| |
| * | | | 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-1313-1524/+2255
| |\ \ \ \ \
| | * | | | | [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] Dependency inject locator into template.Oleg Pudeyev2011-08-093-4/+7
| | * | | | | [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