Skip to content
Permalink
Browse files Browse the repository at this point in the history
Improve foreign content handling.
  • Loading branch information
votdev committed Mar 17, 2017
1 parent 529f229 commit b2db1e2
Show file tree
Hide file tree
Showing 34 changed files with 137 additions and 8 deletions.
6 changes: 6 additions & 0 deletions deb/openmediavault-clamav/debian/changelog
@@ -1,3 +1,9 @@
openmediavault-clamav (3.2.11) stable; urgency=low

* Various improvements.

-- Volker Theile <volker.theile@openmediavault.org> Fri, 17 Mar 2017 11:08:11 +0100

openmediavault-clamav (3.2.10) stable; urgency=low

* Various improvements.
Expand Down
2 changes: 1 addition & 1 deletion deb/openmediavault-clamav/debian/control
Expand Up @@ -9,7 +9,7 @@ Homepage: http://www.openmediavault.org

Package: openmediavault-clamav
Architecture: all
Depends: openmediavault (>= 3.0.60), clamav-daemon, clamav-freshclam,
Depends: openmediavault (>= 3.0.67), clamav-daemon, clamav-freshclam,
clamdscan, init-system-helpers
Priority: optional
Description: OpenMediaVault ClamAV plugin
Expand Down
Expand Up @@ -271,6 +271,7 @@ Ext.define("OMV.module.admin.service.clamav.Jobs", {
resizable: false,
iconCls: Ext.baseCSSPrefix + "grid-cell-booleaniconcolumn-switch"
},{
xtype: "textcolumn",
text: _("Shared folder"),
sortable: true,
dataIndex: "sharedfoldername",
Expand Down Expand Up @@ -329,6 +330,7 @@ Ext.define("OMV.module.admin.service.clamav.Jobs", {
stateId: "dayofweek",
renderer: OMV.util.Format.arrayRenderer(Date.mapDayOfWeek)
},{
xtype: "textcolumn",
text: _("Comment"),
sortable: true,
dataIndex: "comment",
Expand Down
6 changes: 6 additions & 0 deletions deb/openmediavault-iscsitarget/debian/changelog
@@ -1,3 +1,9 @@
openmediavault-iscsitarget (3.1.6) stable; urgency=low

* Various improvements.

-- Volker Theile <volker.theile@openmediavault.org> Fri, 17 Mar 2017 11:11:10 +0100

openmediavault-iscsitarget (3.1.5) stable; urgency=low

* Fix first installation bug.
Expand Down
2 changes: 1 addition & 1 deletion deb/openmediavault-iscsitarget/debian/control
Expand Up @@ -9,7 +9,7 @@ Homepage: http://www.openmediavault.org

Package: openmediavault-iscsitarget
Architecture: all
Depends: openmediavault (>= 3.0.60), iscsitarget, iscsitarget-dkms,
Depends: openmediavault (>= 3.0.67), iscsitarget, iscsitarget-dkms,
linux-headers-amd64 | linux-headers-armel | linux-headers-armhf |
linux-headers-i386 | linux-headers-mips | linux-headers-mipsel |
linux-headers-powerpc | linux-headers-ppc64el | linux-headers-s390 |
Expand Down
Expand Up @@ -438,21 +438,25 @@ Ext.define("OMV.module.admin.service.iscsitarget.target.LUNs", {
stateful: true,
stateId: "3107db90-c1e9-11e0-90c8-00221568ca88",
columns: [{
xtype: "textcolumn",
text: _("Id"),
sortable: true,
dataIndex: "id",
stateId: "id"
},{
xtype: "textcolumn",
text: _("Device"),
sortable: true,
dataIndex: "devicefile",
stateId: "devicefile"
},{
xtype: "textcolumn",
text: _("SCSI Id."),
sortable: true,
dataIndex: "scsiid",
stateId: "scsiid"
},{
xtype: "textcolumn",
text: _("SCSI serial no."),
sortable: true,
dataIndex: "scsisn",
Expand Down Expand Up @@ -635,21 +639,25 @@ Ext.define("OMV.module.admin.service.iscsitarget.target.Targets", {
stateful: true,
stateId: "15e18b72-c1e9-11e0-a91c-00221568ca88",
columns: [{
xtype: "textcolumn",
text: _("IQN"),
sortable: true,
dataIndex: "iqn",
stateId: "iqn"
},{
xtype: "textcolumn",
text: _("Alias"),
sortable: true,
dataIndex: "alias",
stateId: "alias"
},{
xtype: "textcolumn",
text: _("Max. connections"),
sortable: true,
dataIndex: "maxconnections",
stateId: "maxconnections"
},{
xtype: "textcolumn",
text: _("Comment"),
sortable: true,
dataIndex: "comment",
Expand Down
6 changes: 6 additions & 0 deletions deb/openmediavault-netatalk/debian/changelog
@@ -1,3 +1,9 @@
openmediavault-netatalk (3.2.8) stable; urgency=low

* Various improvements.

-- Volker Theile <volker.theile@openmediavault.org> Fri, 17 Mar 2017 11:13:02 +0100

openmediavault-netatalk (3.2.7) stable; urgency=low

* Fix first installation bug.
Expand Down
2 changes: 1 addition & 1 deletion deb/openmediavault-netatalk/debian/control
Expand Up @@ -9,7 +9,7 @@ Homepage: http://www.openmediavault.org

Package: openmediavault-netatalk
Architecture: all
Depends: openmediavault (>= 3.0.60), netatalk (>= 3.1.9)
Depends: openmediavault (>= 3.0.67), netatalk (>= 3.1.9)
Priority: optional
Description: OpenMediaVault netatalk (AppleTalk Protocol Suite) plugin
Netatalk is an implementation of the AppleTalk Protocol Suite.
Expand Up @@ -211,11 +211,13 @@ Ext.define("OMV.module.admin.service.afp.Shares", {
resizable: false,
iconCls: Ext.baseCSSPrefix + "grid-cell-booleaniconcolumn-switch"
},{
xtype: "textcolumn",
text: _("Shared folder"),
sortable: true,
dataIndex: "sharedfoldername",
stateId: "sharedfoldername"
},{
xtype: "textcolumn",
text: _("Comment"),
sortable: true,
dataIndex: "comment",
Expand Down
6 changes: 6 additions & 0 deletions deb/openmediavault-route/debian/changelog
@@ -1,3 +1,9 @@
openmediavault-route (3.1.4) stable; urgency=low

* Various improvements.

-- Volker Theile <volker.theile@openmediavault.org> Fri, 17 Mar 2017 11:14:57 +0100

openmediavault-route (3.1.3) stable; urgency=low

* Fix first installation bug.
Expand Down
2 changes: 1 addition & 1 deletion deb/openmediavault-route/debian/control
Expand Up @@ -9,7 +9,7 @@ Homepage: http://www.openmediavault.org

Package: openmediavault-route
Architecture: all
Depends: openmediavault (>= 3.0.60)
Depends: openmediavault (>= 3.0.67)
Priority: optional
Description: OpenMediaVault IP routing table plugin
Adds the ability to manipulate the IP routing table via WebGUI.
Expand Up @@ -112,16 +112,19 @@ Ext.define("OMV.module.admin.system.network.route.Routes", {
stateful: true,
stateId: "a6faec48-f389-11e1-8b67-00221568ca88",
columns: [{
xtype: "textcolumn",
text: _("Network"),
sortable: true,
dataIndex: "network",
stateId: "network"
},{
xtype: "textcolumn",
text: _("Gateway"),
sortable: true,
dataIndex: "gateway",
stateId: "gateway"
},{
xtype: "textcolumn",
text: _("Comment"),
sortable: true,
dataIndex: "comment",
Expand Down
6 changes: 6 additions & 0 deletions deb/openmediavault-usbbackup/debian/changelog
@@ -1,3 +1,9 @@
openmediavault-usbbackup (3.2.16) stable; urgency=low

* Various improvements.

-- Volker Theile <volker.theile@openmediavault.org> Fri, 17 Mar 2017 11:16:18 +0100

openmediavault-usbbackup (3.2.15) stable; urgency=low

* Various improvements.
Expand Down
2 changes: 1 addition & 1 deletion deb/openmediavault-usbbackup/debian/control
Expand Up @@ -9,7 +9,7 @@ Homepage: http://www.openmediavault.org

Package: openmediavault-usbbackup
Architecture: all
Depends: rsync, openmediavault (>= 3.0.65)
Depends: rsync, openmediavault (>= 3.0.67)
Priority: optional
Description: OpenMediaVault USB/eSATA backup plugin
Automatically synchronise a shared folder to an USB/eSATA device and vice
Expand Down
Expand Up @@ -286,16 +286,19 @@ Ext.define("OMV.module.admin.service.usbbackup.Jobs", {
resizable: false,
iconCls: Ext.baseCSSPrefix + "grid-cell-booleaniconcolumn-switch"
},{
xtype: "textcolumn",
text: _("Shared folder"),
sortable: true,
dataIndex: "sharedfoldername",
stateId: "sharedfoldername"
},{
xtype: "textcolumn",
text: _("External storage device"),
sortable: true,
dataIndex: "devicefile",
stateId: "devicefile"
},{
xtype: "textcolumn",
text: _("Comment"),
sortable: true,
dataIndex: "comment",
Expand Down
6 changes: 6 additions & 0 deletions deb/openmediavault/debian/changelog
@@ -1,3 +1,9 @@
openmediavault (3.0.67) stable; urgency=low

* Improve foreign content handling.

-- Volker Theile <volker.theile@openmediavault.org> Fri, 17 Mar 2017 09:59:46 +0100

openmediavault (3.0.66) stable; urgency=low

* Update locales.
Expand Down
@@ -0,0 +1,35 @@
/**
* This file is part of OpenMediaVault.
*
* @license http://www.gnu.org/licenses/gpl.html GPL Version 3
* @author Volker Theile <volker.theile@openmediavault.org>
* @copyright Copyright (c) 2009-2017 Volker Theile
*
* OpenMediaVault is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* any later version.
*
* OpenMediaVault is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with OpenMediaVault. If not, see <http://www.gnu.org/licenses/>.
*/
// require("js/omv/util/Format.js")

/**
* @ingroup webgui
* @class OMV.grid.column.Text
* @derived Ext.grid.column.Column
*/
Ext.define("OMV.grid.column.Text", {
extend: "Ext.grid.column.Column",
alias: [ "widget.textcolumn" ],

defaultRenderer: function(value) {
return Ext.util.Format.htmlEncode(value);
}
});
Expand Up @@ -113,6 +113,7 @@ Ext.define("OMV.module.admin.privilege.group.group.Members", {
})
}],
columns: [{
xtype: "textcolumn",
text: _("Name"),
sortable: true,
dataIndex: "name",
Expand Down Expand Up @@ -390,11 +391,13 @@ Ext.define("OMV.module.admin.privilege.group.Groups", {
stateful: true,
stateId: "d7c66fd9-2ef5-4107-9a6f-562dcdc2643a",
columns: [{
xtype: "textcolumn",
text: _("Name"),
sortable: true,
dataIndex: "name",
stateId: "name"
},{
xtype: "textcolumn",
text: _("Comment"),
sortable: true,
dataIndex: "comment",
Expand Down
Expand Up @@ -636,6 +636,7 @@ Ext.define("OMV.module.admin.privilege.sharedfolder.SharedFolders", {
stateful: true,
stateId: "9ab0d7f9-73e0-4815-8960-84157d4b85e5",
columns: [{
xtype: "textcolumn",
text: _("Name"),
sortable: true,
dataIndex: "name",
Expand All @@ -647,17 +648,20 @@ Ext.define("OMV.module.admin.privilege.sharedfolder.SharedFolders", {
dataIndex: "device",
stateId: "device"
},{
xtype: "textcolumn",
text: _("Relative Path"),
sortable: true,
dataIndex: "reldirpath",
stateId: "reldirpath"
},{
xtype: "textcolumn",
text: _("Absolute Path"),
sortable: true,
hidden: true,
dataIndex: "absdirpath",
stateId: "absdirpath"
},{
xtype: "textcolumn",
text: _("Comment"),
sortable: true,
dataIndex: "comment",
Expand Down
Expand Up @@ -191,6 +191,7 @@ Ext.define("OMV.module.admin.privilege.user.user.Groups", {
})
}],
columns: [{
xtype: "textcolumn",
text: _("Name"),
sortable: true,
dataIndex: "name",
Expand Down Expand Up @@ -590,16 +591,19 @@ Ext.define("OMV.module.admin.privilege.user.Users", {
stateful: true,
stateId: "98d6fe31-8e12-407b-82f2-7e0acf4006c1",
columns: [{
xtype: "textcolumn",
text: _("Name"),
sortable: true,
dataIndex: "name",
stateId: "name"
},{
xtype: "textcolumn",
text: _("Email"),
sortable: true,
dataIndex: "email",
stateId: "email"
},{
xtype: "textcolumn",
text: _("Comment"),
sortable: true,
dataIndex: "comment",
Expand Down
Expand Up @@ -126,11 +126,13 @@ Ext.define("OMV.module.admin.service.ftp.Shares", {
resizable: false,
iconCls: Ext.baseCSSPrefix + "grid-cell-booleaniconcolumn-switch"
},{
xtype: "textcolumn",
text: _("Shared folder"),
sortable: true,
dataIndex: "sharedfoldername",
stateId: "sharedfoldername"
},{
xtype: "textcolumn",
text: _("Comment"),
sortable: true,
dataIndex: "comment",
Expand Down
Expand Up @@ -129,11 +129,13 @@ Ext.define("OMV.module.admin.service.nfs.Shares", {
stateful: true,
stateId: "4da5f715-4381-4c6b-8c83-ab23d284d0e3",
columns: [{
xtype: "textcolumn",
text: _("Shared folder"),
sortable: true,
dataIndex: "sharedfoldername",
stateId: "sharedfoldername"
},{
xtype: "textcolumn",
text: _("Client"),
sortable: true,
dataIndex: "client",
Expand All @@ -152,6 +154,7 @@ Ext.define("OMV.module.admin.service.nfs.Shares", {
return value;
}
},{
xtype: "textcolumn",
text: _("Comment"),
sortable: true,
dataIndex: "comment",
Expand Down
Expand Up @@ -628,16 +628,19 @@ Ext.define("OMV.module.admin.service.rsync.Jobs", {
"remote": _("Remote")
}
},{
xtype: "textcolumn",
text: _("Source"),
sortable: true,
dataIndex: "srcname",
stateId: "srcname"
},{
xtype: "textcolumn",
text: _("Destination"),
sortable: true,
dataIndex: "destname",
stateId: "destname"
},{
xtype: "textcolumn",
text: _("Comment"),
sortable: true,
dataIndex: "comment",
Expand Down

0 comments on commit b2db1e2

Please sign in to comment.