aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12766] Event exporter does not like RCx as versionPayBas2014-06-252-2/+2
| | | | PHPBB3-12766
* [prep-release-3.1.0-RC1] Add migration for 3.1.0-RC1Joas Schilling2014-06-241-0/+39
|
* [ticket/12762] Make ext.php optional for extensionsTristan Darricau2014-06-231-1/+1
| | | | PHPBB3-12762
* Merge pull request #2625 from Nicofuma/ticket/12726Andreas Fischer2014-06-231-1/+1
|\ | | | | | | | | | | | | | | | | | | | | [ticket/12726] Add Code Sniffer sniff ensuring PHP files do not contain any unused use statements * Nicofuma/ticket/12726: [ticket/12726] Fix coding style [ticket/12726] Update error message [ticket/12726] Fix coding style [ticket/12726] Ensure PHP files do not contain any unused use statements [ticket/12726] PSR2.Namespaces.NamespaceDeclaration
| * [ticket/12726] Ensure PHP files do not contain any unused use statementsTristan Darricau2014-06-221-1/+1
| | | | | | | | PHPBB3-12726
* | Merge remote-tracking branch 'PayBas/ticket/12608' into develop-ascraeusCesar G2014-06-2211-33/+290
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PayBas/ticket/12608: [ticket/12608] Change CSS classes to prevent styling conflicts [ticket/12608] Add subSilver [ticket/12608] Changed get_styling() to get_style_class() [ticket/12608] Remove somewhat redundant reported color style [ticket/12608] Improved LTR and various bugfixes [ticket/12608] Clean up whitespace [ticket/12608] Add styling (CSS class) options to notifications [ticket/12608] Updated tests [ticket/12608] Improve notifications drop-down menu styling in header
| * | [ticket/12608] Change CSS classes to prevent styling conflictsPayBas2014-06-224-4/+4
| | | | | | | | | | | | PHPBB3-12608
| * | [ticket/12608] Changed get_styling() to get_style_class()PayBas2014-06-156-22/+13
| | | | | | | | | | | | PHPBB3-12608
| * | [ticket/12608] Improved LTR and various bugfixesPayBas2014-06-152-0/+20
| | | | | | | | | | | | PHPBB3-12608
| * | [ticket/12608] Clean up whitespacePayBas2014-06-151-3/+3
| | | | | | | | | | | | PHPBB3-12608
| * | [ticket/12608] Add styling (CSS class) options to notificationsPayBas2014-06-154-0/+39
| | | | | | | | | | | | | | | | | | This will allow different notifications to have different styles PHPBB3-12608
| * | [ticket/12608] Improve notifications drop-down menu styling in headerPayBas2014-06-1511-28/+235
| | | | | | | | | | | | PHPBB3-12608
* | | Merge pull request #2629 from nickvergessen/ticket/12747Andreas Fischer2014-06-224-699/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12747] Drop support for Firebird * nickvergessen/ticket/12747: [ticket/12747] Remove some methods which are not used anymore [ticket/12747] Drop support for Firebird Conflicts: phpBB/phpbb/db/driver/firebird.php
| * | | [ticket/12747] Drop support for FirebirdJoas Schilling2014-06-204-691/+1
| | | | | | | | | | | | | | | | PHPBB3-12747
* | | | Merge pull request #2591 from rxu/ticket/12704Joas Schilling2014-06-2210-0/+80
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12704] Improve the load time information in the footer when enabled * rxu/ticket/12704: [ticket/12704] Improve the load time information in the footer when enabled
| * | | | [ticket/12704] Improve the load time information in the footer when enabledrxu2014-06-2010-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PR #2570 has added new constant to display load time information without debug mode is being on (https://tracker.phpbb.com/browse/PHPBB3-12687). This patch expands the total load time info with SQL/PHP load times, while hiding the additional info with <abbr> element. PHPBB3-12704
* | | | | Merge pull request #2615 from Dragooon/ticket/12730Joas Schilling2014-06-222-0/+118
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12730] Add Google+ profile field * Dragooon/ticket/12730: [ticket/12730] Update Google+ button class to use proper identification [ticket/12730] Update maxlen for type_googleplus to 255 [ticket/12730] Fix type_googleplus_test to use same validation rule as the field [ticket/12730] Update field_length to be 20 by default for Google+ [ticket/12730] Google+ field_order should be 13 [ticket/12730] Switch service name to googleplus for type_googleplus [ticket/12730] Restore field_length to 10 for type_googleplus [ticket/12730] Add functional test for Google+ field [ticket/12730] Value shouldn't be escaped for schema_data.sql [ticket/12730] Missing newline at type_googleplus_test.php [ticket/12730] Set field_active to 1 for Google+ field [ticket/12730] Add unit test for type_googleplus [ticket/12730] Add missing brackets to type_googleplus.php [ticket/12730] Update field_order for Google+ CPF [ticket/12730] Use string template for Google+ CPF instead of a new one [ticket/12730] Minor formatting fixes [ticket/12730] Incorrect indentation for type_googleplus [ticket/12730] Spaces in block header [ticket/12730] Add a Google+ field by default [ticket/12730] Add Google+ profile field type
| * | | | [ticket/12730] Update maxlen for type_googleplus to 255Shitiz Garg2014-06-212-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| * | | | [ticket/12730] Update field_length to be 20 by default for Google+Shitiz Garg2014-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| * | | | [ticket/12730] Switch service name to googleplus for type_googleplusShitiz Garg2014-06-211-10/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| * | | | [ticket/12730] Restore field_length to 10 for type_googleplusShitiz Garg2014-06-211-5/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| * | | | [ticket/12730] Add missing brackets to type_googleplus.phpShitiz Garg2014-06-211-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| * | | | [ticket/12730] Use string template for Google+ CPF instead of a new oneShitiz Garg2014-06-211-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| * | | | [ticket/12730] Minor formatting fixesShitiz Garg2014-06-212-7/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| * | | | [ticket/12730] Incorrect indentation for type_googleplusShitiz Garg2014-06-211-21/+21
| | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| * | | | [ticket/12730] Spaces in block headerShitiz Garg2014-06-211-10/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| * | | | [ticket/12730] Add a Google+ field by defaultShitiz Garg2014-06-211-0/+60
| | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| * | | | [ticket/12730] Add Google+ profile field typeShitiz Garg2014-06-211-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Google+ has a "+" before a custom URL but doesn't for those which are using their integer ID. To cover that we need to have an extra profile field PHPBB3-12730
* | | | | Merge pull request #2630 from Nicofuma/ticket/12723Andreas Fischer2014-06-228-32/+50
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12723] Add Sniff ensuring PHP files use the correct file header * Nicofuma/ticket/12723: [ticket/12723] Do not mention too many details on documentation. [ticket/12723] Do not reference the coding guidelines section. [ticket/12757] Add a Code Sniffer ruleset for PHP files of phpBB extensions [ticket/12723] Properly describe new Code Sniffer rulsets. [ticket/12723] Use core suffix in filename instead of phpbb in the middle. [ticket/12723] Add Sniff ensuring PHP files use the correct file header
| * | | | | [ticket/12723] Add Sniff ensuring PHP files use the correct file headerTristan Darricau2014-06-228-32/+50
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-12723
* | | | | [ticket/12756] Fix mysqli_fetch_assoc on hhvmTristan Darricau2014-06-211-12/+25
| |/ / / |/| | | | | | | | | | | PHPBB3-12756
* | | | Merge pull request #2628 from Dragooon/ticket/12731Joas Schilling2014-06-201-0/+60
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12731] Add YouTube custom profile field * Dragooon/ticket/12731: [ticket/12731] Add functional test for youtube field [ticket/12731] Set field_active to 1 for YouTube field [ticket/12731] Add YouTube custom profile field Conflicts: phpBB/install/schemas/schema.json phpBB/install/schemas/schema_data.sql phpBB/language/en/memberlist.php tests/functional/ucp_profile_test.php
| * | | | [ticket/12731] Add YouTube custom profile fieldShitiz Garg2014-06-201-0/+60
| |/ / / | | | | | | | | | | | | PHPBB3-12731
* | | | Merge pull request #2621 from Dragooon/ticket/12732Joas Schilling2014-06-202-0/+61
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12732] Add Skype custom profile field * Dragooon/ticket/12732: [ticket/12732] Update schema.json for Skype [ticket/12732] Add functional test for Skype profile field [ticket/12732] Values shouldn't be escaped for schema_data.sql [ticket/12732] Set field_active to 1 for Skype's field [ticket/12732] Add unit tests for ALPHA_PUNCTUATION [ticket/12732] Missing comma after validation definition [ticket/12732] Improve ALPHA_PUNCTUATION description [ticket/12732] Use user info instead of chat as default Skype action [ticket/12732] Add Skype custom profile field Conflicts: phpBB/install/schemas/schema.json phpBB/install/schemas/schema_data.sql phpBB/language/en/memberlist.php tests/functional/ucp_profile_test.php tests/profilefields/type_string_test.php
| * | | | [ticket/12732] Missing comma after validation definitionShitiz Garg2014-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12732
| * | | | [ticket/12732] Use user info instead of chat as default Skype actionShitiz Garg2014-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12732
| * | | | [ticket/12732] Add Skype custom profile fieldShitiz Garg2014-06-202-0/+61
| |/ / / | | | | | | | | | | | | PHPBB3-12732
* | | | Merge pull request #2612 from Dragooon/ticket/12733Joas Schilling2014-06-201-0/+60
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12733] Add Twitter custom profile field * Dragooon/ticket/12733: [ticket/12733] Add functional test for twitter profile field [ticket/12733] Values needn't be escaped for schema_data.sql [ticket/12733] Set field_active to 1 for Twitter [ticket/12733] Convert spaces to tabs [ticket/12733] Fix spacing for block header in profilefield_twitter.php [ticket/12733] Update schema.json [ticket/12733] Add Twitter custom profile field Conflicts: phpBB/install/schemas/schema.json phpBB/install/schemas/schema_data.sql phpBB/language/en/memberlist.php tests/functional/ucp_profile_test.php
| * | | | [ticket/12733] Convert spaces to tabsShitiz Garg2014-06-201-38/+38
| | | | | | | | | | | | | | | | | | | | PHPBB3-12733
| * | | | [ticket/12733] Fix spacing for block header in profilefield_twitter.phpShitiz Garg2014-06-201-10/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-12733
| * | | | [ticket/12733] Add Twitter custom profile fieldShitiz Garg2014-06-201-0/+60
| |/ / / | | | | | | | | | | | | PHPBB3-12733
* | | | [ticket/12729] Move ALPHA_DOTS to above ALPHA_SPACERSShitiz Garg2014-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Have easier matches first for better performance PHPBB3-12729
* | | | [ticket/12729] Convert spaces to tabsShitiz Garg2014-06-201-38/+38
| | | | | | | | | | | | | | | | PHPBB3-12729
* | | | [ticket/12729] Fix block header spacing for profilefield_facebook.phpShitiz Garg2014-06-201-10/+10
| | | | | | | | | | | | | | | | PHPBB3-12729
* | | | [ticket/12729] Unnecessary whitespace in profilefield_facebook.phpShitiz Garg2014-06-201-2/+0
| | | | | | | | | | | | | | | | PHPBB3-12729
* | | | [ticket/12729] Add Facebook custom profile fieldShitiz Garg2014-06-202-0/+63
|/ / / | | | | | | | | | PHPBB3-12729
* | | Merge pull request #2525 from Nicofuma/ticket/12638Andreas Fischer2014-06-171-2/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12638] v30x\local_url_bbcode break the migrations if we don't use the auto updater * Nicofuma/ticket/12638: [ticket/12638] Use require if phpbb_require_updated isn't available
| * | | [ticket/12638] Use require if phpbb_require_updated isn't availableTristan Darricau2014-05-311-2/+9
| | | | | | | | | | | | | | | | PHPBB3-12638
* | | | [ticket/12721] Add Squiz.ControlStructures.ElseIfDeclaration in legacyTristan Darricau2014-06-166-7/+7
| | | | | | | | | | | | | | | | PHPBB3-12721
* | | | [ticket/12721] Add Generic.Functions.OpeningFunctionBraceBsdAllmanTristan Darricau2014-06-161-1/+2
| | | | | | | | | | | | | | | | PHPBB3-12721