aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/15037] Update topic icons to retinahanakin2017-01-2411-0/+1
| | | | PHPBB3-15037
* [ticket/15307] fix for good!hanakin2017-01-231-0/+0
| | | | PHPBB3-15037
* [ticket/15037]a attempt to fix stupid test issuehanakin2017-01-231-0/+0
| | | | PHPBB3-15037
* [ticket/15037] Update imageset to retinahanakin2017-01-2337-1/+2
| | | | PHPBB3-15037
* 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 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-226-4/+73
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * 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-226-3/+74
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Update docblock and ensure method returns arrayMarc Alexander2017-01-221-4/+8
| | | | | | | | | | | | | | | | | | | | 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-221-0/+39
| | |/ / | | | | | | | | | | | | 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
| * | | [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
* | | | [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
* | | [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
| * | | [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-152-8/+13
|\ \ \ | | | | | | | | | | | | [ticket/15016] Fixed an issue with some parentheses in smilies
| * | | [ticket/15016] Fixed an issue with some parentheses in smiliesJoshyPHP2017-01-152-8/+13
| | | | | | | | | | | | | | | | PHPBB3-15016
* | | | Merge pull request #4632 from VSEphpbb/ticket/14989Tristan Darricau2017-01-152-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-112-0/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-14989
* | | | | Merge pull request #4631 from JoshyPHP/ticket/14985Tristan Darricau2017-01-152-15/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Decode HTML special chars in plain text columnsJoshyPHP2017-01-122-15/+38
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14985
* | | | | | [ticket/15011] Fix 3.2.x mergeTristan Darricau2017-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15011
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-01-151-1/+4
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * 3.1.x: [ticket/15011] Error not checked on metadata load failure
| * | | | | Merge pull request #4646 from javiexin/ticket/15011Tristan Darricau2017-01-151-1/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15011] Error not checked on metadata load failure * javiexin/ticket/15011: [ticket/15011] Error not checked on metadata load failure
| | * | | | | [ticket/15011] Error not checked on metadata load failurejaviexin2017-01-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15011
* | | | | | | Merge pull request #4630 from hubaishan/ticket/14984Tristan Darricau2017-01-151-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14984] Correct wrong arrow direction in PM inbox * hubaishan/ticket/14984: [ticket/14984] Correct wrong arrow direction in PM inbox
| * | | | | | | [ticket/14984] Correct wrong arrow direction in PM inboxhubaishan2017-01-102-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | icons.css change is needed for RTL, becouse inherit float is right PHPBB3-14984
* | | | | | | | Merge pull request #4640 from JimMH/patch-3Tristan Darricau2017-01-151-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15002] Show topic icons in search results * JimMH/patch-3: [ticket/15002] Show topic icons in search results
| * | | | | | | | [ticket/15002] Show topic icons in search resultsJim Mossing Holsteyn2017-01-131-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #4638 from VSEphpbb/ticket/14999Tristan Darricau2017-01-151-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14999] Correct Next PM Iconography * VSEphpbb/ticket/14999: [ticket/14999] Correct Next PM Iconography
| * | | | | | | | [ticket/14999] Correct Next PM IconographyMatt Friedman2017-01-121-2/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14999
* | | | | | | | Merge pull request #4647 from marc1706/ticket/15012Tristan Darricau2017-01-151-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15012] Use valid constructor in ftp_file_updater * marc1706/ticket/15012: [ticket/15012] Use valid constructor in ftp_file_updater
| * | | | | | | [ticket/15012] Use valid constructor in ftp_file_updaterMarc Alexander2017-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15012