Commit Graph

445 Commits

Author SHA1 Message Date
vgilc 594b6e9417 Merge branch '1320-Exportación-CSV-saca-entities-dev' into 'develop'
1320 exportación csv saca entities dev

See merge request artica/pandorafms!1007
2017-11-02 15:35:38 +01:00
Daniel Maya b9851a3a71 code backup 2017-10-31 11:51:19 +01:00
enriquecd 96b3ebc67a Change pandoradb treport_content_template and treport_content fields - #654 2017-10-30 17:27:37 +01:00
enriquecd f608c686b8 Graph and table mode for max, min and avg reports an template reports - #654 2017-10-30 17:23:59 +01:00
nramon 8163200f54 Revert "Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'"
This reverts merge request !871
2017-10-30 16:11:58 +01:00
nramon 65ae5ed2eb Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'
Graph and table mode for max, min and avg reports and template reports - #654

See merge request artica/pandorafms!871
2017-10-30 15:51:51 +01:00
nramon 49a1f7d872 Merge branch '1459-Campo-para-establecer-el-tiempo-de-autorefresco-dev' into 'develop'
Added time autorefresh

See merge request artica/pandorafms!945
2017-10-30 10:58:07 +01:00
Daniel Maya f6e012e0fa Added time autorefresh 2017-10-23 13:17:06 +02:00
Ramon Novoa cb7390371c Replace the index data_index1 on tagente_datos with a composite index.
Agent data is always searched by agent id and utimestamp. A composite
index makes queries on tagente_datos a lot faster. pandora_db.pl can
still use the existing index on utimestamp. Ref pandora_enterprise#1485.
2017-10-23 09:21:57 +02:00
enriquecd 788265713e Graph and table mode for max, min and avg reports an template reports - #654 2017-10-02 18:23:26 +02:00
daniel 7a8135f36d fixed error merge dani 2017-09-25 09:45:58 +02:00
enriquecd 8ce6920e44 DB changes for visual console group elements - #1245 2017-09-07 12:11:13 +02:00
daniel d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
fbsanchez 4d1be92150 DB changes (text => mediumtext) ONLY NEW INSTALLATIONS 2017-08-31 19:14:31 +02:00
Arturo Gonzalez f021bedb5c Added proxy servers to events response form 2017-08-24 12:34:06 +02:00
Arturo Gonzalez 3291526195 Added new fields to server table 2017-08-23 12:41:36 +02:00
daniel c29d8a4fdb Revert "merge develop"
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
2017-08-23 09:35:17 +02:00
Daniel Maya 3ef3679f10 Fixed issue with cascade_protection_module 2017-08-08 10:38:30 +02:00
daniel 590bfbfe84 mr-5 add queries 2017-08-07 13:57:04 +02:00
Arturo Gonzalez ea06ba213b Added registration method to reset pass 2017-08-03 13:05:57 +02:00
vgilc 9a791dc0a5 Merge branch '1082-some-modifications-in-change-pass-feature-dev' into 'develop'
Added some fixes to reset pass feature

See merge request !677
2017-07-28 10:23:31 +02:00
Arturo Gonzalez 278330e8f6 Added some fixes to reset pass feature 2017-07-19 11:37:17 +02:00
vgilc 6dba0a5040 Merge branch 'develop' into '713-Asignar-políticas-a-grupos-dev'
# Conflicts:
#   pandora_console/extras/mr/4.sql
2017-07-18 12:24:49 +02:00
Daniel Maya f0e43e252c New feature: Add groups to policies 2017-07-18 12:06:57 +02:00
vgilc 66ad86a302 Merge branch '1015-Aumentar-tamaño-del-campo-nombre-en-tabla-texport_server_data' into 'develop'
Change tserver_export_data to varchar 600 - #1015

See merge request !600
2017-07-17 15:41:45 +02:00
Arturo Gonzalez 1ea465b7d4 Added db changes to package 708 2017-07-17 10:46:26 +02:00
Daniel Maya 57f6ad097a update 2017-07-11 10:10:48 +02:00
enriquecd e6e993538b Add historical db check to reports template SQL items - #853 2017-07-03 10:38:04 +02:00
enriquecd 7e383262bb Change tserver_export_data to varchar 600 - #1015 2017-06-20 13:56:20 +02:00
vgilc c78711ba6f Merge branch '539-encrypt-agent-custom-fields-in-pandora-console-dev' into 'develop'
539 encrypt agent custom fields in pandora console dev

See merge request !520
2017-06-14 11:42:51 +02:00
Arturo Gonzalez 4d46470e96 Added target_ip to policy_modules table 2017-06-01 14:24:24 +02:00
vgilc 62f96b16a0 Merge branch '822-wizard-SNMP-wrong-postprocess-dev' into 'develop'
Changed default value to post process in tpolicy modules

See merge request !457
2017-05-31 17:28:40 +02:00
enriquecd 2216f7ecb9 Add token to Sql query report items for use historical database - #853 2017-05-31 12:42:43 +02:00
Arturo Gonzalez 1e0af6ec26 Added field to db 2017-05-29 11:58:42 +02:00
Daniel Maya e243067c4b New feature: Graphic grouping 2017-05-23 17:13:47 +02:00
vgilc b21e09deef Merge branch '635-reset-or-recover-password-in-pandora-node-and-meta-dev' into 'develop'
635 reset or recover password in pandora node and meta dev

See merge request !389
2017-05-23 10:14:43 +02:00
Arturo Gonzalez 1ae79eba01 Changed default value to post process in tpolicy modules 2017-05-10 15:19:03 +02:00
Arturo Gonzalez bfa3b43ee7 Added changes to reset password system 2017-04-20 12:36:33 +02:00
Arturo Gonzalez a6209c15ca Added event filter field to user in creation and edition 2017-04-05 17:44:24 +02:00
daniel 81cf7aba11 add news checkbox for vlan_enabled and snmp_enabled 2017-03-22 16:30:15 +01:00
Ramon Novoa 9e7c6612be Merge branch 'develop' into feature#new-iface-names 2017-03-10 10:32:40 +01:00
Ramon Novoa dff80fed84 Add a new Recon module that will be used by the Satellite Server too. 2017-03-08 13:20:00 +01:00
daniel 631a4d0777 fixed minor error in table metaconsole_agent 2017-03-06 16:19:03 +01:00
daniel 8bab8bbada add checkbox alias_as_name recon task 2017-03-06 16:10:07 +01:00
daniel c25595f64b add new checkbox for alias 2017-03-06 15:22:01 +01:00
Arturo Gonzalez bcf1fc2e1b Merge db system. Ticket #444 2017-03-03 10:27:52 +01:00
Daniel Maya 76cb61f288 Changes for the merge 2017-02-21 15:31:20 +01:00
Alejandro Gallardo Escobar 545dad643c XMerge branch 'develop' into feature/alias_friendly_name 2017-02-20 12:04:43 +01:00
Arturo Gonzalez f02827d235 Changed field type in db to get negative numbers. Ticket #120 2017-02-17 12:43:12 +01:00
Arturo Gonzalez 7452fe5dda Added missing value in tagente. 2017-02-17 11:06:21 +01:00