tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,490 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

11860 Commits

Author SHA1 Message Date
fbsanchez 6995a81509 Removed all traces of anytermd from code 2017-09-04 16:19:56 +02:00
vgilc 9ba802c506 Merge branch '1097-vulnerabilidad-en-extension-ssh_gateway-php' into 'develop' 
1097 vulnerabilidad en extension ssh gateway php

See merge request !742
 2017-09-04 16:04:45 +02:00
Arturo Gonzalez 018f449fc8 Added last specifications to pandora exec proxy 2017-09-04 16:02:58 +02:00
fbsanchez 5f350bb7ca Merge branch 'develop' into 1256-cargarse-todo-rastro-de-ssh-gateway-y-vnc 2017-09-04 16:01:38 +02:00
daniel a04e02570f Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-04 14:09:08 +02:00
daniel f0862e1c5b fixed minor errors in WUX 2017-09-04 12:09:19 +02:00
Arturo Gonzalez 4ebc081855 Added image to planned downtime 2017-09-04 10:26:30 +02:00
Junichi Satoh 5b2eec0b1d Updated Japanese help. 2017-09-04 11:38:32 +09:00
artica 9169cff0b5 Auto-updated build strings. 2017-09-04 00:01:13 +02:00
artica b35ffc84ba Auto-updated build strings. 2017-09-03 00:01:13 +02:00
artica f2cf38a3dd Auto-updated build strings. 2017-09-02 00:01:14 +02:00
fbsanchez ad0bedb4a8 Removed VNC & SSH extensions, go ehorus! 2017-09-01 13:49:23 +02:00
nramon 13894ba403 Merge branch '832-server-proxy-details-dev' into 'develop' 
Added details to agent wizard and secundary servers

See merge request !770
 2017-09-01 11:36:53 +02:00
daniel d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
Arturo Gonzalez a80f62003c Added details to agent wizard and secundary servers 2017-09-01 10:44:26 +02:00
slerena 53e61715a1 Merge branch '1211-Falta-tabla-de-proceso-de-reseteo-de-contraseñas-en-MR' into 'develop' 
Add password reset table in MR - #1211

See merge request !754
 2017-09-01 00:09:39 +02:00
artica cce7f496b6 Auto-updated build strings. 2017-09-01 00:01:14 +02:00
fbsanchez 4d1be92150 DB changes (text => mediumtext) ONLY NEW INSTALLATIONS 2017-08-31 19:14:31 +02:00
Enrique Camargo 6b4a15534d Merge branch 'develop' into '1211-Falta-tabla-de-proceso-de-reseteo-de-contraseñas-en-MR' 
# Conflicts:
#   pandora_console/extras/mr/6.sql
 2017-08-31 18:21:08 +02:00
slerena 601db73596 Merge branch '1177-Graficas_con_valores_negativos_rev2' into 'develop' 
fixed error values negatives in reports pdf

See merge request !769
 2017-08-31 18:16:26 +02:00
slerena ec1b95d45a Merge branch 'Alta-de-nueva-macro-_id_module_-ayuda-1072' into 'develop' 
Add _id_module_ definition to help - #1072

See merge request !757
 2017-08-31 18:07:09 +02:00
Enrique Camargo afd184f466 Update 6.sql 2017-08-31 17:58:34 +02:00
daniel b0263a8806 fixed error values negatives in reports pdf 2017-08-31 16:52:41 +02:00
nramon abccf5c972 Merge branch '1058-large-names-in-service-map-dev' into 'develop' 
Removed unused styles

See merge request !768
 2017-08-31 16:25:07 +02:00
daniel a64e0feba3 fixed minor error view snapshot WUX 2017-08-31 16:13:28 +02:00
Arturo Gonzalez d0715bed51 Removed unused styles 2017-08-31 16:08:24 +02:00
enriquecd ac0820b9b4 change url in preview qr code in agent view - #1229 2017-08-31 15:57:34 +02:00
enriquecd f6c6e2a6ba Add show_statistics option for group item - #1245 2017-08-31 15:09:04 +02:00
nramon a99b75da4c Merge branch '832-add-server-exec-proxy-to-policy-wizard-dev' into 'develop' 
Added db changes to mr 6

See merge request !765
 2017-08-31 11:46:41 +02:00
nramon 83da33a53f Merge branch '137-global-module-search-get-disabled-modules-dev' into 'develop' 
Added condition to query

