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