Skip to content

Commit

Permalink
Merge branch '4.x' of https://github.com/alexnantel88/timefield into 4.x
Browse files Browse the repository at this point in the history
# Conflicts:
#	extension.meta.xml
  • Loading branch information
Alexandra Nantel committed Aug 23, 2017
2 parents 33864f0 + 31350c2 commit c9e990c
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 9 deletions.
26 changes: 18 additions & 8 deletions extension.meta.xml
Original file line number Diff line number Diff line change
@@ -1,25 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension id="timefield" status="released" xmlns="http://symphony-cms.com/schemas/extension/1.0">
<extension id="timefield" status="released" xmlns="http://getsymphony.com/schemas/extension/1.0">
<name>Time Field</name>
<description>A field for hours, minutes, and seconds; filterable by value or range.</description>
<repo type="github">https://github.com/symphonists/timefield</repo>
<url type="discuss">http://symphony-cms.com/discuss/thread/207/</url>
<url type="discuss">https://www.getsymphony.com/discuss/thread/207/</url>
<types>
<type>Field Types</type>
<type>Field</type>
</types>
<authors>
<author>
<name github="symphonycms" symphony="team">Symphony Team</name>
<website>http://symphony-cms.com</website>
<website>https://www.getsymphony.com/</website>
</author>
</authors>
<releases>
<release version="1.6.2" date="2017-05-19" min="2.3" max="4.x.x" php-min="5.6.x" php-max="7.x.x">
<release version="2.1.0" date="2017-08-23" min="2.6.x" max="4.x.x" php-min="5.6.x" php-max="7.x.x">
- Symphony 4.x Compatibility
</release>
<release version="2.0.2" date="2017-06-28" min="2.6.0" max="2.x.x">
- PHP7 Compatibility
</release>
<release version="2.0.1" date="2017-06-28" min="2.6.0" max="2.x.x">
- Fix meta fix errors
- Fix compatibility meta info
</release>
<release version="2.0.0" date="2017-06-05" min="2.6">
- Fix compatibility with latest Symphony version, use `Widget::Error`
</release>
<release version="1.6.1" date="2012-05-16" min="2.3" />
<release version="1.6" date="2012-03-19" min="2.3" />
<release version="1.5" date="2011-12-17" min="2.0.6" max="2.2.x" />
<release version="1.4" date="2008-04-15" min="2.0" max="2.0.5" />
<release version="1.6.0" date="2012-03-19" min="2.3" />
<release version="1.5.0" date="2011-12-17" min="2.0.6" max="2.2.x" />
<release version="1.4.0" date="2008-04-15" min="2.0" max="2.0.5" />
</releases>
</extension>
2 changes: 1 addition & 1 deletion fields/field.time.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ function displayPublishPanel(XMLElement &$wrapper, $data = NULL, $flagWithError



if($flagWithError != NULL) $wrapper->appendChild(Widget::wrapFormElementWithError($label, $flagWithError));
if($flagWithError != NULL) $wrapper->appendChild(Widget::Error($label, $flagWithError));
else $wrapper->appendChild($label);
}

Expand Down

0 comments on commit c9e990c

Please sign in to comment.