See merge request !762
 2017-08-31 11:39:17 +02:00
nramon 02bf6dbd5c Merge branch '1058-rework-elements-labels-in-service-map-dev' into 'develop' 
Added styles to service map elements

See merge request !679
 2017-08-31 11:38:21 +02:00
nramon 17201b5dd8 Merge branch '1190-Error-in-module-cascade-selector-dev' into 'develop' 
Do the autocomplete field correct

See merge request !761
 2017-08-31 11:36:44 +02:00
Arturo Gonzalez 2fe8849708 Added db changes to mr 6 2017-08-31 11:33:08 +02:00
Arturo Gonzalez 7b949cb5bf Added function to get all interfaces 2017-08-31 10:09:49 +02:00
artu30 914f09c559 Merge branch 'develop' into '1058-rework-elements-labels-in-service-map-dev' 
# Conflicts:
#   pandora_console/include/styles/pandora.css
 2017-08-31 08:19:00 +02:00
artica e45face2fc Auto-updated build strings. 2017-08-31 00:01:15 +02:00
slerena 0a11d3d086 Merge branch '1228-massive-module-deletes-all-modules-with-any-tag-dev' into 'develop' 
Fixed "any" filter with selects unknown and not init modules in massive delete operation

See merge request !756
 2017-08-30 17:50:15 +02:00
enriquecd 68aa0f91ac Fix agent view remote config column order - #124 2017-08-30 17:30:36 +02:00
Arturo Gonzalez 573a0f5534 Added condition to query 2017-08-30 16:26:06 +02:00
daniel fe2a2a36e8 fixed minor errors in WUX 2017-08-30 16:09:11 +02:00
Arturo Gonzalez 0eabf7a0ce Do the autocomplete field correct 2017-08-30 15:52:28 +02:00
daniel b078d48918 fixed errors in wux 2017-08-30 09:47:57 +02:00
artica 0594a7bcbc Auto-updated build strings. 2017-08-30 00:01:13 +02:00
slerena 9c4eb3086e Merge branch '832-exec-proxy-dev' into 'develop' 
832 exec proxy dev

See merge request !755
 2017-08-29 16:11:03 +02:00
Arturo Gonzalez 976581e983 Adjust timeout in events response commands 2017-08-29 15:54:12 +02:00
slerena 347a6d3a3d Merge branch '1244-sql-error-in-massive-agents-edition-dev' into 'develop' 
Added filter when id groups comes empty

See merge request !759
 2017-08-29 13:49:21 +02:00
Arturo Gonzalez 63fb488176 Clean code 2017-08-29 11:52:34 +02:00
Arturo Gonzalez 32ad745c62 Added filter when id groups comes empty 2017-08-29 11:32:25 +02:00
Arturo Gonzalez 8daa66d6ee Added option to set exec proxy in server 2017-08-29 11:14:42 +02:00
daniel 487711d567 fixed errors in simple graphs value negative 2017-08-29 09:28:05 +02:00
artica 8616015f38 Auto-updated build strings. 2017-08-29 00:01:14 +02:00
fbsanchez 9a8e80bf68 Updates wux_module to web_analysis 2017-08-28 19:55:01 +02:00
fbsanchez ae971ded58 Fix on migrate 6.0 to 7.0 2017-08-28 19:15:10 +02:00
fbsanchez 2b18b1589c Added new module type: web_analysis 2017-08-28 19:05:08 +02:00
enriquecd 4f2e12dcf9 Add _id_module_ definition to help - #1072 2017-08-28 16:46:39 +02:00
Arturo Gonzalez 0e7b00f26e Added correct user and fixed db error 2017-08-28 16:38:30 +02:00
Arturo Gonzalez fc0db16d5e Fixed "any" filter with selects unknown and not init modules in massive delete operation 2017-08-28 15:47:16 +02:00
slerena 2ce481de54 Merge branch '1210-error-in-create-networkmaps-when-autorefresh-is-enabled-dev' into 'develop' 
Added code to separate networkmap manage and networkmap view

See merge request !743
 2017-08-28 13:12:47 +02:00
Arturo Gonzalez bab1f14a31 Added remote command execute to agent wizard 2017-08-28 12:44:51 +02:00
Enrique Camargo 092bbd12ff Merge branch 'develop' into '124-anadir-enlace-a-los-iconos-de-la-columna-remote-config-de-la-vista-de-agentes' 
# Conflicts:
#   pandora_console/operation/agentes/estado_agente.php
 2017-08-28 12:32:06 +02:00
