aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | [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-216-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| | * | | | | | [ticket/12730] Add Google+ profile field typeShitiz Garg2014-06-214-0/+71
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'develop-ascraeus' into developAndreas Fischer2014-06-2221-291/+233
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [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
| * | | | | | Merge pull request #2630 from Nicofuma/ticket/12723Andreas Fischer2014-06-2221-291/+233
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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
| | * | | | | Merge pull request #1 from bantu/ticket/12723Tristan Darricau2014-06-227-27/+41
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Ticket/12723
| | | * | | | | [ticket/12723] Do not mention too many details on documentation.Andreas Fischer2014-06-222-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12723
| | | * | | | | [ticket/12723] Do not reference the coding guidelines section.Andreas Fischer2014-06-221-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12723
| | | * | | | | [ticket/12757] Add a Code Sniffer ruleset for PHP files of phpBB extensionsAndreas Fischer2014-06-222-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12757
| | | * | | | | [ticket/12723] Properly describe new Code Sniffer rulsets.Andreas Fischer2014-06-222-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12723
| | | * | | | | [ticket/12723] Use core suffix in filename instead of phpbb in the middle.Andreas Fischer2014-06-223-3/+3
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-12723
| | * | | | | [ticket/12723] Add Sniff ensuring PHP files use the correct file headerTristan Darricau2014-06-2220-289/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12723
* | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-06-221-12/+25
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12756] Fix mysqli_fetch_assoc on hhvm
| * | | | | | Merge pull request #2634 from Nicofuma/ticket/12756Andreas Fischer2014-06-221-12/+25
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12756] Fix mysqli_fetch_assoc on hhvm * Nicofuma/ticket/12756: [ticket/12756] Fix mysqli_fetch_assoc on hhvm
| | * | | | | | [ticket/12756] Fix mysqli_fetch_assoc on hhvmTristan Darricau2014-06-211-12/+25
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-12756
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-211-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12752] Cron list tests fail on windows with ansi support
| * | | | | | Merge pull request #2631 from Nicofuma/ticket/12752Joas Schilling2014-06-211-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12752] Cron list tests fail on windows with ansi support * Nicofuma/ticket/12752: [ticket/12752] Cron list tests fail on windows with ansi support
| | * | | | | [ticket/12752] Cron list tests fail on windows with ansi supportTristan Darricau2014-06-201-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-12752
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-2012-0/+306
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: (30 commits) [ticket/12732] Update schema.json for Skype [ticket/12729] Add functional test for Facebook field [ticket/12731] Add functional test for youtube field [ticket/12732] Add functional test for Skype profile field [ticket/12733] Add functional test for twitter profile field [ticket/12730] Values needn't be escaped for schema_data.sql [ticket/12733] Values needn't be escaped for schema_data.sql [ticket/12732] Values shouldn't be escaped for schema_data.sql [ticket/12731] Set field_active to 1 for YouTube field [ticket/12731] Add YouTube custom profile field [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 [ticket/12732] Set field_active to 1 for Skype's field [ticket/12729] Set field_active as 1 for Facebook profile field [ticket/12729] Add unit test for ALPHA_DOTS validation [ticket/12729] Move ALPHA_DOTS to above ALPHA_SPACERS [ticket/12729] Convert spaces to tabs ...
| * | | | | Merge pull request #2628 from Dragooon/ticket/12731Joas Schilling2014-06-206-0/+69
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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 functional test for youtube fieldShitiz Garg2014-06-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12731
| | * | | | | [ticket/12731] Set field_active to 1 for YouTube fieldShitiz Garg2014-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12731
| | * | | | | [ticket/12731] Add YouTube custom profile fieldShitiz Garg2014-06-205-0/+67
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-12731
| * | | | | Merge pull request #2621 from Dragooon/ticket/12732Joas Schilling2014-06-209-4/+87
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Update schema.json for SkypeShitiz Garg2014-06-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12732
| | * | | | | [ticket/12732] Add functional test for Skype profile fieldShitiz Garg2014-06-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12732
| | * | | | | [ticket/12732] Values shouldn't be escaped for schema_data.sqlShitiz Garg2014-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12732
| | * | | | | [ticket/12732] Set field_active to 1 for Skype's fieldShitiz Garg2014-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12732
| | * | | | | [ticket/12732] Add unit tests for ALPHA_PUNCTUATIONShitiz Garg2014-06-201-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12732
| | * | | | | [ticket/12732] Missing comma after validation definitionShitiz Garg2014-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12732
| | * | | | | [ticket/12732] Improve ALPHA_PUNCTUATION descriptionShitiz Garg2014-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12732
| | * | | | | [ticket/12732] Use user info instead of chat as default Skype actionShitiz Garg2014-06-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12732
| | * | | | | [ticket/12732] Add Skype custom profile fieldShitiz Garg2014-06-206-0/+65
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-12732
| * | | | | Merge pull request #2612 from Dragooon/ticket/12733Joas Schilling2014-06-206-2/+73
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Add functional test for twitter profile fieldShitiz Garg2014-06-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12733
| | * | | | | [ticket/12733] Values needn't be escaped for schema_data.sqlShitiz Garg2014-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12733
| | * | | | | [ticket/12733] Set field_active to 1 for TwitterShitiz Garg2014-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12733
| | * | | | | [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] Update schema.jsonShitiz Garg2014-06-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12733
| | * | | | | [ticket/12733] Add Twitter custom profile fieldShitiz Garg2014-06-204-0/+63
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-12733
| * | | | | Merge pull request #2611 from Dragooon/ticket/12729Joas Schilling2014-06-209-0/+83
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12729] Add Facebook custom profile field * Dragooon/ticket/12729: [ticket/12729] Add functional test for Facebook field [ticket/12730] Values needn't be escaped for schema_data.sql [ticket/12729] Set field_active as 1 for Facebook profile field [ticket/12729] Add unit test for ALPHA_DOTS validation [ticket/12729] Move ALPHA_DOTS to above ALPHA_SPACERS [ticket/12729] Convert spaces to tabs [ticket/12729] Fix block header spacing for profilefield_facebook.php [ticket/12729] Update schema.json [ticket/12729] Unnecessary whitespace in profilefield_facebook.php [ticket/12729] Cleanup schema_data.sql for Facebook field [ticket/12729] Add Facebook custom profile field
| | * | | | | [ticket/12729] Add functional test for Facebook fieldShitiz Garg2014-06-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12729
| | * | | | | [ticket/12730] Values needn't be escaped for schema_data.sqlShitiz Garg2014-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| | * | | | | [ticket/12729] Set field_active as 1 for Facebook profile fieldShitiz Garg2014-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12729
| | * | | | | [ticket/12729] Add unit test for ALPHA_DOTS validationShitiz Garg2014-06-201-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12729
| | * | | | | [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