ede677f07c
Added safe_mode_module in metaconsole
2017-11-16 13:38:59 +01:00
ec48829c71
[DB] Added a missing coma
2017-11-16 10:55:01 +01:00
f2ad76636c
Merge branch 'develop' into varias-consolas-visuales-en-un-solo-dashboard-modo-slideshow-opcional
...
Conflicts resolved:
pandora_console/extras/mr/9.sql
2017-11-16 09:49:11 +01:00
8fa2acfd2a
Merge branch 'develop' into 1313-Poder-elegir-posición-en-consola-visual-4517-2
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/reporting/visual_console_builder.editor.js
pandora_console/pandoradb.sql
2017-11-15 17:35:51 +01:00
8d42f7fec1
Update pandoradb.sql
2017-11-15 16:08:38 +01:00
776aca90d6
Merge branch 'develop' into 1505-acl-de-grupos-para-los-elementos-de-la-consola-visual-dev
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/reporting/visual_console_builder.editor.js
pandora_console/include/ajax/visual_console_builder.ajax.php
pandora_console/include/functions_visual_map_editor.php
pandora_console/pandoradb.sql
2017-11-15 09:43:33 +01:00
b12d529578
Merge branch '1276-Cascade-protection-a-nivel-de-módulo-dev' into 'develop'
...
1276 cascade protection a nivel de módulo dev
See merge request artica/pandorafms!933
2017-11-15 09:31:05 +01:00
90b99c491a
Merge branch '1509-calculo-de-estado-en-consola-visual-mediante-el-peso-de-su-padre-dev' into 'develop'
...
Added new system of calculate status if user set a parent weight
See merge request artica/pandorafms!1043
2017-11-15 09:28:10 +01:00
3493b9c15c
Revert "code backup"
...
This reverts commit b9851a3a71
2017-11-13 10:21:38 +01:00
fac066debd
Added groups acl in all visual console elements
2017-11-08 15:01:44 +01:00
c9d1fab036
Added new system of calculate status if user set a parent weight
2017-11-08 12:49:03 +01:00
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
b9851a3a71
code backup
2017-10-31 11:51:19 +01:00
96b3ebc67a
Change pandoradb treport_content_template and treport_content fields - #654
2017-10-30 17:27:37 +01:00
f608c686b8
Graph and table mode for max, min and avg reports an template reports - #654
2017-10-30 17:23:59 +01:00
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
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
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
ea51df8b20
Add show on top option to all visual console elements - #1313
2017-10-23 18:54:57 +02:00
f6e012e0fa
Added time autorefresh
2017-10-23 13:17:06 +02:00
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
b641323eed
[ artica/pandora_enterprise#1462 ] Added the DB changes needed by the dashboard items slideshow feature
2017-10-18 17:29:06 +02:00
74308ae42b
Created Safe operation mode
2017-10-17 16:58:05 +02:00
788265713e
Graph and table mode for max, min and avg reports an template reports - #654
2017-10-02 18:23:26 +02:00
7a8135f36d
fixed error merge dani
2017-09-25 09:45:58 +02:00
8ce6920e44
DB changes for visual console group elements - #1245
2017-09-07 12:11:13 +02:00
d74a3f74b4
Merge branch 'develop' into 1056-pandora-wux-grid-server
2017-09-01 10:51:54 +02:00
4d1be92150
DB changes (text => mediumtext) ONLY NEW INSTALLATIONS
2017-08-31 19:14:31 +02:00
f021bedb5c
Added proxy servers to events response form
2017-08-24 12:34:06 +02:00
3291526195
Added new fields to server table
2017-08-23 12:41:36 +02:00
c29d8a4fdb
Revert "merge develop"
...
This reverts commit 8232911713f5da86ac0a
2017-08-23 09:35:17 +02:00
3ef3679f10
Fixed issue with cascade_protection_module
2017-08-08 10:38:30 +02:00
590bfbfe84
mr-5 add queries
2017-08-07 13:57:04 +02:00
ea06ba213b
Added registration method to reset pass
2017-08-03 13:05:57 +02:00
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
278330e8f6
Added some fixes to reset pass feature
2017-07-19 11:37:17 +02:00
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
f0e43e252c
New feature: Add groups to policies
2017-07-18 12:06:57 +02:00
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
1ea465b7d4
Added db changes to package 708
2017-07-17 10:46:26 +02:00
57f6ad097a
update
2017-07-11 10:10:48 +02:00
e6e993538b
Add historical db check to reports template SQL items - #853
2017-07-03 10:38:04 +02:00
7e383262bb
Change tserver_export_data to varchar 600 - #1015
2017-06-20 13:56:20 +02:00
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
4d46470e96
Added target_ip to policy_modules table
2017-06-01 14:24:24 +02:00
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
2216f7ecb9
Add token to Sql query report items for use historical database - #853
2017-05-31 12:42:43 +02:00
1e0af6ec26
Added field to db
2017-05-29 11:58:42 +02:00
e243067c4b
New feature: Graphic grouping
2017-05-23 17:13:47 +02:00
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
danielmaya
Alejandro Gallardo Escobar
enriquecd
Enrique Camargo
Arturo Gonzalez
vgilc
nramon
daniel
fbsanchez