slerena b504c0bc6f Merge branch '1229-Codigos-QR-de-Pandora' into 'develop' 
Fix agent view qr mobile code - #1229

See merge request !751
 2017-08-28 12:28:43 +02:00
enriquecd 068be133ed Add password reset table in MR - #1211 2017-08-28 12:22:59 +02:00
slerena 88acc6352d Merge branch '309-Mejoras-CLI-para-TMB-3' into 'develop' 
Add instructions,user and force_create_agent parameters to CLI event_creator - #309

See merge request !744
 2017-08-28 12:20:01 +02:00
slerena fb88f44cff Merge branch '1233-Macros-_date_-y-_time_-en-consola-visual' into 'develop' 
Add _data_ _time_ macros for visual console - #1233

See merge request !749
 2017-08-28 12:16:28 +02:00
slerena d3a845a6b5 Merge branch '1151-Ayuda_de_alerta_en_actions_faltan_macros_que_si_estan_en_Templates' into 'develop' 
fixed errors in helps macros

See merge request !750
 2017-08-28 12:14:54 +02:00
Arturo Gonzalez 6b4dfe9885 Added remote server to snmp browser 2017-08-28 10:02:46 +02:00
artica ab48fabc0b Auto-updated build strings. 2017-08-28 00:01:12 +02:00
artica ed72e8c342 Auto-updated build strings. 2017-08-27 00:01:12 +02:00
artica b907a65921 Auto-updated build strings. 2017-08-26 00:01:37 +02:00
artica 8f373edf84 Auto-updated build strings. 2017-08-25 00:01:13 +02:00
Arturo Gonzalez 88834d6ea1 Added a first version of snmp browser with a proxy server 2017-08-24 16:26:58 +02:00
enriquecd 8b718371f9 Fix agent view qr mobile code - #1229 2017-08-24 16:09:04 +02:00
daniel 45f33f9748 fixed errors in helps macros 2017-08-24 15:40:03 +02:00
daniel e97057a183 fixed minor error 2017-08-24 15:08:24 +02:00
daniel 94cb6ee060 documentation wux 2017-08-24 14:04:12 +02:00
Arturo Gonzalez ffed7359bc Added execution in server proxy to event response commands 2017-08-24 13:25:03 +02:00
enriquecd c64d0bb082 Add _data_ _time_ macros for visual console - #1233 2017-08-24 12:50:55 +02:00
Arturo Gonzalez f021bedb5c Added proxy servers to events response form 2017-08-24 12:34:06 +02:00
Arturo Gonzalez 2521727ee1 Added ssh check connection 2017-08-24 11:05:10 +02:00
artica 1bf7d8278a Auto-updated build strings. 2017-08-24 00:01:14 +02:00
daniel 9c141c9049 fixed errors wux 2017-08-23 17:21:15 +02:00
Arturo Gonzalez dce27f3ac2 Added new items to satellite editor view 2017-08-23 15:01:09 +02:00
Arturo Gonzalez 3291526195 Added new fields to server table 2017-08-23 12:41:36 +02:00
Arturo Gonzalez bc557573ec Fixed combo in editor 2017-08-23 10:19:56 +02:00
daniel c29d8a4fdb Revert "merge develop" 
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
 2017-08-23 09:35:17 +02:00
artica dcd5fd2e5e Auto-updated build strings. 2017-08-23 00:01:14 +02:00
daniel 8232911713 merge develop 2017-08-22 18:39:34 +02:00
enriquecd 418906add5 Fix bad ordination in mobile pandora events list - #1169 2017-08-22 17:24:26 +02:00
daniel f5da86ac0a no apply policies in wux 2017-08-22 11:39:21 +02:00
enriquecd 44cf079b20 Change 24h event histogram function in pandora mobile to same that desktop pandora - #1170 2017-08-22 11:33:15 +02:00
daniel d4b0fc0e6b fixed errors in wux 2017-08-22 11:12:20 +02:00
enriquecd 031a70cc51 Add instructions,user and force_create_agent parameters to CLI event_creator - #309 2017-08-22 10:43:22 +02:00
Arturo Gonzalez 7b208f6209 Added code to separate networkmap manage and networkmap view 2017-08-22 09:24:16 +02:00
artica 60757b0ad6 Auto-updated build strings. 2017-08-22 00:01:13 +02:00
fbsanchez ef132fde80 Removed sshgateway extension 
Ehorus!!!!!
 2017-08-21 19:48:19 +02:00
