aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/message
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-06-20 23:43:31 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-06-20 23:43:31 +0200
commit9ac237a899fe06824309a43914f978ab9eae5db0 (patch)
tree9d3e386b9b4e1de3fd43d1280b0090af613a4c45 /phpBB/phpbb/message
parent06bb40d2ca8b1f90f175d1a0f46ab32109192f73 (diff)
parent18bf45ab1b3f07fbed5c7d566766170ff0a71e8e (diff)
downloadforums-9ac237a899fe06824309a43914f978ab9eae5db0.tar
forums-9ac237a899fe06824309a43914f978ab9eae5db0.tar.gz
forums-9ac237a899fe06824309a43914f978ab9eae5db0.tar.bz2
forums-9ac237a899fe06824309a43914f978ab9eae5db0.tar.xz
forums-9ac237a899fe06824309a43914f978ab9eae5db0.zip
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 ...
Diffstat (limited to 'phpBB/phpbb/message')
0 files changed, 0 insertions, 0 deletions