aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/15050] Remove extra whitespaceMarc Alexander2017-01-271-2/+2
| | | PHPBB3-15050
* [ticket/15050] Use new file when new file already existsMarc Alexander2017-01-251-25/+46
| | | | | | | | | | Instead of trying to diff the new file against a pre-existing file, we're just going to use the new file. It's impossible to know whether the pre-existing file is newer or older than the new file. As the system will rely on the files being in the "new" state it's better to simply use the file in "new" state. PHPBB3-15050
* 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
| * | | [ticket/15023] Remove unnessecary left-box classhanakin2017-01-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | no longer nessecary after this fix PHPPB3-15023
| * | | [ticket/15023] undo previous changeshanakin2017-01-162-12/+1
|/ / / | | | | | | | | | PHPBB3-15023
* | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-01-151-2/+12
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/15011] Output meaningful errors when validating all metadata
| * | Merge pull request #4651 from marc1706/ticket/15011Tristan Darricau2017-01-151-2/+12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15011] Output meaningful errors when validating all metadata * marc1706/ticket/15011: [ticket/15011] Output meaningful errors when validating all metadata
| | * | [ticket/15011] Output meaningful errors when validating all metadataMarc Alexander2017-01-151-2/+12
| | | | | | | | | | | | | | | | PHPBB3-15011
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-01-152-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.1.x: [ticket/11076] State current and minimum required versions in old PHP notice
| * | | Merge pull request #4649 from marc1706/ticket/11076Tristan Darricau2017-01-152-3/+3
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | [ticket/11076] State current and minimum required versions in old PHP notice * marc1706/ticket/11076: [ticket/11076] State current and minimum required versions in old PHP notice
| | * | [ticket/11076] State current and minimum required versions in old PHP noticeMarc Alexander2017-01-152-3/+3
| |/ / | | | | | | | | | PHPBB3-11076
* | | Merge pull request #4648 from JoshyPHP/ticket/15016Marc Alexander2017-01-155-8/+58
|\ \ \ | | | | | | | | | | | | [ticket/15016] Fixed an issue with some parentheses in smilies
| * | | [ticket/15016] Fixed an issue with some parentheses in smiliesJoshyPHP2017-01-155-8/+58
| | | | | | | | | | | | | | | | PHPBB3-15016
* | | | Merge pull request #4632 from VSEphpbb/ticket/14989Tristan Darricau2017-01-153-0/+50
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14989] Allow more admin-configurable schemes in post links * VSEphpbb/ticket/14989: [ticket/14989] Allow more admin-configurable schemes in post links
| * | | | [ticket/14989] Allow more admin-configurable schemes in post linksMatt Friedman2017-01-113-0/+50
| | | | | | | | | | | | | | | | | | | | PHPBB3-14989
* | | | | Merge pull request #4631 from JoshyPHP/ticket/14985Tristan Darricau2017-01-154-15/+127
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14985] Decode HTML special chars in plain text columns * JoshyPHP/ticket/14985: [ticket/14985] Added functional tests for BBCodes and smilies [ticket/14985] Decode HTML special chars in plain text columns
| * | | | | [ticket/14985] Added functional tests for BBCodes and smiliesJoshyPHP2017-01-122-0/+89
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14985