makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 05:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB
History
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
..
adm Merge pull request #2514 from prototech/ticket/12553 2014-06-20 10:37:30 +02:00
assets Merge pull request #2514 from prototech/ticket/12553 2014-06-20 10:37:30 +02:00
bin [ticket/12655] Run the shell when --shell is used 2014-06-04 14:46:40 +02:00
cache
config Merge remote-tracking branch 'github-marc1706/ticket/12352' into develop-ascraeus 2014-06-11 14:27:57 +02:00
develop [ticket/12508] Move \phpbb\extension\finder to \phpbb\finder 2014-06-10 11:47:40 +02:00
docs Merge remote-tracking branch 'github-nickvergessen/ticket/10073' into develop-ascraeus 2014-06-09 17:55:25 +02:00
download [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
ext [ticket/11163] Add ext/index.htm 2014-05-15 14:11:11 +02:00
files
images
includes Merge pull request #2566 from marc1706/ticket/11711 2014-06-20 10:51:58 +02:00
install Merge pull request #2621 from Dragooon/ticket/12732 2014-06-20 23:39:54 +02:00
language Merge pull request #2621 from Dragooon/ticket/12732 2014-06-20 23:39:54 +02:00
phpbb Merge pull request #2621 from Dragooon/ticket/12732 2014-06-20 23:39:54 +02:00
store
styles Merge pull request #2514 from prototech/ticket/12553 2014-06-20 10:37:30 +02:00
.htaccess Merge branch 'develop-olympus' into develop-ascraeus 2014-05-03 00:37:28 +02:00
app.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
common.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
composer.json Merge branch 'task/sami' into task/sami-ascraeus 2014-05-16 18:13:45 +02:00
composer.lock Merge branch 'task/sami' into task/sami-ascraeus 2014-05-16 18:13:45 +02:00
cron.php Merge pull request #2523 from bantu/ticket/12597 2014-05-30 22:52:01 +02:00
faq.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
feed.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
index.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
mcp.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
memberlist.php [ticket/10073] Make contact page available when board is disabled 2014-05-29 02:14:44 +02:00
posting.php [ticket/11711] Improve coding and comments of character check 2014-06-10 15:51:25 +02:00
report.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
search.php [ticket/12721] Add Squiz.ControlStructures.ForLoopDeclaration in legacy 2014-06-16 22:35:44 +02:00
ucp.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
viewforum.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
viewonline.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
viewtopic.php [ticket/12667] Do not point viewtopic URL to unread post outside of view=unread 2014-06-09 13:54:43 -07:00
web.config