From: colemanw Date: Wed, 11 Dec 2013 21:27:17 +0000 (-0800) Subject: Merge pull request #1765 from lynndanzig/master X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=639a47e989e0b5b12be546d93f99ec0571f887ee;p=civicrm-core.git Merge pull request #1765 from lynndanzig/master CRM-13497 - Add html type to schema xml --- 639a47e989e0b5b12be546d93f99ec0571f887ee diff --cc xml/schema/Contribute/ContributionPage.xml index 10aa925d26,2eb5059802..738ab211df --- a/xml/schema/Contribute/ContributionPage.xml +++ b/xml/schema/Contribute/ContributionPage.xml @@@ -29,11 -28,12 +29,13 @@@ intro_text + Contribution Page Introduction Text text - textarea - 6 - 50 + + TextArea + 6 + 50 + true Text and html allowed. Displayed below title. 1.3 @@@ -345,11 -360,12 +363,13 @@@ honor_block_text + Contribution Page Honor Block Text text - textarea - 2 - 50 + + TextArea + 2 + 50 + true text for honor block. 1.5 diff --cc xml/schema/Core/MappingField.xml index cf2ef8783a,da9e05043b..1094e08af1 --- a/xml/schema/Core/MappingField.xml +++ b/xml/schema/Core/MappingField.xml @@@ -130,9 -139,12 +139,12 @@@ operator enum =, !=, >, <, >=, <=, - IN, NOT IN, LIKE, NOT LIKE, IS NULL, IS NOT NULL + IN, NOT IN, LIKE, NOT LIKE, IS NULL, IS NOT NULL, IS NOT EMPTY, IS EMPTY SQL WHERE operator for search-builder mapping fields (search criteria). 1.5 + + Select + value