enriquecd 2f5127d517 Change pandora help window style - #1122 2017-08-21 15:58:19 +02:00
daniel 0408a2bee6 resize pie graph 2017-08-21 13:53:50 +02:00
enriquecd a399652873 Fix dbmanager when insert db activity in activity login info panel - #1194 2017-08-21 11:29:58 +02:00
enriquecd f70763d739 Apply padding to event 24h event history bar for agent view - #1203 2017-08-21 10:48:03 +02:00
artica c1545fc802 Auto-updated build strings. 2017-08-21 00:01:11 +02:00
artica f3e5c32c09 Auto-updated build strings. 2017-08-20 00:01:11 +02:00
artica 19f1c3610e Auto-updated build strings. 2017-08-19 00:01:13 +02:00
daniel 86125a3c40 changes visual console wux 2017-08-18 13:29:07 +02:00
vgilc e0746e65e8 Merge branch '138-login-items-separate-width-dev' into 'develop' 
Added separation width to login fields

See merge request !632
 2017-08-18 13:18:40 +02:00
vgilc 453838942e Merge branch '122-mensaje-de-error-en-gestion-de-usuarios-ext-3871-v7-0' into 'develop' 
If result param is null not show bad result message when delete,disable user - #122

See merge request !368
 2017-08-18 13:18:08 +02:00
vgilc 7fdfbde6ff Merge branch '133-Bug-en-pop-up-de-activacion-de-licencia-theme-black' into 'develop' 
Change license activation popup color text - #133

See merge request !393
 2017-08-18 13:17:02 +02:00
vgilc a2e0dc06be Merge branch '137-La-busqueda-de-modulos-muestra-los-modulos-disabled-dev' into 'develop' 
Disabled modules no longer appear in the search

See merge request !407
 2017-08-18 13:16:03 +02:00
vgilc be2eee1afa Merge branch '109-modificar-titulo-de-columna-umbrales-en-vista-de-agente' into 'develop' 
Text change warn by thresholds

Closes #109

See merge request !318
 2017-08-18 13:15:27 +02:00
vgilc e76c62ef48 Merge branch '144-problema-con-password-con-espacios-en-version-mobile' into 'develop' 
Fixed problems with pass when this pass containt blank spaces.

See merge request !430
 2017-08-18 13:14:15 +02:00
vgilc 7d1a7103ad Merge branch '1190-Fallo-al-buscar-módulos-de-agente-en-protección-en-cascada-dev' into 'develop' 
Fixed issue to search agent modules in cascade protection

See merge request !717
 2017-08-18 13:05:01 +02:00
vgilc 7ce67ef053 Merge branch '1090-bad-event-custom-field-dev' into 'develop' 
Removed event custom field (id)

See merge request !649
 2017-08-18 13:04:12 +02:00
vgilc c09033ae03 Merge branch '1000-Sentencia_UNION_restringida_en_informes_SQL' into 'develop' 
allow UNION sql reports

See merge request !704
 2017-08-18 13:01:53 +02:00
vgilc 93c03da3fe Merge branch '1091-Fixed-key-sensitive-search-in-agents-list-dev' into 'develop' 
Fixed search field in agents list

See merge request !650
 2017-08-18 13:01:01 +02:00
vgilc 901a163c84 Merge branch '1108-bad-api-and-cli-request-in-meta-with-events-dev' into 'develop' 
Fixed meta event table in cli and api functions

See merge request !665
 2017-08-18 12:50:19 +02:00
vgilc d858d4840a Merge branch '1111-Columna-email-error-en-vista-de-informes-dev' into 'develop' 
Fixed email column

See merge request !668
 2017-08-18 12:44:26 +02:00
daniel 1b5979113a hidden tab wux 2017-08-18 12:42:48 +02:00
vgilc a5d3f916d7 Merge branch '1005-Graficas_de_alerta_con_umbrales' into 'develop' 
1005 graficas de alerta con umbrales

See merge request !702
 2017-08-18 12:42:27 +02:00
vgilc 0083d57297 Merge branch '1177-Graficas_con_valores_negativos' into 'develop' 
fixed errors in graphs value negative

