aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-06-2212-39/+77
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-2212-39/+77
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-2212-39/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12723
* | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-06-221-12/+25
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [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-2010-0/+272
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-205-0/+67
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] 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-207-2/+71
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] 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] 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-205-0/+67
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] 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
| * | | | | [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] 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] Update schema.jsonShitiz Garg2014-06-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12729
| * | | | | [ticket/12729] Unnecessary whitespace in profilefield_facebook.phpShitiz Garg2014-06-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12729
| * | | | | [ticket/12729] Cleanup schema_data.sql for Facebook fieldShitiz Garg2014-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12729
| * | | | | [ticket/12729] Add Facebook custom profile fieldShitiz Garg2014-06-206-0/+67
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-12729
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-203-0/+19
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/11711] Improve coding and comments of character check [ticket/11711] Reduce size of tests and also test topic titles [ticket/11711] Improve checks for unsupported characters and check subject [ticket/11711] Inform user of unsupported characters while posting
| * | | | Merge pull request #2566 from marc1706/ticket/11711Joas Schilling2014-06-203-0/+19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11711] Inform user of unsupported characters while posting * marc1706/ticket/11711: [ticket/11711] Improve coding and comments of character check [ticket/11711] Reduce size of tests and also test topic titles [ticket/11711] Improve checks for unsupported characters and check subject [ticket/11711] Inform user of unsupported characters while posting
| | * | | | [ticket/11711] Improve coding and comments of character checkMarc Alexander2014-06-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11711
| | * | | | [ticket/11711] Improve checks for unsupported characters and check subjectMarc Alexander2014-06-093-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11711
| | * | | | [ticket/11711] Inform user of unsupported characters while postingMarc Alexander2014-06-092-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11711
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-2010-85/+199
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12553] Fix responsive user profile. [ticket/12553] Fix responsive post profile. [ticket/12553] Remove dropdown-trigger class from member search input. [ticket/12553] Fix the merge topic list. [ticket/12553] Fix dropdown position of live search [ticket/12553] Fix the responsive topic/forum lists. [ticket/12553] Align the text in responsive tables to the right. [ticket/12553] Center the responsive CP menus instead of floating right. [ticket/12553] Open the notification dropdown to the left. [ticket/12553] Fix alignment of contact icon. [ticket/12553] Fix incorrect alignment in ACP responsive tables. [ticket/12553] Align alert text to the right. [ticket/12553] Remove incorrect size for site logo. [ticket/12553] Fix links in the last post column that are not clickable. [ticket/12553] Align contact icons to the right. [ticket/12553] Move Place inline and Delete buttons left of the file name.
| * | | | | Merge pull request #2514 from prototech/ticket/12553Joas Schilling2014-06-2010-85/+199
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12553] Right-to-left fixes. * prototech/ticket/12553: [ticket/12553] Fix responsive user profile. [ticket/12553] Fix responsive post profile. [ticket/12553] Remove dropdown-trigger class from member search input. [ticket/12553] Fix the merge topic list. [ticket/12553] Fix dropdown position of live search [ticket/12553] Fix the responsive topic/forum lists. [ticket/12553] Align the text in responsive tables to the right. [ticket/12553] Center the responsive CP menus instead of floating right. [ticket/12553] Open the notification dropdown to the left. [ticket/12553] Fix alignment of contact icon. [ticket/12553] Fix incorrect alignment in ACP responsive tables. [ticket/12553] Align alert text to the right. [ticket/12553] Remove incorrect size for site logo. [ticket/12553] Fix links in the last post column that are not clickable. [ticket/12553] Align contact icons to the right. [ticket/12553] Move Place inline and Delete buttons left of the file name.
| | * | | | | [ticket/12553] Fix responsive user profile.Cesar G2014-06-142-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12553
| | * | | | | [ticket/12553] Fix responsive post profile.Cesar G2014-06-141-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12553
| | * | | | | [ticket/12553] Remove dropdown-trigger class from member search input.Cesar G2014-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12553
| | * | | | | [ticket/12553] Fix the merge topic list.Cesar G2014-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12553
| | * | | | | [ticket/12553] Fix dropdown position of live searchJoas Schilling2014-06-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12553
| | * | | | | [ticket/12553] Fix the responsive topic/forum lists.Cesar G2014-06-141-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12553
| | * | | | | [ticket/12553] Align the text in responsive tables to the right.Cesar G2014-06-141-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12553
| | * | | | | [ticket/12553] Center the responsive CP menus instead of floating right.Cesar G2014-06-141-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12553
| | * | | | | [ticket/12553] Open the notification dropdown to the left.Cesar G2014-06-144-55/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12553
| | * | | | | [ticket/12553] Fix alignment of contact icon.Cesar G2014-06-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12553