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

16728 Commits

Author SHA1 Message Date
fbsanchez 0df48675f3 event deletion 2019-06-13 16:28:26 +02:00
fbsanchez 029d3b073f Avoid double validation, avoid redraw 2019-06-13 13:52:38 +02:00
fbsanchez 0afb53dc17 fix in time comparison while validating events 2019-06-13 13:35:02 +02:00
fbsanchez 9740275388 dyn redraw 2019-06-13 13:07:11 +02:00
fbsanchez d12773cfd0 Avoid double validation, avoid redraw 2019-06-13 12:36:31 +02:00
fbsanchez ecc2fef8f6 event validation/in process 2019-06-13 12:30:09 +02:00
fbsanchez f3a0f37a1c Events agent grouped 2019-06-12 18:19:39 +02:00
fbsanchez 4bb300889d Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-12 13:17:36 +02:00
fbsanchez b615b50920 wip event grouped 2019-06-12 13:17:18 +02:00
Alejandro Fraguas 1305e267de Merge branch 'ent-3437-Guardar-user-password-modulos-WMI' into 'develop' 
Remove autocomplete user and password in the form to create wmi modules - #3437

See merge request artica/pandorafms!2485
 2019-06-12 13:03:56 +02:00
Alejandro Gallardo Escobar d3da3747dd Fixed the visualization of the combined graph item from the new visual console 2019-06-12 08:48:51 +02:00
artica 51d5e1d951 Auto-updated build strings. 2019-06-12 00:01:07 +02:00
Alejandro Fraguas fdce139f84 Merge branch 'ent-4186-Error-en-add-map-connection-al-crear-mapas-gis' into 'develop' 
fix bug when adding connection maps in gis map builder

See merge request artica/pandorafms!2490
 2019-06-11 18:01:54 +02:00
Daniel Rodriguez 4cf0fda28c Merge branch 'ent-3300-Error-borrado-masivo-de-informes' into 'develop' 
Fix bug in report massive deletion

See merge request artica/pandorafms!2493
 2019-06-11 17:17:14 +02:00
Alejandro Fraguas cb6d71b930 Merge branch 'ent-3474-Exportar-a-csv-custom-field-view' into 'develop' 
Ent 3474 exportar a csv custom field view

See merge request artica/pandorafms!2483
 2019-06-11 17:06:14 +02:00
Alejandro Campos cc9a7553bc Merge branch 'develop' into 'ent-3300-Error-borrado-masivo-de-informes' 
# Conflicts:
#   pandora_console/godmode/reporting/reporting_builder.php
 2019-06-11 16:18:29 +02:00
fbsanchez 48e6fef0b7 Event filters 2019-06-11 12:58:18 +02:00
Daniel Rodriguez 1436ec0782 Merge branch 'ent-4088-Falta-campo-estado-en-modulos-plugin-erroneos' into 'develop' 
Added image for unknown and no data status - 4088

See merge request artica/pandorafms!2484
 2019-06-11 12:07:45 +02:00
artica 4a2688d6ac Auto-updated build strings. 2019-06-11 00:01:06 +02:00
Daniel Rodriguez 9d71c10308 Merge branch 'ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info' into 'develop' 
Redolved ticket

See merge request artica/pandorafms!2273
 2019-06-10 18:47:23 +02:00
Alejandro Fraguas cd1f8d0c10 Merge branch 'ent-3760-Error-de-login-LDAP' into 'develop' 
Fixed function ldapsearch

See merge request artica/pandorafms!2301
 2019-06-10 18:08:18 +02:00
alejandro-campos 577ddef8b3 fix bug when adding connection maps in gis map builder 2019-06-10 17:04:36 +02:00
marcos.alconada a40e420de0 Removed , from numer format 2019-06-10 16:59:05 +02:00
Daniel Rodriguez 81ac4e5bef Merge branch 'ent-3466-ad-advanced-perms-fixed' into 'develop' 
Ent 3466 ad advanced perms fixed

See merge request artica/pandorafms!2194
 2019-06-10 16:05:21 +02:00
fbsanchez ef3d299d58 wip event view 2019-06-10 15:18:35 +02:00
marcos.alconada 58ba42cec1 Changed code for conversión 2019-06-10 14:53:47 +02:00
marcos.alconada cf84c3f579 Merge remote-tracking branch 'origin/develop' into ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info 2019-06-10 12:43:08 +02:00
Alejandro Fraguas d14ad39785 Merge branch 'ent-3915-7828-servicio-hijo-de-otro-no-borra-todos-los-modulos-del-agente-al-elminarlo' into 'develop' 
Node deleted disapear in tree view

See merge request artica/pandorafms!2486
 2019-06-10 10:51:26 +02:00
artica 7bf087dd25 Auto-updated build strings. 2019-06-10 00:01:06 +02:00
artica ab4039fe5b Auto-updated build strings. 2019-06-09 00:01:06 +02:00
artica 0ee04ecb21 Auto-updated build strings. 2019-06-08 00:01:07 +02:00
fbsanchez bb552226a6 minor fix 2019-06-07 22:58:49 +02:00
fbsanchez f67bf8c2b7 wip event list filters 2019-06-07 22:44:02 +02:00
fbsanchez d4d4509266 wip event view 2019-06-07 21:22:07 +02:00
fbsanchez 419a90d69c wip event list 2019-06-07 17:35:13 +02:00
marcos.alconada 833248991b Add mr 29 2019-06-07 11:24:00 +02:00
marcos.alconada 1e843777bc Delete line with log4x 2019-06-07 10:57:15 +02:00
Marcos Alconada f89aefa7ab Merge branch 'revert-928f6a79' into 'develop' 
Revert "Merge branch 'ent-3626-referencias-log4x' into 'develop'"

See merge request artica/pandorafms!2487
 2019-06-07 10:24:27 +02:00
Marcos Alconada d49d303469 Update pandoradb_data.sql 2019-06-07 10:20:29 +02:00
Marcos Alconada be82afc9c5 Update pandoradb_data.sql 2019-06-07 09:50:49 +02:00
Alejandro Fraguas 021ae9b1cd Merge branch 'ent-3561-error-herramienta-db-schema-check' into 'develop' 
Ticket Resolved

See merge request artica/pandorafms!2227
 2019-06-07 09:48:51 +02:00
Marcos Alconada 241eda5c39 Revert "Merge branch 'ent-3626-referencias-log4x' into 'develop'" 
This reverts merge request !2282
 2019-06-07 09:35:13 +02:00
marcos.alconada a13dab3f35 resolving merge conflict 2019-06-07 09:22:07 +02:00
artica 2f0aa6c6a1 Auto-updated build strings. 2019-06-07 00:01:07 +02:00
marcos.alconada 73466b9096 Node deleted disapear in tree view 2019-06-06 18:47:10 +02:00
fbsanchez 23e6711f09 WIP Events 2019-06-06 17:50:47 +02:00
Tatiana Llorente 4f9f9e65c2 Remove autocomplete user and password in the form to create wmi modules - #3437 2019-06-06 16:51:11 +02:00
Tatiana Llorente a4ea5e7c77 Added image for unknown and no data status - 4088 2019-06-06 14:16:09 +02:00
Alejandro Fraguas 527a9f4a35 Merge branch 'ent-3614-Vista-de-Servicios' into 'develop' 
New styles for Services table view - #3614

See merge request artica/pandorafms!2468
 2019-06-06 12:58:06 +02:00
Tatiana Llorente 2d84081ca7 Add styles for metaconsole - #3614 2019-06-06 12:09:35 +02:00