See merge request !703
 2017-08-18 12:41:10 +02:00
vgilc ac1a23c577 Merge branch '1150-added-link-to-fictional-nodes-and-redirect-with-dbclick-dev' into 'develop' 
Added new function to redirect with dbclick when fictinal have a map link

See merge request !691
 2017-08-18 12:40:36 +02:00
vgilc 2d153c1074 Merge branch '1130-Nombres-de-agente-en-vista-táctica-dev' into 'develop' 
Extended number of characters allowed

See merge request !680
 2017-08-18 12:38:15 +02:00
vgilc 386e48fe58 Merge branch '1155-Fallo-en-conexión-con-LDAP-dev' into 'develop' 
Fixed Connection failure in ldap

See merge request !715
 2017-08-18 12:37:07 +02:00
vgilc 50a7ea3dd9 Merge branch '1045-Insert-data-pierde-información-dev' into 'develop' 
Fixed agent lost in insert data

See merge request !614
 2017-08-18 12:36:06 +02:00
vgilc 6920831d60 Merge branch '1185-Bug_Update_Manager_Online_Pandora_7_Open' into 'develop' 
fixed errors in update manager open

See merge request !714
 2017-08-18 12:35:32 +02:00
vgilc 870be2c4ea Merge branch '1191-Fallo-en-base-de-datos-para-actualizar-protección-en-cascada-dev' into 'develop' 
Fixed issue with cascade_protection_module

See merge request !720
 2017-08-18 12:34:31 +02:00
daniel f0efe69ad4 fixed error in wux 2017-08-18 12:02:47 +02:00
artica 3ce15d5814 Auto-updated build strings. 2017-08-18 00:01:12 +02:00
daniel ab3cd7dcc0 wux console view 2017-08-17 18:38:12 +02:00
Daniel Maya 498272d75d Update setup log collector 2017-08-17 11:07:22 +02:00
artica f7ecefcc60 Auto-updated build strings. 2017-08-17 00:01:13 +02:00
Daniel Maya 059dec7cc9 Fixed delimiter 2017-08-16 17:04:21 +02:00
daniel 104a1a83b4 fixed minor error 2017-08-16 16:30:44 +02:00
artica f7ea07d559 Updated version and build strings. 2017-08-16 13:09:03 +02:00
Daniel Maya 2963f18ed3 Added text line in label help 2017-08-16 12:05:17 +02:00
artica 8958dd0900 Auto-updated build strings. 2017-08-16 10:38:02 +02:00
artica c08e17084f Auto-updated build strings. 2017-08-16 10:38:02 +02:00
Daniel Maya e99ef7d0f1 Fixed 2017-08-16 10:38:02 +02:00
Daniel Maya 80faddcbb8 Xaxisname deleted from xaxes 2017-08-16 10:38:02 +02:00
artica 9ddf454e09 Auto-updated build strings. 2017-08-16 10:38:02 +02:00
artica b973e12a51 Auto-updated build strings. 2017-08-16 10:38:02 +02:00
artica 5542bd8947 Auto-updated build strings. 2017-08-16 10:38:02 +02:00
Daniel Maya 3c18f706fa fixed errors in visual console on simple value 2 2017-08-16 10:38:02 +02:00
daniel 4b26cf119c fixed errors visual console 2017-08-16 10:38:02 +02:00
artica 31d5699a2b Auto-updated build strings. 2017-08-16 10:38:02 +02:00
daniel 61ffae2ae1 fixed errors in visual console on simple value 2017-08-16 10:38:02 +02:00
Daniel Maya 07c115eb4e Fixed issue with simple value 2017-08-16 10:38:02 +02:00
artica ed5c0c71b2 Updated version and build strings. 2017-08-16 10:38:02 +02:00
artica 70988d8c8c Auto-updated build strings. 2017-08-16 10:38:02 +02:00
Daniel Maya fba5a38482 Fixed time range with user no admin 2017-08-16 10:38:02 +02:00
daniel 2d3d9e782f fixed errors metaconsole reports serialize data 2017-08-16 10:38:02 +02:00
Daniel Maya 7d578093d9 Fixed label in automatic graph in node 2017-08-16 10:38:01 +02:00
daniel afc481098d fixed error exportation csv in custom graphs 2017-08-16 10:36:30 +02:00
Daniel Maya 43285a9192 Added label in automatic graph 2017-08-16 10:36:30 +02:00
Daniel Maya 860a81aee8 Fixed urlencode in event popup 2017-08-16 10:36:30 +02:00
Arturo Gonzalez bf77ea14d1 Added recover delimiter 2017-08-16 10:36:30 +02:00
Arturo Gonzalez 09bb7d8cd8 Changed field in sql request 2017-08-16 10:36:30 +02:00
daniel 571c74d558 fixed error export csv custom graph 2017-08-16 10:16:04 +02:00
artica b0f3a737a9 Auto-updated build strings. 2017-08-16 00:01:15 +02:00
artica a12f0de8b7 Auto-updated build strings. 2017-08-15 00:01:13 +02:00
vgilc 9c32a72c9f Merge branch 'develop' into '1077-sql-error-in-log4x-data-module-dialog-dev' 
# Conflicts:
#   pandora_console/include/functions_modules.php
 2017-08-14 15:26:54 +02:00
