aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
...
| * | | 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-0514-0/+38
|\ \ \ \ \
| * | | | | [ticket/10155] Briefly explain assets in coding-guidelinesIgor Wiedler2011-07-171-1/+1
| * | | | | [ticket/10155] Move jQuery inclusion to footerIgor Wiedler2011-07-1714-7/+14
| * | | | | [ticket/10155] Update to jQuery 1.6.2Igor Wiedler2011-07-121-3/+5
| * | | | | [ticket/10155] Add jQuery to AUTHORSIgor Wiedler2011-07-121-0/+1
| * | | | | [ticket/10155] Add jQuery, introduce global assets pathIgor Wiedler2011-07-1113-0/+28
* | | | | | 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 remote-tracking branch 'bantu/ticket/9474' into developOleg Pudeyev2011-09-052-105/+0
|\ \ \ \ \ \
| * | | | | | [ticket/9474] Remove unused/unreferenced mcp_viewlogs.html files.Andreas Fischer2011-08-232-105/+0
* | | | | | | 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 developAndreas Fischer2011-08-301-1/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/10339' into develop-olympusAndreas Fischer2011-08-301-1/+0
| |\ \ \ \ \
| | * | | | | [ticket/10339] Remove invalid template loop variable from mcp_front.htmlJoas Schilling2011-08-241-1/+0
| | |/ / / /
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-08-301-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/10334' into develop-olympusAndreas Fischer2011-08-301-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/10334] Require permissions to view the birthday-list on board indexJoas Schilling2011-08-231-1/+1
| | |/ / / /
* | | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-08-292-4/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'remotes/bantu/ticket/10341' into ticket/bantu/1...Joas Schilling2011-08-292-4/+4
| |\ \ \ \ \
| | * | | | | [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.Andreas Fischer2011-08-252-4/+4
* | | | | | | 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 developOleg Pudeyev2011-08-273-9/+15
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10253' into develop-olympusOleg Pudeyev2011-08-273-9/+15
| |\ \ \ \ \ \
| | * | | | | | [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.Joas Schilling2011-07-303-9/+15
* | | | | | | | 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
|\ \ \ \ \ | |/ / / /