phpbb/phpBB/language/en/acp
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
..
attachments.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
ban.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
board.php [ticket/12209] Notify the admin that OAuth still allows DB authentification 2014-06-13 14:00:34 +02:00
bots.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
common.php Merge remote-tracking branch 'github-nickvergessen/ticket/10073' into develop-ascraeus 2014-06-09 17:55:25 +02:00
database.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
email.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
extensions.php [ticket/11467] Add language variables for extension exception messages 2014-05-29 01:07:44 +03:00
forums.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
groups.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
index.htm some bugfixes 2006-10-26 10:58:58 +00:00
language.php Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594 2014-05-27 21:55:40 +02:00
modules.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
permissions.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
permissions_phpbb.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
posting.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
profile.php Merge pull request #2621 from Dragooon/ticket/12732 2014-06-20 23:39:54 +02:00
prune.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
search.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
styles.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
users.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00