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
|
928f6a797b
|
Merge branch 'ent-3626-referencias-log4x' into 'develop'
Resolved ticket with sql sentence
See merge request artica/pandorafms!2282
|
2019-06-07 09:34:54 +02:00 |
|
marcos.alconada
|
435a7476c7
|
Merge branch 'ent-3626-referencias-log4x' into develop
|
2019-06-07 09:25:04 +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 |
|
Daniel Rodriguez
|
75872850ce
|
Merge branch 'ent-4153-threads-shared' into 'develop'
threads-shared returns
See merge request artica/pandorafms!2480
|
2019-06-06 13:31:12 +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 |
|
Tatiana Llorente
|
334e66aaf1
|
Export csv from custom field view meta - #3474
|
2019-06-06 10:39:09 +02:00 |
|
artica
|
034a910000
|
Auto-updated build strings.
|
2019-06-06 00:01:07 +02:00 |
|
Daniel Rodriguez
|
bafdfdb810
|
Merge branch 'ent-3534-7549-parseo-erroneo-de-ip' into 'develop'
Fix the regexp for IPv4 addresses.
See merge request artica/pandorafms!2474
|
2019-06-05 13:26:58 +02:00 |
|
Alejandro Fraguas
|
7883fc5f96
|
Merge branch 'ent-4121-meta-user-edition-bug' into 'develop'
Fixed bug in meta user_edir form url
See merge request artica/pandorafms!2472
|
2019-06-05 12:00:31 +02:00 |
|
Alejandro Fraguas
|
9791b174b2
|
Merge branch 'ent-4030-bug-en-busqueda-de-inventario' into 'develop'
Ent 4030 bug en busqueda de inventario
See merge request artica/pandorafms!2431
|
2019-06-05 10:23:43 +02:00 |
|
artica
|
95574adf80
|
Auto-updated build strings.
|
2019-06-05 00:01:08 +02:00 |
|
fbsanchez
|
5b2eb8891b
|
tab moved
|
2019-06-04 22:43:26 +02:00 |
|
fbsanchez
|
6ed2a0636e
|
styles review
|
2019-06-04 22:34:17 +02:00 |
|
fbsanchez
|
b14cdfb4c2
|
minor fix in tactical
|
2019-06-04 22:22:33 +02:00 |
|
fbsanchez
|
a1be1e7332
|
styles review
|
2019-06-04 22:16:58 +02:00 |
|
Daniel Rodriguez
|
537a73be04
|
Merge branch 'ent-4131-error-migrate-6-a-7' into 'develop'
Added missing create table to migrate 6 to 7
See merge request artica/pandorafms!2477
|
2019-06-04 18:26:12 +02:00 |
|
Tatiana Llorente
|
1a8b09229c
|
Export csv from custom field view meta - #3474
|
2019-06-04 17:28:55 +02:00 |
|
Daniel Rodriguez
|
5d961c1485
|
Merge branch 'ent-3187-snmp-browser-no-muestra-datos-v3' into 'develop'
Unified SNMP version 3 code.
See merge request artica/pandorafms!2471
|
2019-06-04 16:40:41 +02:00 |
|
Alejandro Fraguas
|
a1591f7a84
|
Merge branch 'ent-3362-7334-Bug-time-comparison-graficas-de-modulos' into 'develop'
Fixed bug in time comparison graphs
See merge request artica/pandorafms!2476
|
2019-06-04 16:29:52 +02:00 |
|
Ramon Novoa
|
51f57e9247
|
Fix a typo.
|
2019-06-04 15:54:32 +02:00 |
|
fbsanchez
|
e1eac631c1
|
tactical icon sizes
|
2019-06-04 15:42:27 +02:00 |
|
fbsanchez
|
b7c14d49fd
|
threads-shared returns
|
2019-06-04 15:10:05 +02:00 |
|
fbsanchez
|
2f5265fcbb
|
color updates
|
2019-06-04 14:08:07 +02:00 |
|
fbsanchez
|
c741020538
|
styles review
|
2019-06-04 13:57:55 +02:00 |
|
Daniel Rodriguez
|
b2b3d748c1
|
Merge branch 'ent-3901-Macro-event-id-no-funciona-en-meta-si-el-evento-tiene-server-id-0' into 'develop'
allow fetching of event id in metaconsole event table when getting target of an…
See merge request artica/pandorafms!2437
|
2019-06-04 12:45:26 +02:00 |
|
Luis Calvo
|
23e631f7d8
|
Added missing create table to migrate 6 to 7
|
2019-06-04 08:52:25 +02:00 |
|
artica
|
c584367c14
|
Auto-updated build strings.
|
2019-06-04 00:01:06 +02:00 |
|
fbsanchez
|
cb1fb19b95
|
style review
|
2019-06-03 19:19:18 +02:00 |
|
fbsanchez
|
974db824a8
|
style review
|
2019-06-03 19:13:29 +02:00 |
|
Daniel Rodriguez
|
efd7abfc66
|
Merge branch 'ent-3581-proyectos-bug-deshabilitar-agente-software' into 'develop'
ticket resolved
See merge request artica/pandorafms!2207
|
2019-06-03 18:16:32 +02:00 |
|
manuel
|
5ba2ba1ef3
|
Fixed bug in time comparison graphs
|
2019-06-03 15:37:05 +02:00 |
|
Daniel Rodriguez
|
d0e99e1018
|
Merge branch 'ent-3576-ldap-advanced-remote-user-unchecked' into 'develop'
Fixed ldap adv. perms continues apliying when autocreate remote is unselected
See merge request artica/pandorafms!2221
|
2019-06-03 15:09:15 +02:00 |
|
Daniel Rodriguez
|
909fa354b4
|
Merge branch '4091-bug-en-permisos-al-crear-usuario-con-ldap-advanced' into 'develop'
Changed for create new user with advanced config enabled and forced automaticly disabled
See merge request artica/pandorafms!2459
|
2019-06-03 14:51:06 +02:00 |
|
fbsanchez
|
31257c02a4
|
style review
|
2019-06-03 14:50:22 +02:00 |
|
fbsanchez
|
7a09a80ace
|
style review
|
2019-06-03 14:30:23 +02:00 |
|
fbsanchez
|
551a21ed86
|
Next contact fixes
|
2019-06-03 13:11:00 +02:00 |
|
fbsanchez
|
13086b596c
|
Next contact
|
2019-06-03 13:04:49 +02:00 |
|
Alejandro Fraguas
|
45c58a7c72
|
Merge branch 'ent-4041-7980-bug-parametro-event_storm_protection' into 'develop'
Variability event_storm_protection check is added with empty data
See merge request artica/pandorafms!2428
|
2019-06-03 11:58:52 +02:00 |
|
fbsanchez
|
b4dcf4a6f1
|
style review
|
2019-06-03 11:55:56 +02:00 |
|
fbsanchez
|
ddf3b7a258
|
Review 1
|
2019-06-03 11:21:44 +02:00 |
|
fbsanchez
|
9de5dadbf2
|
style review
|
2019-06-03 11:16:51 +02:00 |
|