Daniel Maya 2f8e8703b7 Fixed 2017-08-14 14:53:56 +02:00
Daniel Maya c3d1d7e397 Xaxisname deleted from xaxes 2017-08-14 12:36:49 +02:00
vgilc 47c851be95 Merge branch '1109-mysql-procedure-error-in-pandora-migrate-dev' into 'develop' 
Added recover delimiter

See merge request !666
 2017-08-14 12:25:35 +02:00
vgilc aa54f0cc9a Merge branch '1156-Serialize_data_en_metaconsola_no_funciona' into 'develop' 
fixed errors metaconsole reports serialize data

See merge request !712
 2017-08-14 12:24:43 +02:00
vgilc 4d0b360bf8 Merge branch '1112-PopUp-eventos-no-carga-gráfica-de-módulos-con-espacios-dev' into 'develop' 
Fixed urlencode in event popup

See merge request !676
 2017-08-14 12:18:22 +02:00
vgilc f5d161b108 Merge branch '1167-Fallo_en_exportación_a_CSV_de_Custom_Graphs' into 'develop' 
fixed error exportation csv in custom graphs

See merge request !708
 2017-08-14 12:16:47 +02:00
vgilc baf9b6aa5a Merge branch '1173-Campo-label-no-funciona-en-templates-de-informe-en-la-metaconsola-dev' into 'develop' 
Added label in automatic graph

See merge request !706
 2017-08-14 12:13:58 +02:00
Hirofumi Kosaka 70a226540e "Massive Operations" had remained at Pandora Console. #161 2017-08-14 12:03:35 +09:00
artica 8462e9d3d5 Auto-updated build strings. 2017-08-14 00:01:13 +02:00
artica cc7b00bb39 Auto-updated build strings. 2017-08-13 00:01:12 +02:00
artica bc022aba2b Auto-updated build strings. 2017-08-12 00:01:13 +02:00
Daniel Maya 5973ec7545 fixed errors in visual console on simple value 2 2017-08-11 11:48:25 +02:00
Ramon Novoa 7c0f0e3b31 Restored install.php. 2017-08-11 11:22:03 +02:00
Ramon Novoa 2f069c37dc Add an alpha version of the WUXServer. 2017-08-11 11:08:40 +02:00
daniel 33ccab173e fixed errors visual console 2017-08-11 09:13:26 +02:00
artica 941341585e Auto-updated build strings. 2017-08-11 00:01:13 +02:00
daniel 0915e46e4c fixed errors in visual console on simple value 2017-08-10 17:45:00 +02:00
Daniel Maya e1d4a81034 Fixed issue with simple value 2017-08-10 15:45:53 +02:00
artica 8309e4fffb Updated version and build strings. 2017-08-10 10:37:06 +02:00
artica bbe63a30ec Auto-updated build strings. 2017-08-10 00:01:15 +02:00
daniel 1d7d55a451 fixed errors in form wux 2017-08-09 13:27:51 +02:00
daniel 788cb8cbd8 fixed errors in form wux 2017-08-09 12:08:52 +02:00
Daniel Maya 2bcc01c9ba Fixed time range with user no admin 2017-08-09 11:33:12 +02:00
daniel 7e649b78b3 wux new form 2017-08-09 11:29:16 +02:00
daniel be0a91ed2c fixed minor error sql delete module 2017-08-09 10:35:57 +02:00
vgilc e250e0eeae Revert "Merge branch '1196-Time-range-en-gráficas-de-módulo-dev' into 'develop'" 
This reverts merge request !722
 2017-08-09 09:27:06 +02:00
