Skip to content

Commit

Permalink
Merge branch '4.1-dev' into 4.2-finder-customfields
Browse files Browse the repository at this point in the history
  • Loading branch information
Hackwar committed Jan 20, 2022
2 parents b06c2a0 + 2398e1f commit b424588
Show file tree
Hide file tree
Showing 127 changed files with 66 additions and 425 deletions.
@@ -0,0 +1,2 @@
INSERT INTO `#__extensions` (`name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
('plg_webservices_media', 'plugin', 'media', 'webservices', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0);
@@ -0,0 +1,2 @@
INSERT INTO "#__extensions" ("name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
('plg_webservices_media', 'plugin', 'media', 'webservices', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0);
11 changes: 0 additions & 11 deletions administrator/components/com_banners/forms/banner.xml
Expand Up @@ -15,7 +15,6 @@
name="name"
type="text"
label="COM_BANNERS_FIELD_NAME_LABEL"
size="40"
required="true"
/>

Expand All @@ -24,7 +23,6 @@
type="text"
label="JFIELD_ALIAS_LABEL"
description="JFIELD_ALIAS_DESC"
size="40"
hint="JFIELD_ALIAS_PLACEHOLDER"
/>

Expand All @@ -44,7 +42,6 @@
type="list"
label="JSTATUS"
class="form-select-color-state"
size="1"
default="1"
validate="options"
>
Expand Down Expand Up @@ -74,7 +71,6 @@
type="text"
label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
maxlength="255"
size="45"
/>

<field
Expand Down Expand Up @@ -121,7 +117,6 @@
name="created"
type="calendar"
label="COM_BANNERS_FIELD_CREATED_LABEL"
size="22"
translateformat="true"
showtime="true"
filter="user_utc"
Expand All @@ -138,15 +133,13 @@
name="created_by_alias"
type="text"
label="COM_BANNERS_FIELD_CREATED_BY_ALIAS_LABEL"
size="20"
/>

<field
name="modified"
type="calendar"
label="JGLOBAL_FIELD_MODIFIED_LABEL"
class="readonly"
size="22"
readonly="true"
translateformat="true"
showtime="true"
Expand All @@ -168,7 +161,6 @@
type="text"
label="COM_BANNERS_FIELD_VERSION_LABEL"
class="readonly"
size="6"
readonly="true"
filter="unset"
/>
Expand All @@ -179,7 +171,6 @@
label="COM_BANNERS_FIELD_PUBLISH_UP_LABEL"
translateformat="true"
showtime="true"
size="22"
filter="user_utc"
/>

Expand All @@ -189,7 +180,6 @@
label="COM_BANNERS_FIELD_PUBLISH_DOWN_LABEL"
translateformat="true"
showtime="true"
size="22"
filter="user_utc"
/>
</fieldset>
Expand Down Expand Up @@ -314,7 +304,6 @@
label="COM_BANNERS_FIELD_IMAGE_LABEL"
directory="banners"
hide_none="1"
size="40"
/>

<field
Expand Down
5 changes: 0 additions & 5 deletions administrator/components/com_banners/forms/client.xml
Expand Up @@ -14,23 +14,20 @@
name="name"
type="text"
label="COM_BANNERS_FIELD_NAME_LABEL"
size="40"
required="true"
/>

<field
name="contact"
type="text"
label="COM_BANNERS_FIELD_CONTACT_LABEL"
size="40"
required="true"
/>

<field
name="email"
type="email"
label="COM_BANNERS_FIELD_EMAIL_LABEL"
size="40"
validate="email"
/>

Expand All @@ -39,7 +36,6 @@
type="list"
label="JSTATUS"
class="form-select-color-state"
size="1"
default="1"
validate="options"
>
Expand All @@ -54,7 +50,6 @@
type="text"
label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
maxlength="255"
size="45"
/>

<field
Expand Down
1 change: 0 additions & 1 deletion administrator/components/com_banners/forms/download.xml
Expand Up @@ -19,7 +19,6 @@
type="text"
label="COM_BANNERS_FIELD_BASENAME_LABEL"
description="COM_BANNERS_FIELD_BASENAME_DESC"
size="40"
/>
</fieldset>
</form>
2 changes: 0 additions & 2 deletions administrator/components/com_banners/forms/filter_tracks.xml
Expand Up @@ -62,7 +62,6 @@
label="COM_BANNERS_BEGIN_LABEL"
hint="COM_BANNERS_BEGIN_HINT"
format="%Y-%m-%d"
size="10"
filter="user_utc"
/>

Expand All @@ -72,7 +71,6 @@
label="COM_BANNERS_END_LABEL"
hint="COM_BANNERS_END_HINT"
format="%Y-%m-%d"
size="10"
filter="user_utc"
/>
</fields>
Expand Down
Expand Up @@ -47,7 +47,7 @@
<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
</div>
<?php else : ?>
<table class="table" id="articleList">
<table class="table" id="bannerList">
<caption class="visually-hidden">
<?php echo Text::_('COM_BANNERS_BANNERS_TABLE_CAPTION'); ?>,
<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
Expand Down
10 changes: 0 additions & 10 deletions administrator/components/com_categories/forms/category.xml
Expand Up @@ -56,7 +56,6 @@
type="text"
label="COM_CATEGORIES_PATH_LABEL"
class="readonly"
size="40"
readonly="true"
/>

Expand All @@ -69,7 +68,6 @@
name="title"
type="text"
label="JGLOBAL_TITLE"
size="40"
required="true"
/>

Expand All @@ -78,23 +76,20 @@
type="text"
label="JFIELD_ALIAS_LABEL"
description="JFIELD_ALIAS_DESC"
size="45"
hint="JFIELD_ALIAS_PLACEHOLDER"
/>

<field
name="version_note"
type="text"
label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
size="45"
maxlength="255"
/>

<field
name="note"
type="text"
label="COM_CATEGORIES_FIELD_NOTE_LABEL"
size="40"
maxlength="255"
/>

Expand All @@ -113,7 +108,6 @@
label="JSTATUS"
default="1"
class="form-select-color-state"
size="1"
validate="options"
>
<option value="1">JPUBLISHED</option>
Expand Down Expand Up @@ -173,7 +167,6 @@
label="JGLOBAL_CREATED_DATE"
translateformat="true"
showtime="true"
size="22"
filter="user_utc"
/>

Expand All @@ -194,7 +187,6 @@
class="readonly"
translateformat="true"
showtime="true"
size="22"
readonly="true"
filter="user_utc"
/>
Expand Down Expand Up @@ -250,7 +242,6 @@
name="image_alt"
type="text"
label="COM_CATEGORIES_FIELD_IMAGE_ALT_LABEL"
size="20"
/>

<field
Expand All @@ -271,7 +262,6 @@
name="author"
type="text"
label="JAUTHOR"
size="30"
/>

<field
Expand Down

0 comments on commit b424588

Please sign in to comment.