Commit graph

22865 commits

Author SHA1 Message Date
Andreas Fischer
900a5b07c4 [ticket/12757] Add a Code Sniffer ruleset for PHP files of phpBB extensions
PHPBB3-12757
2014-06-22 01:33:13 +02:00
Andreas Fischer
82c43e258b [ticket/12723] Properly describe new Code Sniffer rulsets.
PHPBB3-12723
2014-06-22 01:20:49 +02:00
Andreas Fischer
e7c6da2c54 [ticket/12723] Use core suffix in filename instead of phpbb in the middle.
PHPBB3-12723
2014-06-22 01:19:02 +02:00
Tristan Darricau
32a2c95f90 [ticket/12723] Add Sniff ensuring PHP files use the correct file header
PHPBB3-12723
2014-06-22 00:45:34 +02:00
Andreas Fischer
566615fa31 Merge pull request #2634 from Nicofuma/ticket/12756
[ticket/12756] Fix mysqli_fetch_assoc on hhvm

* Nicofuma/ticket/12756:
  [ticket/12756] Fix mysqli_fetch_assoc on hhvm
2014-06-22 00:38:36 +02:00
Andreas Fischer
4033f222fc Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12756] Fix mysqli_fetch_assoc on hhvm
2014-06-22 00:38:36 +02:00
Tristan Darricau
89a7a55190 [ticket/12756] Fix mysqli_fetch_assoc on hhvm
PHPBB3-12756
2014-06-21 16:50:17 +02:00
Marc Alexander
0499655ba4 [ticket/12755] Add timeout to remote upload to prevent infinite loop
PHPBB3-12755
2014-06-21 11:55:54 +02:00
Joas Schilling
e21b012bd1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12752] Cron list tests fail on windows with ansi support
2014-06-21 00:41:40 +02:00
Joas Schilling
40d264654c Merge pull request #2631 from Nicofuma/ticket/12752
[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
2014-06-21 00:40:55 +02:00
Shitiz Garg
6b90a0d095 [ticket/12753] Add invalid chars string for ALPHA_DOTS and ALPHA_PUNCTUATION
PHPBB3-12753
2014-06-21 04:03:43 +05:30
Shitiz Garg
d4679e6a95 [ticket/12730] Update Google+ button class to use proper identification
PHPBB3-12730
2014-06-21 03:55:09 +05:30
Shitiz Garg
e51a5791dd [ticket/12730] Update maxlen for type_googleplus to 255
PHPBB3-12730
2014-06-21 03:51:08 +05:30
Shitiz Garg
ff057dfc8e [ticket/12730] Fix type_googleplus_test to use same validation rule as the field
PHPBB3-12730
2014-06-21 03:49:59 +05:30
Shitiz Garg
72f3ff2dcc [ticket/12730] Update field_length to be 20 by default for Google+
PHPBB3-12730
2014-06-21 03:48:23 +05:30
Shitiz Garg
4b49d451aa [ticket/12730] Google+ field_order should be 13
PHPBB3-12730
2014-06-21 03:42:38 +05:30
Shitiz Garg
985dbd4482 [ticket/12730] Switch service name to googleplus for type_googleplus
PHPBB3-12730
2014-06-21 03:35:19 +05:30
Shitiz Garg
83966a575b [ticket/12730] Restore field_length to 10 for type_googleplus
PHPBB3-12730
2014-06-21 03:35:19 +05:30
Shitiz Garg
ea0e073c12 [ticket/12730] Add functional test for Google+ field
PHPBB3-12730
2014-06-21 03:35:19 +05:30
Shitiz Garg
4690709212 [ticket/12730] Value shouldn't be escaped for schema_data.sql
PHPBB3-12730
2014-06-21 03:33:02 +05:30
Shitiz Garg
b50744ae09 [ticket/12730] Missing newline at type_googleplus_test.php
PHPBB3-12730
2014-06-21 03:32:34 +05:30
Shitiz Garg
9c18df8690 [ticket/12730] Set field_active to 1 for Google+ field
PHPBB3-12730
2014-06-21 03:32:34 +05:30
Shitiz Garg
30cce1ed49 [ticket/12730] Add unit test for type_googleplus
PHPBB3-12730
2014-06-21 03:31:45 +05:30
Shitiz Garg
474dc57782 [ticket/12730] Add missing brackets to type_googleplus.php
PHPBB3-12730
2014-06-21 03:31:45 +05:30
Shitiz Garg
b516da649f [ticket/12730] Update field_order for Google+ CPF
PHPBB3-12730
2014-06-21 03:31:45 +05:30
Shitiz Garg
1363dccf12 [ticket/12730] Use string template for Google+ CPF instead of a new one
PHPBB3-12730
2014-06-21 03:31:23 +05:30
Shitiz Garg
e1454ec487 [ticket/12730] Minor formatting fixes
PHPBB3-12730
2014-06-21 03:31:23 +05:30
Shitiz Garg
d15706bff5 [ticket/12730] Incorrect indentation for type_googleplus
PHPBB3-12730
2014-06-21 03:31:23 +05:30
Shitiz Garg
0e04748d7f [ticket/12730] Spaces in block header
PHPBB3-12730
2014-06-21 03:31:23 +05:30
Shitiz Garg
ab83995f44 [ticket/12730] Add a Google+ field by default
PHPBB3-12730
2014-06-21 03:31:23 +05:30
Shitiz Garg
3cebb18ce8 [ticket/12730] Add Google+ profile field type
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
2014-06-21 03:29:31 +05:30
Joas Schilling
9ac237a899 Merge branch 'develop-ascraeus' into develop
* 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
  ...
2014-06-20 23:43:31 +02:00
Joas Schilling
18bf45ab1b Merge pull request #2628 from Dragooon/ticket/12731
[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
2014-06-20 23:42:54 +02:00
Joas Schilling
3c38fcce40 Merge pull request #2621 from Dragooon/ticket/12732
[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
2014-06-20 23:39:54 +02:00
Joas Schilling
b9890c6a4c Merge pull request #2612 from Dragooon/ticket/12733
[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
2014-06-20 23:37:51 +02:00
Joas Schilling
8595fee040 Merge pull request #2611 from Dragooon/ticket/12729
[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
2014-06-20 23:36:26 +02:00
Shitiz Garg
6b58f40663 [ticket/12732] Update schema.json for Skype
PHPBB3-12732
2014-06-21 01:16:37 +05:30
Tristan Darricau
0404d3b910 [ticket/12752] Cron list tests fail on windows with ansi support
PHPBB3-12752
2014-06-20 19:12:58 +02:00
Shitiz Garg
aeeaf2f6ef [ticket/12729] Add functional test for Facebook field
PHPBB3-12729
2014-06-20 21:20:04 +05:30
Shitiz Garg
51b4dc7077 [ticket/12731] Add functional test for youtube field
PHPBB3-12731
2014-06-20 21:17:23 +05:30
Shitiz Garg
10b466848a [ticket/12732] Add functional test for Skype profile field
PHPBB3-12732
2014-06-20 21:13:29 +05:30
Shitiz Garg
cdfcbfc6d0 [ticket/12733] Add functional test for twitter profile field
PHPBB3-12733
2014-06-20 21:12:02 +05:30
Shitiz Garg
27d761d08e [ticket/12730] Values needn't be escaped for schema_data.sql
PHPBB3-12730
2014-06-20 21:04:07 +05:30
Shitiz Garg
abc55dcb40 [ticket/12733] Values needn't be escaped for schema_data.sql
PHPBB3-12733
2014-06-20 21:03:04 +05:30
Shitiz Garg
01e05ccc6b [ticket/12732] Values shouldn't be escaped for schema_data.sql
PHPBB3-12732
2014-06-20 21:02:11 +05:30
hanakin
cc67f49fce [ticket/12740] Use class for logo in css
PHPBB3-12740
2014-06-20 17:25:06 +02:00
Joas Schilling
06bb40d2ca Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12746] Init phpbb_dispatcher being used by delete_post()
2014-06-20 16:02:24 +02:00
Joas Schilling
a5ca7479b2 Merge pull request #2626 from dhruvgoel92/ticket/12746
[ticket/12746] Init phpbb_dispatcher being used by delete_post()

* dhruvgoel92/ticket/12746:
  [ticket/12746] Init phpbb_dispatcher being used by delete_post()
2014-06-20 16:02:18 +02:00
Shitiz Garg
acbc0ea1f7 [ticket/12731] Set field_active to 1 for YouTube field
PHPBB3-12731
2014-06-20 19:21:57 +05:30
Shitiz Garg
03c5de594e [ticket/12731] Add YouTube custom profile field
PHPBB3-12731
2014-06-20 19:21:57 +05:30