artica f96032eeaa Auto-updated build strings. 2017-08-09 00:01:15 +02:00
Daniel Maya 032995fc83 Disabled select for not admins 2017-08-08 14:59:30 +02:00
daniel 4cbd005137 fixed error in graph container 2017-08-08 12:07:28 +02:00
Daniel Maya 3ef3679f10 Fixed issue with cascade_protection_module 2017-08-08 10:38:30 +02:00
artica d5cff43128 Auto-updated build strings. 2017-08-08 00:01:14 +02:00
daniel 6a2d3a7011 fixed minor error 2017-08-07 17:02:56 +02:00
daniel 590bfbfe84 mr-5 add queries 2017-08-07 13:57:04 +02:00
Daniel Maya 97392c4568 Fixed issue to search agent modules in cascade protection 2017-08-07 13:10:02 +02:00
Daniel Maya 5df61b95b9 Fixed issue in public console 2017-08-07 11:30:49 +02:00
Daniel Maya 160ad7e866 Fixed Connection failure in ldap 2017-08-07 09:21:26 +02:00
artica 5164624dca Auto-updated build strings. 2017-08-07 00:01:14 +02:00
artica 5a0da66b3d Auto-updated build strings. 2017-08-06 00:01:13 +02:00
artica c826d0951e Auto-updated build strings. 2017-08-05 00:01:13 +02:00
daniel e875ce9b4e fixed errors in update manager open 2017-08-04 14:07:27 +02:00
artica 2d8697eaeb Auto-updated build strings. 2017-08-04 00:01:14 +02:00
daniel c4171ac248 fixed errors metaconsole reports serialize data 2017-08-03 17:09:27 +02:00
Daniel Maya 78d4eb68bc Fixed problem in node 2017-08-03 13:29:18 +02:00
Daniel Maya 0932004781 Fixed label in automatic graph in node 2017-08-03 13:13:34 +02:00
daniel fb9f187287 fixed error exportation csv in custom graphs 2017-08-03 13:09:41 +02:00
Arturo Gonzalez ea06ba213b Added registration method to reset pass 2017-08-03 13:05:57 +02:00
Daniel Maya 362ab94781 Added label in automatic graph 2017-08-03 12:41:47 +02:00
daniel 20fc24b99e allow UNION sql reports 2017-08-03 11:32:43 +02:00
artica 5860d29e37 Auto-updated build strings. 2017-08-03 00:01:15 +02:00
daniel 89b0ec2584 fixed errors in graphs value negative 2017-08-02 16:46:50 +02:00
daniel 14422413a3 add helps in pandora macromodulegraphth 2017-08-02 12:00:26 +02:00
daniel 6e45b3cd9e add threshold graph send for mail 2017-08-02 11:48:37 +02:00
artica 408efec325 Updated version and build strings. 2017-08-02 10:12:45 +02:00
Hirofumi Kosaka 76c951183c [bug fix] deleting a module had caused unextected alert deletion. #156 2017-08-02 15:41:44 +09:00
artica c363a2e085 Auto-updated build strings. 2017-08-02 00:01:14 +02:00
Daniel Maya dd5cb8088c added service functions in the API 2017-08-01 10:39:02 +02:00
artica 7e508a4137 Auto-updated build strings. 2017-08-01 00:01:14 +02:00
Arturo Gonzalez d298ba4d40 Center texts 2017-07-31 14:55:38 +02:00
Arturo Gonzalez 4ce9a96b74 Fixed last timestamp in interface charts 2017-07-31 12:50:50 +02:00
vgilc dc462550ef Merge branch 'reset_commit_acl_open' into 'develop' 
Revert "Use session and not exec sql if already exists acl perms in session - #1017"

See merge request !697
 2017-07-31 10:26:40 +02:00
artica 6a4a199c96 Auto-updated build strings. 2017-07-31 00:01:13 +02:00
artica 50c4419ef7 Auto-updated build strings. 2017-07-30 00:01:13 +02:00
artica cc40fcccc2 Auto-updated build strings. 2017-07-29 00:01:14 +02:00
vgilc 03cb255562 Merge branch '1071-Formulario-gráfica-combinada-automática-open' into 'develop' 
Add column id_server to tgraph_source and fix metaconsole automatic_graph report_template - #1071

