aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2648 from dhruvgoel92/ticket/12562Andreas Fischer2014-06-242-6/+4
|\ | | | | | | | | | | | | Revert "[ticket/12562] Add max-width to proSilver" * dhruvgoel92/ticket/12562: [ticket/12562] Revert "Add max-width to proSilver"
| * [ticket/12562] Revert "Add max-width to proSilver"Dhruv2014-06-252-6/+4
| | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12562 PHPBB3-12562
* | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-06-243-2/+31
|\ \ | |/ |/| | | | | | | | | | | | | * develop-olympus: [ticket/12755] Apply de morgan to conditional [ticket/12755] Terminate upload loop if upload reaches filesize [ticket/12755] Change upload in remote_upload() method to fit get_remote_file [ticket/12755] Add language string for timed out remote upload [ticket/12755] Add timeout to remote upload to prevent infinite loop
| * Merge pull request #2633 from marc1706/ticket/12755Andreas Fischer2014-06-243-2/+31
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12755] Add timeout to remote upload to prevent infinite loop * marc1706/ticket/12755: [ticket/12755] Apply de morgan to conditional [ticket/12755] Terminate upload loop if upload reaches filesize [ticket/12755] Change upload in remote_upload() method to fit get_remote_file [ticket/12755] Add language string for timed out remote upload [ticket/12755] Add timeout to remote upload to prevent infinite loop
| | * [ticket/12755] Apply de morgan to conditionalMarc Alexander2014-06-241-1/+1
| | | | | | | | | | | | PHPBB3-12755
| | * [ticket/12755] Terminate upload loop if upload reaches filesizeMarc Alexander2014-06-241-2/+12
| | | | | | | | | | | | | | | | | | | | | Terminate the upload loop if the expected filesize has been reached instead of trying to read more bytes until the timeout has been reached. PHPBB3-12755
| | * [ticket/12755] Change upload in remote_upload() method to fit get_remote_fileMarc Alexander2014-06-241-12/+14
| | | | | | | | | | | | PHPBB3-12755
| | * [ticket/12755] Add language string for timed out remote uploadMarc Alexander2014-06-233-1/+3
| | | | | | | | | | | | PHPBB3-12755
| | * [ticket/12755] Add timeout to remote upload to prevent infinite loopMarc Alexander2014-06-211-0/+15
| |/ | | | | | | PHPBB3-12755
* | Merge pull request #2646 from prototech/ticket/12750Andreas Fischer2014-06-242-2/+6
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12750] Center installation page copyright text. * prototech/ticket/12750: [ticket/12750] Center installation page copyright text.
| * | [ticket/12750] Center installation page copyright text.Cesar G2014-06-242-2/+6
| | | | | | | | | | | | PHPBB3-12750
* | | Merge remote-tracking branch 'github-nickvergessen/ticket/12612' into ↵Nils Adermann2014-06-2416-97/+109
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12612: [ticket/12612] Prefix check_ids() with phpbb_ [ticket/12612] Prefix mcp_sorting() with phpbb_ [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global [ticket/12612] Prefix module url functions with phpbb_ [ticket/12612] Prefix upload_popup() with phpbb_ [ticket/12612] Prefix handle_post_delete() with phpbb and remove unused global [ticket/12612] Prefix custom UCP module function with phpbb_ [ticket/12612] Prefix _sort_last_active() with phpbb_ [ticket/12612] Prefix show_profile() with phpbb and delete unused global
| * | | [ticket/12612] Prefix check_ids() with phpbb_Joas Schilling2014-06-236-17/+17
| | | | | | | | | | | | | | | | PHPBB3-12612
| * | | [ticket/12612] Prefix mcp_sorting() with phpbb_Joas Schilling2014-06-236-7/+7
| | | | | | | | | | | | | | | | PHPBB3-12612
| * | | [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused globalJoas Schilling2014-06-2310-39/+39
| | | | | | | | | | | | | | | | PHPBB3-12612
| * | | [ticket/12612] Prefix module url functions with phpbb_Joas Schilling2014-06-234-27/+31
| | | | | | | | | | | | | | | | PHPBB3-12612
| * | | [ticket/12612] Prefix upload_popup() with phpbb_Joas Schilling2014-06-232-3/+3
| | | | | | | | | | | | | | | | PHPBB3-12612
| * | | [ticket/12612] Prefix handle_post_delete() with phpbb and remove unused globalJoas Schilling2014-06-232-4/+4
| | | | | | | | | | | | | | | | PHPBB3-12612
| * | | [ticket/12612] Prefix custom UCP module function with phpbb_Joas Schilling2014-06-232-2/+10
| | | | | | | | | | | | | | | | PHPBB3-12612
| * | | [ticket/12612] Prefix _sort_last_active() with phpbb_Joas Schilling2014-06-232-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12612
| * | | [ticket/12612] Prefix show_profile() with phpbb and delete unused globalJoas Schilling2014-06-232-4/+4
| | | | | | | | | | | | | | | | PHPBB3-12612
* | | | Merge remote-tracking branch 'PayBas/ticket/12562' into develop-ascraeusCesar G2014-06-232-4/+6
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | * PayBas/ticket/12562: [ticket/12562] Add max-width to proSilver
| * | | [ticket/12562] Add max-width to proSilverPayBas2014-06-222-4/+6
| | | | | | | | | | | | | | | | PHPBB3-12562
* | | | Merge remote-tracking branch 'PayBas/ticket/12648' into develop-ascraeusCesar G2014-06-2320-296/+235
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PayBas/ticket/12648: [ticket/12648] RTL fix & ACP border fix [ticket/12648] Slightly clear ACP active tab border [ticket/12648] Fix poll tab and revert unrelated color change [ticket/12648] Fix poll tab display error [ticket/12648] Added ARIA functionality [ticket/12648] Fix and modernize ACP header tabs [ticket/12648] More style fixes and also cleaned up CP left navigation [ticket/12648] IE8 & IE9 color fix [ticket/12648] Improve UCP/MCP/Posting tabs
| * | | | [ticket/12648] RTL fix & ACP border fixPayBas2014-06-243-23/+40
| | | | | | | | | | | | | | | | | | | | PHPBB3-12648
| * | | | [ticket/12648] Slightly clear ACP active tab borderPayBas2014-06-241-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12648
| * | | | [ticket/12648] Fix poll tab and revert unrelated color changePayBas2014-06-242-3/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-12648
| * | | | [ticket/12648] Fix poll tab display errorPayBas2014-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12648
| * | | | [ticket/12648] Added ARIA functionalityPayBas2014-06-244-13/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-12648
| * | | | [ticket/12648] Fix and modernize ACP header tabsPayBas2014-06-246-97/+76
| | | | | | | | | | | | | | | | | | | | PHPBB3-12648
| * | | | [ticket/12648] More style fixes and also cleaned up CP left navigationPayBas2014-06-248-55/+51
| | | | | | | | | | | | | | | | | | | | PHPBB3-12648
| * | | | [ticket/12648] IE8 & IE9 color fixPayBas2014-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12648
| * | | | [ticket/12648] Improve UCP/MCP/Posting tabsPayBas2014-06-247-139/+81
| | |/ / | |/| | | | | | | | | | PHPBB3-12648
* | | | Merge pull request #2642 from Nicofuma/ticket/12762Andreas Fischer2014-06-241-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12762] Make ext.php optional for extensions * Nicofuma/ticket/12762: [ticket/12762] Make ext.php optional for extensions
| * | | | [ticket/12762] Make ext.php optional for extensionsTristan Darricau2014-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12762
* | | | | Merge pull request #2643 from nickvergessen/ticket/12763Andreas Fischer2014-06-2410-242/+23
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ticket/12763 Do not regenerate the *_schema.sql files * nickvergessen/ticket/12763: [ticket/12763] Remove invalid comment from oracle and postgres *_schema.sql [ticket/12763] Remove empty schema files [ticket/12763] Do not regenerate the *_schema.sql files
| * | | | [ticket/12763] Remove invalid comment from oracle and postgres *_schema.sqlJoas Schilling2014-06-232-15/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12763
| * | | | [ticket/12763] Remove empty schema filesJoas Schilling2014-06-237-44/+23
| | | | | | | | | | | | | | | | | | | | PHPBB3-12763
| * | | | [ticket/12763] Do not regenerate the *_schema.sql filesJoas Schilling2014-06-231-183/+0
|/ / / / | | | | | | | | | | | | PHPBB3-12763
* | | | Merge pull request #2587 from dhruvgoel92/ticket/11528Andreas Fischer2014-06-239-159/+380
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11528] Refactor install_board( ) into a new mink class * dhruvgoel92/ticket/11528: [ticket/11528] Change click_submit() to accept id as param [ticket/11528] Handle case when config file cant be written by installer [ticket/11528] Change NULL to null [ticket/11528] Fix spaces and slashes as per guidelines [ticket/11528] Add asserts in installation steps [ticket/11528] Use 'use' keyword to import classes to current scope [ticket/11528] Move parent::tearDown() to end of tearDown() [ticket/11528] Call parent::tearDown in overrided tearDown method [ticket/11528] Instantiate $client, $driver from functional test case [ticket/11528] Refactor install_board() code into a new class [ticket/11528] Add behat/mink and mink-goutte-driver as dependency
| * | | | [ticket/11528] Change click_submit() to accept id as paramDhruv2014-06-231-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11528
| * | | | [ticket/11528] Handle case when config file cant be written by installerDhruv2014-06-231-1/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11528
| * | | | [ticket/11528] Change NULL to nullDhruv2014-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11528
| * | | | [ticket/11528] Fix spaces and slashes as per guidelinesDhruv2014-06-232-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11528
| * | | | [ticket/11528] Add asserts in installation stepsDhruv2014-06-231-1/+19
| | | | | | | | | | | | | | | | | | | | PHPBB3-11528
| * | | | [ticket/11528] Use 'use' keyword to import classes to current scopeDhruv2014-06-231-2/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11528
| * | | | [ticket/11528] Move parent::tearDown() to end of tearDown()Dhruv2014-06-236-11/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-11528
| * | | | [ticket/11528] Call parent::tearDown in overrided tearDown methodDhruv2014-06-234-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-11528
| * | | | [ticket/11528] Instantiate $client, $driver from functional test caseDhruv2014-06-232-130/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make mink test case an abstract class, instantiate $driver, $client from its child class i.e. functional test case. PHPBB3-11528
| * | | | [ticket/11528] Refactor install_board() code into a new classDhruv2014-06-233-149/+256
| | | | | | | | | | | | | | | | | | | | PHPBB3-11528