aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12012] Fix tools::mssql_get_existing_indexes() for SQL Server 2000Joas Schilling2014-04-171-14/+36
| | | | PHPBB3-12012
* [ticket/12012] Drop and recreate indexes when changing a column on MSSQLJoas Schilling2014-04-171-0/+111
| | | | PHPBB3-12012
* [ticket/12012] Fix query layoutJoas Schilling2014-04-171-1/+2
| | | | PHPBB3-12012
* [ticket/12012] Correctly drop default value constraints on MSSQLJoas Schilling2014-04-171-85/+59
| | | | | | | We need to drop the default constraints of a column, before being able to change their type or deleting them. PHPBB3-12012
* Merge pull request #2318 from prototech/ticket/12121Joas Schilling2014-04-161-0/+9
|\ | | | | | | | | | | | | [ticket/12121] Preserve link redirect counts when updating from 3.0.x. * prototech/ticket/12121: [ticket/12121] Preserve link redirect counts when updating from 3.0.x.
| * [ticket/12121] Preserve link redirect counts when updating from 3.0.x.Cesar G2014-04-151-0/+9
| | | | | | | | PHPBB3-12121
* | Merge pull request #2243 from n-aleha/ticket/12345Joas Schilling2014-04-162-2/+5
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12345] Improve search flood interval message for ascraeus * n-aleha/ticket/12345: [ticket/12345] Improve search flood interval message for ascraeus
| * | [ticket/12345] Improve search flood interval message for ascraeusn-aleha2014-04-162-2/+5
| | | | | | | | | | | | | | | | | | | | | Show to guests and users the remaining seconds until their next allowed search, if a search flood limit is enabled for them. PHPBB3-12345
* | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-04-161-0/+2
|\ \ \ | |_|/ |/| | | | | | | | * develop-olympus: [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail."
| * | Merge pull request #2324 from bantu/ticket/12417Joas Schilling2014-04-161-0/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fai... * bantu/ticket/12417: [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail."
| | * | [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail."Andreas Fischer2014-04-161-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | hhvm-nightly 2014.04.16~precise introduced "Attempted to serialize unserializable builtin class DOMElement" errors when running functional tests. This reverts commit ff7cc77f9db66b7fddacd77f215d85cf0243b2fa. PHPBB3-12417
* | | Merge pull request #2305 from n-aleha/ticket/12391Joas Schilling2014-04-161-3/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12391] Assign variables to core.posting_modify_template_vars * n-aleha/ticket/12391: [ticket/12391] Assign variables to core.posting_modify_template_vars
| * | | [ticket/12391] Assign variables to core.posting_modify_template_varsn-aleha2014-04-141-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Assign variables to event "core.posting_modify_template_vars". Also, fix a couple of typos. PHPBB3-12391
* | | | Merge pull request #2304 from n-aleha/ticket/12191Joas Schilling2014-04-161-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12191] Move notification options to bottom while installing * n-aleha/ticket/12191: [ticket/12191] Move notification options to bottom while installing
| * | | | [ticket/12191] Move notification options to bottom while installingn-aleha2014-04-141-0/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Move "ucp>board preferences>edit notification options" to bottom while installing. PHPBB3-12191
* | | | Merge pull request #2301 from rxu/ticket/12401Joas Schilling2014-04-161-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12401] Add $topic_data array to core.viewtopic_modify_post_row event * rxu/ticket/12401: [ticket/12401] Pass more data to core.viewtopic_modify_post_row event
| * | | | [ticket/12401] Pass more data to core.viewtopic_modify_post_row eventrxu2014-04-131-1/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $topic_data array is used in viewtopic.php to populate $post_row template block array data. Although $topic_data is not being passed to core.viewtopic_modify_post_row event for modifying/adding $post_row data in it. So, pass this array to the event. Also, total_posts is added. PHPBB3-12401
* | | | Merge pull request #2300 from rxu/ticket/12400Joas Schilling2014-04-161-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12400] Add viewforum event to modify topics data * rxu/ticket/12400: [ticket/12400] Add viewforum event to modify topics data
| * | | | [ticket/12400] Add viewforum event to modify topics datarxu2014-04-131-0/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The event allows extensions to use and/or modify topics list and/or topics data before dumping out the viewforum page. For extensions which operate with viewforum page, f.e. if the topics list and data is needed to retrieve, add, modify additional topics info before the output loop. PHPBB3-12400
* | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-04-151-2/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * develop-olympus: [ticket/12397] Fix sql_unique_index_exists doc block
| * | | Merge pull request #2310 from n-aleha/ticket/12397Andreas Fischer2014-04-151-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12397] Fix sql_unique_index_exists doc block * n-aleha/ticket/12397: [ticket/12397] Fix sql_unique_index_exists doc block
| | * | | [ticket/12397] Fix sql_unique_index_exists doc blockn-aleha2014-04-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db_tools::sql_unique_index_exists() searches for unique indexes but not primary key indexes. PHPBB3-12397
* | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-04-154-15/+66
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10423] Replace foreach with function in viewtopic.php [ticket/10423] Remove unnecessary include in test [ticket/10423] Match multiple wildcards [ticket/10423] Move code into a function and add tests for it [ticket/10423] Remove * from search or highlight string
| * | | | Merge pull request #2195 from Elsensee/ticket/10423Joas Schilling2014-04-154-15/+66
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10423] Remove * from search or highlight string * Elsensee/ticket/10423: [ticket/10423] Replace foreach with function in viewtopic.php [ticket/10423] Remove unnecessary include in test [ticket/10423] Match multiple wildcards [ticket/10423] Move code into a function and add tests for it [ticket/10423] Remove * from search or highlight string
| | * | | [ticket/10423] Replace foreach with function in viewtopic.phpOliver Schramm2014-04-151-12/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-10423
| | * | | [ticket/10423] Remove unnecessary include in testOliver Schramm2014-04-151-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-10423
| | * | | [ticket/10423] Match multiple wildcardsOliver Schramm2014-04-132-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple wildcards are removed from the string if there is no word before or after them. If there is a word before or after them, they are just replaced with a single one. PHPBB3-10423
| | * | | [ticket/10423] Move code into a function and add tests for itOliver Schramm2014-04-134-5/+60
| | | | | | | | | | | | | | | | | | | | PHPBB3-10423
| | * | | [ticket/10423] Remove * from search or highlight stringOliver Schramm2014-03-282-5/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-10423
* | | | | Merge branch 'ticket/lucifer4o/12344' into develop-ascraeusJoas Schilling2014-04-151-1/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/lucifer4o/12344: [ticket/12344] Add core.pm_submit_before to function submit_pm
| * | | | | [ticket/12344] Add core.pm_submit_before to function submit_pmlucifer4o2014-04-151-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12344
* | | | | | Merge pull request #2286 from nickvergessen/ticket/12388Andreas Fischer2014-04-152-3/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12388] Fix translation of log entries without additional log data * nickvergessen/ticket/12388: [ticket/12388] Add tests for lang() use on log actions without data [ticket/12388] Fix translation of log entries without additional log data
| * | | | | [ticket/12388] Add tests for lang() use on log actions without dataJoas Schilling2014-04-111-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12388
| * | | | | [ticket/12388] Fix translation of log entries without additional log dataJoas Schilling2014-04-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12388
* | | | | | Merge remote-tracking branch 'marc/ticket/12004' into develop-ascraeusJoas Schilling2014-04-142-0/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc/ticket/12004: [ticket/12004] Support empty routes to app.php/ in path_helper
| * | | | | | [ticket/12004] Support empty routes to app.php/ in path_helperMarc Alexander2014-04-112-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The symfony routing component allows us to use the path "/" for routes. Therefore, we should be able to use example.com/app.php/ for controllers. However, this currently does not properly work. The method get_web_root_path incorrectly returns phpbb_root_path. Therefore, paths to images or files are broken. PHPBB3-12004
* | | | | | | Merge remote-tracking branch 'marc/ticket/12372' into develop-ascraeusJoas Schilling2014-04-1419-148/+73
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc/ticket/12372: [ticket/12372] Use $() instead of jQuery() in core.js for toggleDisplay [ticket/12372] Use admin.js $(document).ready for hiding questionnaire details [ticket/12372] Rename JS function dE() to phpbb.toggleDisplay() [ticket/12372] Move dE() function core.js [ticket/12372] Unify definition of function dE() across all files [ticket/12372] Use jQuery in javascript dE() function
| * | | | | | [ticket/12372] Use $() instead of jQuery() in core.js for toggleDisplayMarc Alexander2014-04-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12372
| * | | | | | [ticket/12372] Use admin.js $(document).ready for hiding questionnaire detailsMarc Alexander2014-04-112-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12372
| * | | | | | [ticket/12372] Rename JS function dE() to phpbb.toggleDisplay()Marc Alexander2014-04-0713-49/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12372
| * | | | | | [ticket/12372] Move dE() function core.jsMarc Alexander2014-04-077-112/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12372
| * | | | | | [ticket/12372] Unify definition of function dE() across all filesMarc Alexander2014-04-074-38/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12372
| * | | | | | [ticket/12372] Use jQuery in javascript dE() functionMarc Alexander2014-04-071-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12372
* | | | | | | Merge remote-tracking branch 'marc/ticket/12398' into develop-ascraeusJoas Schilling2014-04-131-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | * marc/ticket/12398: [ticket/12398] Select correct post to restore during softdelete tests
| * | | | | | [ticket/12398] Select correct post to restore during softdelete testsMarc Alexander2014-04-131-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-12398
* | | | | | Merge remote-tracking branch 'marc/ticket/12398' into develop-ascraeusJoas Schilling2014-04-123-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc/ticket/12398: [ticket/12398] Use return of submit_post in softdelete and download tests [ticket/12398] Use submit_post return in prune_shadow_topic_test
| * | | | | | [ticket/12398] Use return of submit_post in softdelete and download testsMarc Alexander2014-04-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12398
| * | | | | | [ticket/12398] Use submit_post return in prune_shadow_topic_testMarc Alexander2014-04-121-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should get rid of possible failures during functional tests. PHPBB3-12398
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/12395' into develop-ascraeusCesar G2014-04-121-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/12395: [ticket/12395] Check for posts in the middle of the page
| * | | | | | [ticket/12395] Check for posts in the middle of the pageJoas Schilling2014-04-121-7/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-12395