aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMáté Bartus2017-01-290-0/+0
|\
| * Merge pull request #4679 from marc1706/ticket/14998Máté Bartus2017-01-291-1/+1
| |\ | | | | | | | | | [ticket/14998] Point only to install dir from acp_update
| | * [ticket/14998] Point only to install dir from acp_updateMarc Alexander2017-01-281-1/+1
| |/ | | | | | | PHPBB3-14998
* | Merge pull request #4678 from DavidIQ/ticket/15047Marc Alexander2017-01-281-4/+42
|\ \ | | | | | | | | | [ticket/15047] Various db tools fixes for MSSQL
| * | [ticket/15047] Reinstate length check for MSSQL 2000David Colón2017-01-261-1/+11
| | |
| * | [ticket/15047] Do not set default for identity colsDavid Colón2017-01-261-1/+32
| | |
| * | [ticket/15047] Use brackets due to keyword usageDavid Colón2017-01-261-1/+1
| | |
| * | [ticket/15047] Don't attempt to drop primary keysDavid Colón2017-01-261-0/+1
| | |
| * | [ticket/15047] No index name length check for mssqlDavid Colón2017-01-261-4/+0
| | |
* | | Merge pull request #4661 from hanakin/ticket/15037Marc Alexander2017-01-2749-4/+6
|\ \ \ | |/ / |/| | | | | [ticket/15037] Make imagesets retina
| * | [ticket/15037] Optimize what can behanakin2017-01-242-0/+0
| | | | | | | | | | | | PHPBB3-15037
| * | [ticket/15037] Update topic icons to retinahanakin2017-01-2411-0/+1
| | | | | | | | | | | | PHPBB3-15037
| * | [ticket/15037] try larger size limithanakin2017-01-231-1/+1
| | | | | | | | | | | | PHPBB3-15037
| * | [ticket/15307] fix for good!hanakin2017-01-232-2/+2
| | | | | | | | | | | | PHPBB3-15037
| * | [ticket/15037]a attempt to fix stupid test issuehanakin2017-01-232-3/+3
| | | | | | | | | | | | PHPBB3-15037
| * | [ticket/15037] Update imageset to retinahanakin2017-01-2337-1/+2
| | | | | | | | | | | | PHPBB3-15037
* | | Merge remote-tracking branch 'origin/ticket/15045' into 3.2.xMarc Alexander2017-01-251-1/+6
|\ \ \ | |/ / |/| |
| * | [ticket/15045] Fix user object instantiation in version_testMarc Alexander2017-01-241-1/+6
|/ / | | | | | | PHPBB3-15045
* | Merge pull request #4650 from marc1706/ticket/11076-rheaTristan Darricau2017-01-222-1/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | [ticket/11076] State current and minimum required versions in old PHP notice * marc1706/ticket/11076-rhea: [ticket/11076] Also state min PHP version when visiting forum website [ticket/11076] Also add notice about unsupported version to installer
| * | [ticket/11076] Also state min PHP version when visiting forum websiteMarc Alexander2017-01-201-1/+6
| | | | | | | | | | | | | | | | | | | | | A lot better to have a simple message than having the complete board break, sometimes without even knowing thanks to bad host setups with no error logs. PHPBB3-11076
| * | [ticket/11076] Also add notice about unsupported version to installerMarc Alexander2017-01-201-0/+5
| | | | | | | | | | | | PHPBB3-11076
* | | Use SSL in version check for extensiontas25802017-01-221-1/+1
| | | | | | | | | | | | PHPBB3-15025
* | | Merge pull request #4659 from marc1706/ticket/15036Tristan Darricau2017-01-221-0/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15036] Unlink install_config during functional testing * marc1706/ticket/15036: [ticket/15036] Unlink install_config during functional testing
| * | | [ticket/15036] Unlink install_config during functional testingMarc Alexander2017-01-211-0/+7
| |/ / | | | | | | | | | PHPBB3-15036
* | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-01-221-1/+1
|\ \ \ | | |/ | |/| | | | | | | * 3.1.x: [ticket/14997] Fixing topiclist_row_topic_title_after position
| * | Merge pull request #4663 from marc1706/ticket/14997Tristan Darricau2017-01-221-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14997] Fixing topiclist_row_topic_title_after position * marc1706/ticket/14997: [ticket/14997] Fixing topiclist_row_topic_title_after position
| | * | [ticket/14997] Fixing topiclist_row_topic_title_after positionTarantinoMariachi2017-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing position as it is correctly on subsilver, or else it will appear some problems when using polls or on topics with page numbers. PHPBB3-14997
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-01-227-4/+273
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14968] Use earlier version as written in comment [ticket/14968] Update docblock and ensure method returns array [ticket/14968] Display possible upgrade on acp index and update page [ticket/14968] Add method for retrieving updates on current branch
| * | | Merge pull request #4662 from marc1706/ticket/14968Tristan Darricau2017-01-227-3/+274
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14968] Distinguish between update/upgrade & show upgrade info in ACP index * marc1706/ticket/14968: [ticket/14968] Use earlier version as written in comment [ticket/14968] Update docblock and ensure method returns array [ticket/14968] Display possible upgrade on acp index and update page [ticket/14968] Add method for retrieving updates on current branch
| | * | | [ticket/14968] Use earlier version as written in commentMarc Alexander2017-01-221-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14968
| | * | | [ticket/14968] Update docblock and ensure method returns arrayMarc Alexander2017-01-222-6/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-14968
| | * | | [ticket/14968] Display possible upgrade on acp index and update pageMarc Alexander2017-01-225-3/+31
| | | | | | | | | | | | | | | | | | | | PHPBB3-14968
| | * | | [ticket/14968] Add method for retrieving updates on current branchMarc Alexander2017-01-222-0/+239
| | |/ / | | | | | | | | | | | | PHPBB3-14968
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-01-221-2/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.1.x: [ticket/15006] Pass inherit settings to form and use correct button
| * | | Merge pull request #4665 from marc1706/ticket/15006Tristan Darricau2017-01-221-2/+3
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | [ticket/15006] Pass inherit settings to form and use correct button * marc1706/ticket/15006: [ticket/15006] Pass inherit settings to form and use correct button
| | * | [ticket/15006] Pass inherit settings to form and use correct buttonMarc Alexander2017-01-221-2/+3
| |/ / | | | | | | | | | PHPBB3-15006
* | | Merge pull request #4668 from marc1706/ticket/15015Tristan Darricau2017-01-221-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15015] Use correct explain string for enable email settings * marc1706/ticket/15015: [ticket/15015] Use correct explain string for enable email settings
| * | | [ticket/15015] Use correct explain string for enable email settingsMarc Alexander2017-01-221-1/+1
| | | | | | | | | | | | | | | | PHPBB3-15015
* | | | Merge pull request #4666 from JoshyPHP/ticket/14790Marc Alexander2017-01-222-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14790] Added test case
| * | | | [ticket/14790] Added test caseJoshyPHP2017-01-222-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-14790
* | | | | Merge pull request #4664 from JoshyPHP/ticket/15040Marc Alexander2017-01-221-5/+5
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | [ticket/15040] Update s9e\TextFormatter to 0.9.1
| * | | [ticket/15040] Updated s9e\TextFormatter to 0.9.1JoshyPHP2017-01-221-5/+5
|/ / / | | | | | | | | | PHPBB3-15040
* | | Merge pull request #4658 from kasimi/ticket/15035Marc Alexander2017-01-211-0/+14
|\ \ \ | |_|/ |/| | | | | [ticket/15035] Add phpinfo.php to 3.2.x install directory
| * | [ticket/15035] Add phpinfo.php to 3.2.x install directorykasimi2017-01-201-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | In 3.1.x there's a phpinfo.php in the /install folder which seems to be removed in 3.2.x, perhaps by accident? https://github.com/phpbb/phpbb/commits/3.2.x/phpBB/install/phpinfo.php Let's add it back for easier troubleshooting potential issues during installation. PHPBB3-15035
* | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-01-201-292/+0
|\ \ \ | | |/ | |/| | | | | | | * 3.1.x: [ticket/11611] Remove no longer used file for setting up git repository
| * | Merge pull request #4656 from marc1706/ticket/11611Tristan Darricau2017-01-201-292/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11611] Remove no longer used file for setting up git repository * marc1706/ticket/11611: [ticket/11611] Remove no longer used file for setting up git repository
| | * | [ticket/11611] Remove no longer used file for setting up git repositoryMarc Alexander2017-01-161-292/+0
| |/ / | | | | | | | | | PHPBB3-11611
* | | Merge pull request #4654 from hanakin/ticket/15023Marc Alexander2017-01-174-22/+14
|\ \ \ | | | | | | | | | | | | [ticket/15023] fix responsive post row paging
| * | | [ticket/15023] Fix for lintinghanakin2017-01-161-2/+2
| | | | | | | | | | | | | | | | PHPBB3-15023
| * | | [ticket/15023] Remove all prev RWD and add newhanakin2017-01-161-9/+10
| | | | | | | | | | | | | | | | PHPBB3-15023