See merge request !634
 2017-07-28 14:31:46 +02:00
daniel 179325447f Revert "Use session and not exec sql if already exists acl perms in session - #1017" 
This reverts commit 78bb583824.
 2017-07-28 12:46:17 +02:00
Enrique Camargo 88879462a3 Merge branch 'develop' into '1071-Formulario-gráfica-combinada-automática-open' 
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2017-07-28 10:34:06 +02:00
artu30 14a439faab Merge branch 'develop' into '618-new-item-auto-sla-graph-in-visual-console-dev' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
#   pandora_console/include/functions_visual_map_editor.php
#   pandora_console/include/graphs/flot/pandora.flot.js
 2017-07-28 10:30:17 +02:00
vgilc 94f6683c16 Merge branch '1114-En-la-vista-de-agente-modulo-se-distorsionan-las-imágenes-2' into 'develop' 
Change agent / module icons height a width - #1114

See merge request !659
 2017-07-28 10:25:14 +02:00
vgilc 9c534ce2dc Merge branch '1127-Elementos-desplazados-en-mapas-GIS-con-Google-maps-dev' into 'develop' 
Expand layer

See merge request !685
 2017-07-28 10:24:44 +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
vgilc ca43066ce8 Merge branch '1085-Añadir-sección-Description-a-HTML-view-meta-enterprise-open' into 'develop' 
Add report info option in metaconsole 7 open - #1085

See merge request !687
 2017-07-28 10:22:42 +02:00
vgilc e2a175327e Merge branch '1140-Gráficas_con_entities' into 'develop' 
fixed errors entities in mail

See merge request !682
 2017-07-28 10:21:04 +02:00
vgilc 333171c2b6 Merge branch '1124-4288-agrupar-graficas-combinadas-ii_open' into 'develop' 
fixed errors in graph container

See merge request !688
 2017-07-28 10:19:15 +02:00
vgilc f0afe8431f Merge branch '1120-Nombre-de-agente-en-mapas-GIS-dev' into 'develop' 
Change agent name by alias in gis map

See merge request !678
 2017-07-28 10:16:27 +02:00
artica 55c70098ba Auto-updated build strings. 2017-07-28 00:01:13 +02:00
Arturo Gonzalez 02ce575d9f Added a last fix 2017-07-27 12:39:38 +02:00
Arturo Gonzalez 39f4b48d84 Added some changes about update modules from local component with macros 2017-07-27 11:08:19 +02:00
artica 9d6bd697a7 Auto-updated build strings. 2017-07-27 00:01:13 +02:00
artica a9d76e2748 Updated version and build strings. 2017-07-26 17:03:41 +02:00
enriquecd 240b6e017f Adapt historical_db checkbox for sql reports to sql templates - #1157 2017-07-26 13:50:55 +02:00
Arturo Gonzalez 82b6904289 Changed some lines in configurar_agente 2017-07-26 13:36:42 +02:00
artica 729503f509 Auto-updated build strings. 2017-07-26 00:01:13 +02:00
Arturo Gonzalez 6b30accd11 Added new function to redirect with dbclick when fictinal have a map link 2017-07-25 15:38:28 +02:00
vgilc a2d15f9f34 Merge branch '1129-new-events-bar-in-metaconsole-dev' into 'develop' 
1129 new events bar in metaconsole dev

See merge request !690
 2017-07-25 10:45:10 +02:00
Arturo Gonzalez 836cc384e9 Added good colours to meta tactical events bar 2017-07-25 08:36:21 +02:00
artica daa952649b Auto-updated build strings. 2017-07-25 00:01:13 +02:00
Arturo Gonzalez 9ddb47741f Added new events bar to meta 2017-07-24 16:34:22 +02:00
daniel 4dfbdca423 add new field table view agents for type of agent 2017-07-24 15:53:31 +02:00
vgilc 5f128ed9ce Merge branch '1087-error-in-events-filter-from-agent-events-graph-dev' into 'develop' 
Fixed events filter from agent events graph

See merge request !655
 2017-07-24 13:20:07 +02:00
daniel 741cc05268 fixed errors in graph container 2017-07-24 10:53:04 +02:00
artica f3d6d7262e Auto-updated build strings. 2017-07-24 00:01:17 +02:00