aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge remote-tracking branch 'Noxwizard/ticket/10351' into develop-olympusAndreas Fischer2011-09-061-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/10351: [ticket/10351] Fix Oracle's sql_column_remove()
| | * | | [ticket/10351] Fix Oracle's sql_column_remove()Patrick Webster2011-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The correct syntax is DROP COLUMN. PHPBB3-10351
| * | | | Merge remote-tracking branch 'Noxwizard/ticket/10352' into develop-olympusAndreas Fischer2011-09-061-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/10352: [ticket/10352] Add missing break for Oracle's sql_table_drop()
| | * | | | [ticket/10352] Add missing break for Oracle's sql_table_drop()Patrick Webster2011-09-041-0/+1
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-10352
* | | | | Merge remote-tracking branch 'igorw/ticket/10155' into developOleg Pudeyev2011-09-0514-0/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10155: [ticket/10155] Briefly explain assets in coding-guidelines [ticket/10155] Move jQuery inclusion to footer [ticket/10155] Update to jQuery 1.6.2 [ticket/10155] Add jQuery to AUTHORS [ticket/10155] Add jQuery, introduce global assets path
| * | | | | [ticket/10155] Briefly explain assets in coding-guidelinesIgor Wiedler2011-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10155
| * | | | | [ticket/10155] Move jQuery inclusion to footerIgor Wiedler2011-07-1714-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10155
| * | | | | [ticket/10155] Update to jQuery 1.6.2Igor Wiedler2011-07-121-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10155
| * | | | | [ticket/10155] Add jQuery to AUTHORSIgor Wiedler2011-07-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10155
| * | | | | [ticket/10155] Add jQuery, introduce global assets pathIgor Wiedler2011-07-1113-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the jQuery JavaScript library to all pages, giving modifications instant access and allowing for any future core JavaScript to take advantage of it. Also introduce a global /assets directory for assets that are shared between styles. PHPBB3-10155
* | | | | | Merge remote-tracking branch 'cyberalien/ticket/10350' into developOleg Pudeyev2011-09-051-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10350: [ticket/10350] Script for testing eval renderer [ticket/10350] Fix for class phpbb_template_renderer_eval
| * | | | | | [ticket/10350] Fix for class phpbb_template_renderer_evalVjacheslav Trushkin2011-09-041-1/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing bug in class phpbb_template_renderer_eval PHPBB3-10350
* | | | | | Merge remote-tracking branch 'bantu/ticket/9474' into developOleg Pudeyev2011-09-052-105/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/9474: [ticket/9474] Remove unused/unreferenced mcp_viewlogs.html files.
| * | | | | | [ticket/9474] Remove unused/unreferenced mcp_viewlogs.html files.Andreas Fischer2011-08-232-105/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9474
* | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-09-051-0/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | / / / | | |_|/ / / | |/| | | | | | | | | | * develop-olympus: [ticket/10321] Add descriptions to the unit tests [ticket/10321] Do not append the ? if the param-list is empty anyway.
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/10321' into develop-olympusOleg Pudeyev2011-09-051-0/+6
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10321: [ticket/10321] Add descriptions to the unit tests [ticket/10321] Do not append the ? if the param-list is empty anyway.
| | * | | | [ticket/10321] Do not append the ? if the param-list is empty anyway.Joas Schilling2011-08-211-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10321
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-08-301-1/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10339] Remove invalid template loop variable from mcp_front.html
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/10339' into develop-olympusAndreas Fischer2011-08-301-1/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10339: [ticket/10339] Remove invalid template loop variable from mcp_front.html
| | * | | | | [ticket/10339] Remove invalid template loop variable from mcp_front.htmlJoas Schilling2011-08-241-1/+0
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-10339
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-08-301-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10334] Require permissions to view the birthday-list on board index Conflicts: phpBB/index.php
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/10334' into develop-olympusAndreas Fischer2011-08-301-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10334: [ticket/10334] Require permissions to view the birthday-list on board index
| | * | | | | [ticket/10334] Require permissions to view the birthday-list on board indexJoas Schilling2011-08-231-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-10334
* | | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-08-292-4/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
| * | | | | Merge remote-tracking branch 'remotes/bantu/ticket/10341' into ↵Joas Schilling2011-08-292-4/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/bantu/10341 * remotes/bantu/ticket/10341: [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
| | * | | | | [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.Andreas Fischer2011-08-252-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10341
* | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-08-291-0/+17
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10346] Add drop_tables to perform_schema_changes and add tests
| * | | | | | [ticket/10346] Add drop_tables to perform_schema_changes and add testsNils Adermann2011-08-291-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10346
* | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-08-273-9/+15
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
| * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10253' into develop-olympusOleg Pudeyev2011-08-273-9/+15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10253: [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
| | * | | | | | [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.Joas Schilling2011-07-303-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since IE9 IE supports textarea.selectionStart and window.getSelection. The only problem is, that the values are still incorrect. Therefore we need to ensure that it is still treated the old way, until IE fixes this completely. PHPBB3-10253
* | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-08-262-0/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.
| * | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10335' into develop-olympusNils Adermann2011-08-262-0/+12
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10335: [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.
| | * | | | | | | [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.Andreas Fischer2011-08-242-0/+12
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | PHPBB3-10335
* | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-08-253-24/+40
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10320] Exclude passworded forums when determining "Most active topic". [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
| * | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10320' into develop-olympusNils Adermann2011-08-253-24/+40
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10320: [ticket/10320] Exclude passworded forums when determining "Most active topic". [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
| | * | | | | | | [ticket/10320] Exclude passworded forums when determining "Most active topic".Andreas Fischer2011-08-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10320
| | * | | | | | | [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.Andreas Fischer2011-08-252-23/+35
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10320
* | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-08-251-15/+27
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9995] Do not run forum SQL query when marking the whole board read. [ticket/9995] Always continue when harvesting $forum_ids for markread(). [ticket/9995] Remove useless statement from display_forums() Conflicts: phpBB/includes/functions_display.php
| * | | | | | | [ticket/9995] Do not run forum SQL query when marking the whole board read.Andreas Fischer2011-08-261-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9995
| * | | | | | | [ticket/9995] Always continue when harvesting $forum_ids for markread().Andreas Fischer2011-08-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9995
| * | | | | | | [ticket/9995] Remove useless statement from display_forums()Andreas Fischer2011-08-261-2/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The $forum_ids array is only used if $mark_read == 'forums'. When $mark_read == 'forums', we either continue when $auth->acl_get('f_list', $forum_id) is false or true. So this statement is never useful. PHPBB3-9995
* | | | | | | Merge remote-tracking branch 'bantu/ticket/10329' into developIgor Wiedler2011-08-214-6/+6
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | * bantu/ticket/10329: [ticket/10329] Add phpbb_ prefix to new pcre_utf8_support() function.
| * | | | | | [ticket/10329] Add phpbb_ prefix to new pcre_utf8_support() function.Andreas Fischer2011-08-214-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced by 6b4d0a254218e8d40151ca1bdff8c439f89502e9. PHPBB3-10329
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-08-211-1/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | * develop-olympus: [ticket/8177] Display birthdays of 29th february on 28th in non-leap years.
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/8177' into develop-olympusAndreas Fischer2011-08-211-1/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8177: [ticket/8177] Display birthdays of 29th february on 28th in non-leap years.
| | * | | | | [ticket/8177] Display birthdays of 29th february on 28th in non-leap years.Joas Schilling2011-08-211-1/+9
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-8177
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-08-211-3/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10240] Reverted a commit which added buggy code.
| * | | | | [ticket/10240] Reverted a commit which added buggy code.Callum Macrae2011-08-211-3/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f9dbe33fa7917b6220a85a01ed9f395f3f1bb888. The code which was added also removed new lines and tabs. PHPBB3-10240
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-08-201-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/9978] Added semicolons to JavaScript in overall_header.