Skip to content

Commit

Permalink
Merge branch '4.0-dev' into helptext
Browse files Browse the repository at this point in the history
  • Loading branch information
@puneeth2001
puneeth2001 committed Feb 21, 2019
2 parents b8dc087 + 5ced70d commit 70fd35a
Show file tree
Hide file tree
Showing 21 changed files with 467 additions and 344 deletions.
1 change: 0 additions & 1 deletion administrator/components/com_categories/forms/category.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@
name="tags"
type="tag"
label="JTAG"
class="col-sm-12"
multiple="true"
/>

Expand Down
3 changes: 1 addition & 2 deletions administrator/components/com_fields/forms/field.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,10 +266,9 @@

<field
name="display_readonly"
type="radio"
type="list"
label="JFIELD_DISPLAY_READONLY_LABEL"
description="JFIELD_DISPLAY_READONLY_DESC"
class="btn-group btn-group-yesno"
default="2"
>
<option value="2">JGLOBAL_INHERIT</option>
Expand Down

0 comments on commit 70fd35a

Please sign in to comment.