Jose Gonzalez
de49530fd1
Avoid XSS in User management
2020-09-09 11:58:09 +02:00
alejandro-campos
77496bd5a2
added warning message
2020-09-09 09:35:21 +02:00
alejandro-campos
c4e192f7f7
fix agents selector check
2020-09-04 13:54:07 +02:00
alejandro-campos
d4b44d33a0
fix snmp version update
2020-09-01 17:39:25 +02:00
Marcos Alconada
f75a0a98f1
add condition in UM if group equals 0
2020-09-01 13:26:10 +02:00
manuel.montes
05fadd167d
Changed names
2020-09-01 12:30:55 +02:00
daniel
fe8e7b7d0c
Add new filter search actions
2020-08-31 12:48:00 +02:00
daniel
b96cade165
new options 24x7 sla,availavility reports
2020-08-31 12:33:41 +02:00
manuel.montes
f477919433
Fixed entities in query
2020-08-28 13:56:15 +02:00
Jose Gonzalez
5565d839c3
Merge remote-tracking branch 'origin/develop' into ent-6093-error-fields-en-alertas-snmp
2020-08-26 09:00:35 +02:00
Jose Gonzalez
516de686cf
Fixed issue
2020-08-25 15:03:19 +02:00
Jose Gonzalez
1b14d83fd4
Added None value
2020-08-25 10:58:26 +02:00
Daniel Rodriguez
0512149ee4
Merge branch 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' into 'develop'
...
Ent 6102 edicion nombre sincronizacion alertas metaconsola
See merge request artica/pandorafms!3364
2020-08-20 14:43:17 +02:00
Marcos Alconada
77142a0c1a
fixed vulnerability
2020-08-14 11:42:49 +02:00
Marcos Alconada
86bfcbcd90
changes on user list
2020-08-12 13:20:53 +02:00
José González
85d8e1f796
Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola'
...
# Conflicts:
# pandora_console/extras/mr/40.sql
# pandora_console/godmode/alerts/configure_alert_template.php
2020-08-07 13:17:41 +02:00
Daniel Rodriguez
1ab4e89a14
Merge branch 'ent-6036-Error-en-edicion-de-acciones-de-alerta' into 'develop'
...
fix empty check condition
See merge request artica/pandorafms!3359
2020-08-07 09:46:09 +02:00
Daniel Rodriguez
a123eaa18c
Merge branch 'ent-5609-link-to-credential-store-from-remote-module-creation' into 'develop'
...
Added link to credential store from module creation
See merge request artica/pandorafms!3363
2020-08-07 09:45:43 +02:00
Daniel Rodriguez
ef73e7a73c
Merge branch 'ent-6099-bug-al-duplicar-modulo' into 'develop'
...
resolved error with duplucated modules
See merge request artica/pandorafms!3357
2020-08-07 09:42:08 +02:00
Luis
7b09c1e943
Ent 6029 meta groups delete bug
2020-08-07 09:40:46 +02:00
Daniel Rodriguez
bfe504b3be
Merge branch 'ent-6053-error-envio-informe-mail-vista-informes' into 'develop'
...
Fixed report sendmail success message
See merge request artica/pandorafms!3353
2020-08-07 09:37:10 +02:00
Luis
35f231ac8c
Restored alert actions help (needed for macros)
2020-08-07 09:36:43 +02:00
Luis
20addda9fe
Fixed missing ckbox custom graphs
2020-08-07 09:35:27 +02:00
marcos
248c5936b6
fixed error with filter form
2020-08-07 09:19:46 +02:00
marcos
bb2fb0c631
Merge remote-tracking branch 'origin/develop' into ent-6099-bug-al-duplicar-modulo
2020-08-07 08:47:11 +02:00
Daniel Maya
cbc8630dfc
Ent 5206 9287 exportacion a csv con dato con muchos decimales y miles trae confusion
2020-07-23 16:52:24 +02:00
Daniel Maya
9f2e722787
Ent 6034 improvement of the um profile
2020-07-23 13:26:39 +02:00
daniel
2c535bb747
Fixed labels mode classic
2020-07-21 15:06:41 +02:00
Daniel Rodriguez
7d69cbe65d
Merge branch 'ent-5907-bug-status-modulo-prediccion' into 'develop'
...
Solved issue with thresholds in prediction modules
Closes pandora_enterprise#5907
See merge request artica/pandorafms!3293
2020-07-21 10:48:06 +02:00
Daniel Rodriguez
51f2db16cb
Merge branch 'ent-5587-no-tiene-en-cuenta-las-acciones-default-filtrar-alertas' into 'develop'
...
Changed query for get default actions in templates
Closes pandora_enterprise#5587
See merge request artica/pandorafms!3320
2020-07-20 07:54:08 +02:00
Daniel Rodriguez
249e4a737a
Merge branch 'ent-5806-post-process-genera-lineas-repetidas' into 'develop'
...
Changed nothing option for avoid duplicates
Closes pandora_enterprise#5806
See merge request artica/pandorafms!3297
2020-07-20 07:52:48 +02:00
Daniel Rodriguez
8915492323
Merge branch 'ent-6004-error-visual-en-el-filtrado-de-componentes-en-metaconsola' into 'develop'
...
fixed visual error tag meta
See merge request artica/pandorafms!3318
2020-07-20 07:51:57 +02:00
Daniel Rodriguez
100db2d4db
Merge branch 'ent-5920-Fallo-al-pinchar-en-visual-console-manager-en-metaconsola' into 'develop'
...
Fixed error link builder in VC
See merge request artica/pandorafms!3275
2020-07-16 12:11:51 +02:00
daniel
f3ad52e0fa
Ent 5532 edicion creacion de templates acciones comandos modo centralizado
2020-07-13 12:23:46 +02:00
Daniel Rodriguez
492c7f90cf
Merge branch 'ent-5670-no-aparecen-los-valores-introducidos-al-crear-una-platilla-de-alerta' into 'develop'
...
fixed error
See merge request artica/pandorafms!3321
2020-07-13 11:13:24 +02:00
Alejandro Fraguas
fbb251f358
Merge branch 'ent-5468-parsear-campos-exec-server-por-si-hay-espacios-sobre-todo-ip' into 'develop'
...
Ent 5468 parsear campos exec server por si hay espacios sobre todo ip
See merge request artica/pandorafms!3334
2020-07-13 10:54:42 +02:00
daniel
c0661fc1b7
fixed legend max 10 modules for chart
2020-07-13 10:02:56 +02:00
Daniel Rodriguez
8b24faa129
Merge branch 'ent-2002-Remote-component-centralizado' into 'develop'
...
Blocked create and update of remote component group when meta has centralized management
Closes pandora_enterprise#2002
See merge request artica/pandorafms!3272
2020-07-10 10:11:25 +02:00
José González
f3d1a80252
Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola'
...
# Conflicts:
# pandora_console/extras/mr/40.sql (solved)
2020-07-10 08:19:07 +02:00
fbsanchez
009d5c7bc0
Merge remote-tracking branch 'origin/develop' into ent-6000-operaciones-masivas-de-servicios
2020-07-09 16:51:50 +02:00
Alejandro Fraguas
df9ab22fc1
Merge branch 'ent-6012-servicios-dinamicos' into 'develop'
...
MR change smart services
See merge request artica/pandorafms!3316
2020-07-08 18:01:16 +02:00
Daniel Rodriguez
8925821a2b
Merge branch 'ent-6045-snmp-alert-field-10-se-borra' into 'develop'
...
Fixed minor bug field10 param
See merge request artica/pandorafms!3346
2020-07-08 11:04:47 +02:00
Jose Gonzalez
5e039adb26
Solve the issue for alerts, os names and tags
2020-07-07 11:05:19 +02:00
Luis Calvo
37a97cd2ad
Added link to credential store from module creation
2020-07-07 10:26:19 +02:00
fbsanchez
cf26293a33
WIP massive services
2020-07-06 19:35:31 +02:00
alejandro-campos
0ef7ff1198
fix empty check condition
2020-07-06 14:35:22 +02:00
fbsanchez
534aa8c7c5
Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
2020-07-06 14:31:55 +02:00
marcos
4ad7735dd7
resolved error with duplucated modules
2020-07-06 10:09:36 +02:00
Luis Calvo
76d724321f
Fixed report sendmail success message
2020-07-03 14:18:30 +02:00
alejandro-campos
63df6c15f0
Merge branch 'develop' into ent-6030-Problema-codificacion
2020-07-01 16:39:00 +02:00
Luis Calvo
88d72b3d66
Fixed minor bug field10 param
2020-07-01 14:41:31 +02:00
manuel.montes
5502ee6b01
Fixed bug in module manage meta
2020-07-01 10:16:55 +02:00
fbsanchez
faaf14bfd4
Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
...
Conflicts:
pandora_console/extras/mr/39.sql
pandora_console/include/lib/Module.php
2020-06-30 17:04:33 +02:00
José González
311b259684
Backup upload
2020-06-30 12:16:51 +02:00
Daniel Maya
db452f41f5
Added trim in address
2020-06-26 10:11:41 +02:00
Alejandro Fraguas
02bffc7e0d
Merge branch 'ent-5935-Logs-de-la-consola-refactorizacion' into 'develop'
...
changed console and audit log locations
See merge request artica/pandorafms!3278
2020-06-25 15:28:13 +02:00
daniel
36e57ddd1d
New report last value
2020-06-25 12:18:37 +02:00
fbsanchez
a8671078f1
Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
...
Conflicts:
pandora_console/install.php
2020-06-25 11:25:43 +02:00
Daniel Rodriguez
5aef38dd72
Merge branch 'ent-5186-Texto-HTML-plano-en-apartado-de-los-reports-en-visual-styles' into 'develop'
...
fixes in reports front page default setup
See merge request artica/pandorafms!3250
2020-06-24 12:43:23 +02:00
Manuel Montes
549a17a428
Ent 5470 se duplican los sistemas operativos
2020-06-23 14:45:04 +02:00
Alejandro Campos
9ce4c90456
Merge branch 'develop' into 'ent-5186-Texto-HTML-plano-en-apartado-de-los-reports-en-visual-styles'
...
# Conflicts:
# pandora_console/godmode/setup/setup_visuals.php
2020-06-23 10:04:24 +02:00
alejandro-campos
cec16d01b8
Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion
2020-06-23 09:56:21 +02:00
Alejandro Campos
a81e4acbb7
Merge branch 'develop' into 'ent-6030-Problema-de-codificacion'
...
# Conflicts:
# pandora_console/include/functions_config.php
2020-06-23 09:28:21 +02:00
alejandro-campos
6520ad2107
Added setup token
2020-06-23 09:21:15 +02:00
Alejandro Fraguas
7be71080eb
Merge branch 'ent-5959-xxs-special-day' into 'develop'
...
ignore keys xss special days
See merge request artica/pandorafms!3323
2020-06-22 09:37:07 +02:00
Alejandro Fraguas
487ab4e86a
Merge branch 'ent-5956-xss-manage-agent-group' into 'develop'
...
ignore keys on xss manage angent groups
See merge request artica/pandorafms!3322
2020-06-22 09:25:05 +02:00
alejandro-campos
d64ff918d6
Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion
2020-06-19 12:22:28 +02:00
alejandro-campos
1243968872
Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion
2020-06-19 12:12:52 +02:00
marcos
1f4de3ee4d
ignore keys xss special days
2020-06-19 10:53:14 +02:00
marcos
415a8aa8b6
ignore keys on xss manage angent groups
2020-06-19 10:44:43 +02:00
marcos
40c0d4ea09
fixed error
2020-06-18 17:09:22 +02:00
Jose Gonzalez
1805a0910e
Changed query for get default actions in templates
2020-06-18 16:53:32 +02:00
marcos
f3de739a7c
fixed visual error tag meta
2020-06-18 15:30:55 +02:00
Luis
28da2b9afb
Ent 5473 report template inventory
2020-06-18 13:19:04 +02:00
Alejandro Fraguas
dbdf5edd0c
Merge branch 'ent-636-Campos-Target-IP-y-Export-target-en-politicas' into 'develop'
...
Changed target ip selector in WMI server policy modules
See merge request artica/pandorafms!3186
2020-06-17 17:49:12 +02:00
alejandro-campos
9f4fed57b1
Merge branch 'develop' into ent-636-Campos-Target-IP-y-Export-target-en-politicas
2020-06-17 15:27:14 +02:00
fbsanchez
430facd704
Merge remote-tracking branch 'origin/develop' into ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle
...
Conflicts:
pandora_console/include/constants.php
pandora_server/lib/PandoraFMS/Recon/Base.pm
2020-06-17 14:00:07 +02:00
fbsanchez
55f10fc640
Merge remote-tracking branch 'origin/develop' into ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle
...
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
pandora_server/lib/PandoraFMS/Recon/Base.pm
2020-06-17 13:41:09 +02:00
fbsanchez
225b82233c
Merge remote-tracking branch 'origin/develop' into ent-5778-9834-db2-para-discovery
2020-06-17 10:13:28 +02:00
fbsanchez
1eea17f9b9
Merge remote-tracking branch 'origin/develop' into ent-5527-cambio-discovery-sap-para-hacerlo-personalizable
2020-06-15 17:41:53 +02:00
Alejandro Fraguas
495b13f387
Merge branch 'ent-5959-xxs-special-day' into 'develop'
...
fixed vulnerability on special days
See merge request artica/pandorafms!3286
2020-06-15 12:14:42 +02:00
Alejandro Fraguas
80774e9942
Merge branch 'ent-5956-xss-manage-agent-group' into 'develop'
...
fixed security error on manage agent group
See merge request artica/pandorafms!3288
2020-06-15 10:33:50 +02:00
Alejandro Fraguas
62ce710b5b
Merge branch 'ent-5954-XSS-Tags' into 'develop'
...
Control vulnerable fields
Closes pandora_enterprise#5954
See merge request artica/pandorafms!3283
2020-06-15 10:02:20 +02:00
Alejandro Fraguas
af8326c042
Merge branch 'ent-5952-XSS-Netscan' into 'develop'
...
fix XSS
See merge request artica/pandorafms!3282
2020-06-15 09:33:08 +02:00
Daniel Rodriguez
146879ee8d
Merge branch 'ent-5856-Se-pierde-filtro-al-paginar-en-REPORTS' into 'develop'
...
Fixed errors filter search with pagination
See merge request artica/pandorafms!3226
2020-06-15 08:29:14 +02:00
fbsanchez
b4219472f2
Merge remote-tracking branch 'origin/develop' into ent-5778-9834-db2-para-discovery
2020-06-11 14:55:36 +02:00
fbsanchez
057fcea724
DB2 discovery
2020-06-11 14:53:34 +02:00
Daniel Rodriguez
d3a34c5f00
Merge branch 'ent-5779-open-aviso-de-exclusividad-de-enterprise-en-bulk-operations' into 'develop'
...
Fix #5779
See merge request artica/pandorafms!3233
2020-06-11 14:03:14 +02:00
Daniel Rodriguez
a8328bd4f1
Merge branch 'ent-5568-case-insensitive-para-el-buscador-de-usuarios' into 'develop'
...
Ent 5568 case insensitive para el buscador de usuarios
See merge request artica/pandorafms!3244
2020-06-11 14:00:52 +02:00
Jose Gonzalez
da52e0f739
Changed nothing option for avoid duplicates
2020-06-10 16:00:23 +02:00
Jose Gonzalez
599445ad4d
Solved issue with thresholds in prediction modules
2020-06-09 16:05:24 +02:00
marcos
b3a270d0b3
fixed security error on manage agent group
2020-06-09 12:43:58 +02:00
marcos
9ddfde1774
fixed error with update event comments
2020-06-09 12:02:31 +02:00
marcos
cfe30d5b7d
fixed vulnerability on special days
2020-06-09 10:37:11 +02:00
alejandro-campos
442b40ad97
Merge branch 'develop' into ent-636-Campos-Target-IP-y-Export-target-en-politicas
2020-06-09 09:30:16 +02:00
Jose Gonzalez
120b78b5c5
Control vulnerable fields
2020-06-08 17:36:32 +02:00
alejandro-campos
754023f908
fix XSS
2020-06-08 17:12:33 +02:00
fbsanchez
11dbe46a96
Allowed toggled rows
2020-06-08 15:23:09 +02:00
alejandro-campos
ab61cf1fc5
changed console and audit log locations
2020-06-08 10:48:48 +02:00
Alejandro Fraguas
a8bf9843ee
Merge branch 'ent-5728-bug-standard-users-pandora-administrator' into 'develop'
...
Fixed user list for UM
See merge request artica/pandorafms!3241
2020-06-08 10:46:37 +02:00
Daniel Barbero Martin
44b2c59572
Fixed error link builder in VC
2020-06-05 11:01:00 +02:00
Jose Gonzalez
6690bfdad8
Blocked create and update of remote component group when meta has centralized management
2020-06-04 21:07:53 +02:00
Daniel Rodriguez
86afda25fe
Merge branch 'ent-5673-Mala-visualizacion-de-modulos-con-caracteres-japones' into 'develop'
...
Fixed errors encoding
See merge request artica/pandorafms!3234
2020-06-02 17:24:11 +02:00
Daniel Rodriguez
2e79394288
Merge branch 'fix-disable-enable-agent' into 'develop'
...
Fixed the problem that agents cannot be enabled/disabled with open version.
See merge request artica/pandorafms!3191
2020-06-02 09:54:40 +02:00
Daniel Rodriguez
df1fe544a1
Merge branch 'ent-5756-pantallas-de-configuracion-del-cluster' into 'develop'
...
Ent 5756 pantallas de configuracion del cluster
See merge request artica/pandorafms!3205
2020-06-01 09:47:25 +02:00
Daniel Maya
a56ee5dac5
Ent 5648 querier avanzado en la vista de log collector
2020-05-29 13:07:53 +02:00
fbsanchez
b3cf532c16
Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster
2020-05-29 12:30:49 +02:00
Manuel Montes
611291c217
Ent 5428 revision total de ayudas hint wiki
2020-05-29 11:37:06 +02:00
alejandro-campos
476ebe70a7
fixes in reports front page default setup
2020-05-28 14:47:36 +02:00
Manuel Montes
2ae11577ce
Added case insensitive in agent search
2020-05-26 14:42:06 +02:00
Luis Calvo
24ddb370a7
Fixed user list for UM
2020-05-26 13:38:03 +02:00
fbsanchez
37058537aa
Fix #5779
2020-05-25 17:06:23 +02:00
Daniel Barbero Martin
db32fedde4
Fixed errors encoding
2020-05-25 17:06:20 +02:00
fbsanchez
f3d9f2d75e
Cluster view RC1
2020-05-22 13:13:19 +02:00
fbsanchez
e66f33fd37
WIP Cluster references updated
2020-05-22 12:14:01 +02:00
Daniel Barbero Martin
a73ec18867
Fixed errors filter search with pagination
2020-05-21 09:13:39 +02:00
alejandro-campos
7abd17285a
Merge branch 'develop' into ent-5415-Bugs-password-policy
2020-05-19 17:39:55 +02:00
alejandro-campos
706738d801
fixed password length check in user update for admin user
2020-05-19 15:58:41 +02:00
Tatiana Llorente
b99298786e
Ent 5754 editor de usuarios de godmode que sea visualmente similar al editor de usuarios el propio usuario
2020-05-19 08:20:04 +02:00
Alejandro Fraguas
aaf64e591c
Merge branch 'ent-5708-review-discovery-h-d' into 'develop'
...
Ent 5708 review discovery h d
See merge request artica/pandorafms!3195
2020-05-14 10:32:43 +02:00
Tatiana Llorente
1f16abd4bd
Ent 5701 quitar feature de chat
2020-05-08 15:39:24 +02:00
Daniel Rodriguez
b655094f3a
Merge branch 'ent-5619-se-muestran-2-veces-el-mensaje-de-realizado' into 'develop'
...
duplicated enable/disable message
See merge request artica/pandorafms!3128
2020-05-08 15:38:24 +02:00
tatiana
490213dfed
Changed path in a required file
2020-05-05 12:50:15 +02:00
fbsanchez
4815dce8aa
H&D port filtering + control tasks cancellation while restarting server
2020-05-04 11:13:15 +02:00
fbsanchez
900e25eef1
WIP rcmd in H&D
2020-04-30 15:00:25 +02:00
Junichi Satoh
788c39008e
Fixed the problem that agent cannot be enabled/disabled with open version.
2020-04-30 15:50:45 +09:00
alejandro-campos
086bc28986
Changed target ip selector in WMI server policy modules
2020-04-27 17:27:54 +02:00
fbsanchez
7024863fd7
Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux
...
Conflicts:
pandora_console/extras/mr/37.sql
2020-04-14 16:06:17 +02:00
fbsanchez
edb3059a09
minor style fix
2020-04-14 12:32:54 +02:00
fbsanchez
3b71297d56
escaped single quotes (wmi) + refresh button
2020-04-14 11:57:18 +02:00
fbsanchez
13a1e44a5e
operation icons on small screens
2020-04-13 19:34:36 +02:00
fbsanchez
58eeffd04d
clearer maps
2020-04-13 18:28:56 +02:00
Jose Gonzalez
3fd09c9828
WIP: Reverse develop version for agent_wizard
2020-04-13 17:30:21 +02:00
fbsanchez
748582509a
avoid process csv while updating task with no csv changes
2020-04-08 12:29:44 +02:00
fbsanchez
95d7a5d267
minor fix
2020-04-08 12:26:01 +02:00
fbsanchez
47857de79f
some css adjustments
2020-04-08 11:48:31 +02:00
fbsanchez
5c405b1d32
Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux
2020-04-08 10:18:13 +02:00
fbsanchez
56e9275b1a
minor fix
2020-04-07 19:10:37 +02:00
fbsanchez
762ad3106d
Improvements and fixes H&D with review
2020-04-07 18:50:56 +02:00
Jose Gonzalez
1a080a4e3a
WIP: Backup upload
2020-04-07 16:41:33 +02:00
fbsanchez
d5faabbff5
minor fix review with limitations
2020-04-07 12:43:44 +02:00
Daniel Rodriguez
bcaf37c60c
Merge branch 'ent-5659-ventana-modal-de-la-vista-de-mapa-discovery-task-se-va' into 'develop'
...
fixed error with dialog task list
See merge request artica/pandorafms!3139
2020-04-07 10:57:12 +02:00
fbsanchez
194c6d6a9a
Excluded PENed templates from select
2020-04-06 18:26:55 +02:00
fbsanchez
c743a2b204
minor fix
2020-04-06 14:32:20 +02:00
fbsanchez
6cb9b06cea
minor fix, license limits while reapplying queue
2020-04-06 13:42:39 +02:00
fbsanchez
3f9bdf65df
minor fixes and target selection (buttons)
2020-04-06 13:00:09 +02:00
marcos
3a688c6b3d
update task list dialog
2020-04-06 12:29:37 +02:00
fbsanchez
5205e0e06f
minor update
2020-04-06 12:05:03 +02:00
fbsanchez
2d4b977d26
Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps
2020-04-06 11:05:18 +02:00
fbsanchez
1523dca9b2
Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps
2020-04-06 11:04:57 +02:00
fbsanchez
72f026f152
Minor fixes, group and review while exceeded license
2020-04-06 11:04:53 +02:00
Jose Gonzalez
a6ce19db66
WIP: Backup upload
2020-04-06 09:49:59 +02:00
Jose Gonzalez
5c04c6c03b
Minor fixes with data
2020-04-03 12:55:48 +02:00
Daniel Rodriguez
89e7d1921f
Merge branch 'ent-5657-al-añadir-accion-en-la-lista-de-alertas-el-dialogo-modal-no-muestra-en-nombre-de-agente' into 'develop'
...
fixed minnnor error
See merge request artica/pandorafms!3137
2020-04-03 12:06:50 +02:00
marcos
f229dada52
fixed minnnor error
2020-04-02 19:02:14 +02:00
Daniel Rodriguez
81e7e9a7d9
Merge branch 'ent-5656-Admin-lista-de-usuarios-cambios-menores-en-la-visualizacion' into 'develop'
...
minor visual changes
See merge request artica/pandorafms!3132
2020-04-02 15:25:40 +02:00
Luis
bcd9aabcd8
Ent 5604 policy modules japanese bug
2020-04-02 14:30:02 +02:00
Jose Gonzalez
933bdef165
Added solution for multiple template delete
2020-04-02 08:10:37 +02:00
alejandro-campos
6d6b891650
minor visual changes
2020-04-01 17:32:22 +02:00
fbsanchez
e249233205
minor fixes
2020-04-01 16:43:04 +02:00
Jose Gonzalez
1b8fa26193
Minor fixes applied
2020-04-01 16:36:06 +02:00
Jose Gonzalez
6be6e19ad3
WIP: Ready for testing
2020-04-01 16:21:28 +02:00
Jose Gonzalez
4f2ad67f58
WIP: Deleted legacy menu entry
2020-04-01 13:13:31 +02:00
marcos
a2ee59e5b0
duplicated enable/disable message
2020-03-31 17:35:01 +02:00
alejandro-campos
297672ec48
fix password checkings when pass policy is enabled
2020-03-31 15:12:39 +02:00
Jose Gonzalez
a715b7d74a
WIP
2020-03-31 13:00:07 +02:00
Jose Gonzalez
4c332a3543
WIP: Must do low changes
2020-03-31 10:47:00 +02:00
fbsanchez
acabe543c4
csv recon0
2020-03-30 19:44:44 +02:00
Jose Gonzalez
85765099ea
Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps
2020-03-30 17:01:03 +02:00
Jose Gonzalez
d09c5f355b
WIP: Fixes and refactor
2020-03-30 17:00:48 +02:00
fbsanchez
6ea901e7ee
Limitations
2020-03-30 15:07:05 +02:00
fbsanchez
c556bf3ba8
License validation
2020-03-30 15:03:22 +02:00
fbsanchez
a7c783242d
Remaining stuff
2020-03-30 12:51:52 +02:00
Jose Gonzalez
e883312038
Modified menu
2020-03-30 08:22:07 +02:00
Jose Gonzalez
4e019fe193
Modified name for Network component to Remote component
2020-03-27 13:47:49 +01:00
fbsanchez
dffaafbf6a
Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps
2020-03-27 11:42:09 +01:00
fbsanchez
3a74e25068
PEN management
2020-03-27 11:41:56 +01:00
Jose Gonzalez
75de601f57
Forms modified for be able add raw inputs
2020-03-27 08:51:17 +01:00
fbsanchez
452f5253e2
merge develop
2020-03-26 14:43:57 +01:00
Jose Gonzalez
161c1eb643
WIP: Minor fixes
2020-03-26 14:41:54 +01:00
fbsanchez
e48ef76f35
merge
2020-03-26 14:38:23 +01:00
daniel
709201bf23
dashboards
2020-03-26 12:29:38 +01:00
Jose Gonzalez
2b21266a38
WIP: At this point, PEN form is operative and functional
2020-03-26 12:17:28 +01:00
Jose Gonzalez
86cbecc9a0
WIP: PEN form near to clear
2020-03-26 09:04:10 +01:00
fbsanchez
fecff8aa93
Discovery review advanced
2020-03-25 18:02:58 +01:00
Jose Gonzalez
3a5e7b08e5
WIP: Added class and page for PENs management
2020-03-24 15:14:57 +01:00
Alejandro Campos
b56076044b
Merge branch 'develop' into 'ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado'
...
# Conflicts:
# pandora_console/extras/mr/37.sql
2020-03-24 13:55:57 +01:00
Jose Gonzalez
2e4de8664e
WIP: Changes in menu
2020-03-24 08:04:37 +01:00
Jose Gonzalez
8523d6e429
WIP: Modify menu to apply the proper changes
2020-03-24 07:54:29 +01:00
fbsanchez
23c19856b8
minor fixes
2020-03-23 19:09:22 +01:00
Jose Gonzalez
c18d339730
WIP: Backup upload
2020-03-23 15:16:54 +01:00
Daniel Rodriguez
ce249275e4
Merge branch 'ent-5138-9245-Metaconsola-Sincronizacion-de-grupos-cuando-se-eliminan' into 'develop'
...
Ent 5138 9245 metaconsola sincronizacion de grupos cuando se eliminan
See merge request artica/pandorafms!3112
2020-03-23 13:04:16 +01:00
Daniel Rodriguez
1dddb6d81a
Merge branch 'ent-5509-Resumen-erroneo-de-borrado-en-OPERACIONES-MASIVAS' into 'develop'
...
Ent 5509 resumen erroneo de borrado en operaciones masivas
See merge request artica/pandorafms!3085
2020-03-23 13:01:34 +01:00
alejandro-campos
e05c292d7d
show last status change of module
2020-03-23 12:47:58 +01:00
Daniel Maya
c7e6f9fd34
Added disable event in alert template
2020-03-23 11:34:37 +01:00
Jose Gonzalez
29dcc8bc78
WIP: Backup upload
2020-03-20 15:35:30 +01:00
Tatiana Llorente
e0b69bbe3e
Ent 5101 9223 eliminacion de agentes en nodo no elimina agentes en politica de meta
2020-03-20 12:34:58 +01:00
fbsanchez
72b6e7f81a
Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps
2020-03-19 18:33:09 +01:00
fbsanchez
17eae7d97f
updates
2020-03-19 18:33:04 +01:00
Jose Gonzalez
7bf5764081
Added CSS changes. WIP: Backup upload
2020-03-19 18:24:52 +01:00
Jose Gonzalez
cca11f2341
WIP: Backup upload
2020-03-19 16:14:38 +01:00
tatiana
e939ac05a8
Delete groups in nodes when deleting in meta - #5138
2020-03-19 13:11:06 +01:00
fbsanchez
f58276ddbb
Templates
2020-03-18 19:31:58 +01:00
Tatiana Llorente
8c86019037
Ent 5583 bug comando de alerta
2020-03-18 12:25:29 +01:00
fbsanchez
b860c49383
target selections
2020-03-17 18:34:30 +01:00
Jose Gonzalez
c1337a4318
WIP: Backup upload
2020-03-17 18:27:56 +01:00
Jose Gonzalez
40958ae69d
WIP: Backup upload
2020-03-17 16:24:17 +01:00
Jose Gonzalez
142823eef6
WIP: Backup upload
2020-03-17 13:46:10 +01:00
fbsanchez
18876c6e06
Merge remote-tracking branch 'origin/develop' into ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle
2020-03-17 12:56:48 +01:00
fbsanchez
3a4deddc4b
Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps
2020-03-16 23:52:34 +01:00
fbsanchez
f3da919abc
WIP multiple changes
2020-03-16 23:52:20 +01:00
Jose Gonzalez
106f8bd1cf
Created new files with Module Blocks and changed Menu entries
2020-03-16 20:48:38 +01:00
Daniel Rodriguez
e1e76595a5
Merge branch 'ent-5365-Pestana-de-acciones-de-alertas-sin-paginacion' into 'develop'
...
Ent 5365 pestana de acciones de alertas sin paginacion
See merge request artica/pandorafms!3087
2020-03-16 17:19:32 +01:00
Tatiana Llorente
c7bb4f5a95
Ent 5548 usabilidad en el editor de modulos
2020-03-16 16:35:01 +01:00
Daniel Maya
fc88d265d4
Added group filter in alert list
2020-03-16 15:42:10 +01:00
fbsanchez
ce11d89953
Frontent changes
2020-03-13 14:03:50 +01:00
Daniel Maya
a7fdd4cc20
change in metaconsole advanced setup
2020-03-11 16:21:25 +01:00
fbsanchez
f0a71e01de
minor fixes
2020-03-11 13:35:31 +01:00
Luis
6721e4f5ab
Ent 5446 bug creating netflow filter
2020-03-11 11:32:21 +01:00
fbsanchez
9211396134
Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux
2020-03-10 15:40:16 +01:00
Daniel Rodriguez
97f3902cf4
Merge branch 'ent-5431-Filtro-de-usuarios' into 'develop'
...
fix bad parameter in function call
See merge request artica/pandorafms!3068
2020-03-10 12:11:29 +01:00
fbsanchez
fd23ed30c5
Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux
2020-03-04 11:37:35 +01:00
Tatiana Llorente
d799ac0739
Added pagination and filter box in alert actions - #5365
2020-03-02 16:17:45 +01:00
Tatiana Llorente
c8e492b194
Moved creation button to right side in visual maps - #5404
2020-03-02 11:41:54 +01:00
Tatiana Llorente
13466536bd
Show correct counter of deleted alerts - #5509
2020-03-02 11:23:20 +01:00
fbsanchez
b125f7618e
browser option in wux modules
2020-02-27 18:41:28 +01:00
Luis
82fe47cfd9
Ent 5312 snmp browser enchancements
2020-02-27 16:31:09 +01:00
Tatiana Llorente
ec57540fb0
Ent 5432 libreria de modulos de pandora integrada en consola
2020-02-27 11:20:24 +01:00
Daniel Rodriguez
43ca1bdc5d
Merge branch 'ent-5336-SNMP-Interface-Wizard' into 'develop'
...
Fixed when you select 'show all modules' and the module is not from the interface
See merge request artica/pandorafms!3056
2020-02-24 14:30:49 +01:00
alejandro-campos
4bdea42c63
fix bad parameter in function call
2020-02-24 13:16:22 +01:00
Daniel Barbero Martin
6ccc606c74
Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs
2020-02-20 08:06:59 +01:00
Daniel Rodriguez
ab568bdb52
Merge branch 'ent-5488-Mala-redireccion-en-wizard-de-wmi-que-inhabilita-la-funcionalidad' into 'develop'
...
fix bug in form action
See merge request artica/pandorafms!3065
2020-02-19 11:30:34 +01:00
marcos
e265bc2970
Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens
2020-02-19 09:31:31 +01:00
Alejandro Fraguas
1acfaa9cdc
Merge branch 'ent-5429-Cambios-en-el-editor-de-modulos' into 'develop'
...
Ent 5429 cambios en el editor de modulos
See merge request artica/pandorafms!3052
2020-02-18 14:03:36 +01:00
alejandro-campos
65b3b1dc36
fix bug in form action
2020-02-18 13:47:47 +01:00
marcos
7564249207
Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens
2020-02-17 16:15:29 +01:00
Daniel Barbero Martin
10972a2364
Fix bug icon builder view not legacy mode
2020-02-13 08:45:25 +01:00
marcos
dec7733148
add discovery_app_microsoft_sql_serve on task list
2020-02-12 11:47:43 +01:00
Daniel Rodriguez
5d436d214b
Merge branch 'ent-4740-revision-completa-de-informes-templates-en-nodo' into 'develop'
...
Fixed bug in prediction report item 4740
See merge request artica/pandorafms!2872
2020-02-11 15:39:26 +01:00
Daniel Maya
e65de54f39
Fixed when you select 'show all modules' and the module is not from the interface
2020-02-10 15:46:04 +01:00
Alejandro Fraguas
0538bd5185
Merge branch 'ent-5227-Problema-encoding-aplicación-politicas' into 'develop'
...
Ent 5227 problema encoding aplicación politicas
See merge request artica/pandorafms!3055
2020-02-10 12:14:19 +01:00
Manuel Montes
4f14921e85
Fixed bug in reports
2020-02-10 11:40:33 +01:00
alejandro-campos
b658fddfc2
visual changes in module creation
2020-02-07 13:58:26 +01:00
Jose Gonzalez
5b08e71ec6
Solved issue with UTF8 chars in configuration_data field
2020-02-06 13:02:58 +01:00
Daniel Rodriguez
1cca736953
Merge branch 'ent-4788-Icono-GIS-en-Setup-desaparecido' into 'develop'
...
Ent 4788 icono gis en setup desaparecido
See merge request artica/pandorafms!2843
2020-02-05 12:35:50 +01:00
Daniel Rodriguez
8b60daa9ba
Merge branch 'ent-5362-9464-Fallo-en-vista-de-agente-con-modulos-generic_string' into 'develop'
...
fix module string data with html special chars breaking html in page
See merge request artica/pandorafms!3042
2020-02-04 10:10:07 +01:00
Daniel Rodriguez
32cb47fb71
Merge branch 'ent-5251-9432-No-se-pueden-crear-usuarios-con-password-policy-activado' into 'develop'
...
Fixed password policy
See merge request artica/pandorafms!3020
2020-02-03 16:06:43 +01:00
Alejandro Fraguas
6aae378b37
Merge branch 'ent-4533-descuadre-visual-usuarios-metaconsola' into 'develop'
...
ajuste visual en tabla user management
See merge request artica/pandorafms!2682
2020-02-03 13:55:42 +01:00
alejandro-campos
73f3dfac85
fix module string data with html special chars breaking html in page
2020-01-31 11:53:42 +01:00
marcos
d5016d4943
Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens
2020-01-28 10:08:01 +01:00
Daniel Barbero Martin
0dabab11cf
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
...
Conflicts:
pandora_console/install.php
2020-01-27 16:19:32 +01:00
Daniel Rodriguez
28392b71ef
Merge branch 'ent-5066-9061-Crear-Failover-en-Informe-de-disponibilidad' into 'develop'
...
availability failover
See merge request artica/pandorafms!3015
2020-01-27 10:48:50 +01:00
Daniel Barbero Martin
aea073b4d5
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-24 11:41:35 +01:00
Daniel Barbero Martin
fe697a98ec
fixed errors VC
2020-01-23 19:54:47 +01:00
marcos
79a34ac756
Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens
2020-01-23 11:06:15 +01:00
vgilc
2447514c41
Merge branch 'ent-4259-el-id-del-agente-con-remote-config-se-corta-en-la-vista-de-manage-resolucion-portatil' into 'develop'
...
Fix visual problems with agent details
See merge request artica/pandorafms!2625
2020-01-23 10:11:35 +01:00
Daniel Barbero Martin
6c6403336f
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-23 08:14:24 +01:00
marcos
823fb30db7
Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens
2020-01-22 13:42:58 +01:00
vgilc
69d9051339
Merge branch 'ent-5172-metaconcola-informes-ajustes-para-agrupados' into 'develop'
...
Fixed visual bug in grouped report item
See merge request artica/pandorafms!2992
2020-01-22 12:20:05 +01:00
Daniel Maya
32b28bea0c
Added warning in update manager offline
2020-01-22 11:10:02 +01:00
Daniel Maya
428e0ffbd7
Fixed password policy
2020-01-21 17:31:21 +01:00
marcos
76ed257287
Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens
2020-01-21 15:23:26 +01:00
Daniel Barbero Martin
89e83e38e0
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
...
Conflicts:
pandora_console/include/javascript/pandora.js
2020-01-21 08:28:00 +01:00
Alejandro Campos
e7769b8bf4
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
...
# Conflicts:
# pandora_console/extras/mr/35.sql
2020-01-20 12:00:42 +01:00
Daniel Barbero Martin
536af6f33a
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-19 11:37:18 +01:00
Daniel Rodriguez
96eebe4310
Merge branch 'ent-5135-No-funciona-la-exploracion-SNMP-remota' into 'develop'
...
Added port option on server configuration to be used when connecting to execution server
See merge request artica/pandorafms!3012
2020-01-17 14:40:58 +01:00
alejandro-campos
8778553cca
Merge branch 'ent-5135-No-funciona-la-exploracion-SNMP-remota' of https://brutus.artica.es:8081/artica/pandorafms into ent-5135-No-funciona-la-exploracion-SNMP-remota
2020-01-16 17:42:45 +01:00
alejandro-campos
fb7cb57f03
added check to disable satellite servers from exec servers available in snmp wizard in case it is not a satellite agent or has remote config
2020-01-16 17:42:31 +01:00
Daniel Barbero Martin
d5e21499c2
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-16 14:08:07 +01:00
Tatiana Llorente
0980c9a74a
Ent 5261 cambio de control de intervalo en alertas
2020-01-16 13:50:39 +01:00
Marcos Alconada
5268c23c7a
Merge branch 'develop' into 'ent-4705-encriptado-de-nuevos-tokens'
...
# Conflicts:
# pandora_console/include/functions_config.php
2020-01-16 09:23:42 +01:00
Daniel Barbero Martin
4a1801bc50
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-16 08:04:18 +01:00
Daniel Maya
c68f83f013
availability failover
2020-01-15 17:16:46 +01:00
Alejandro Campos
c389769602
Merge branch 'develop' into 'ent-5135-No-funciona-la-exploracion-SNMP-remota'
...
# Conflicts:
# pandora_console/extras/mr/35.sql
2020-01-15 17:12:32 +01:00
alejandro-campos
d9062def99
Merge branch 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' of https://brutus.artica.es:8081/artica/pandorafms into ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024
2020-01-15 16:01:11 +01:00
alejandro-campos
3f26f2ef6f
fix bug when deleting custom units and changed default value for byte multiplier
2020-01-15 16:00:33 +01:00
alejandro-campos
8b6c1261a9
change order of form port input
2020-01-15 15:37:42 +01:00
alejandro-campos
5eb2953810
Added port option on server configuration to be used when connecting to execution server
2020-01-14 15:43:17 +01:00
Tatiana Llorente
95600412e1
Minor visual changes in alert list
2020-01-14 13:14:09 +01:00
Alejandro Campos
dcd2aae3c5
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
...
# Conflicts:
# pandora_console/extras/mr/35.sql
2020-01-14 10:28:55 +01:00
Daniel Barbero
ed53399c3c
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-14 09:34:31 +01:00
Daniel Maya
7204e7c0f2
Ent 4862 mas opciones en los filtros de severidad
2020-01-13 18:24:29 +01:00
Luis
db49db3711
report font not depending of custom report front enabled
2020-01-13 18:21:48 +01:00
Daniel Maya
49e03f5e44
Fixed XSS vulnerability
2020-01-13 11:29:18 +01:00
Daniel Barbero Martin
fe46a2a74e
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-13 08:07:20 +01:00
alejandro-campos
78df8dcb95
prevent user creation with leading or trailing spaces in user id
2020-01-10 13:50:04 +01:00
alejandro-campos
ec6a763aa2
add check to prevent user creation with an id with trailing spaces
2020-01-10 13:24:00 +01:00
Jose Gonzalez
4670ed922a
Added control for correct UTF8 encoding
2020-01-09 17:25:24 +01:00
Tatiana Llorente
665e9e4c98
Show gis icon only if enabled gis
2020-01-08 15:57:18 +01:00
Tatiana Llorente
f61ba42dd7
Resolve conflicts
2020-01-08 15:48:07 +01:00
Tatiana Llorente
7701ff7ad1
Resolve conflicts
2020-01-08 15:44:59 +01:00
Tatiana Llorente
eb222cc82f
Merge remote-tracking branch 'origin/develop' into ent-4788-Icono-GIS-en-Setup-desaparecido
...
Conflicts:
pandora_console/godmode/setup/setup.php
2020-01-08 15:41:45 +01:00
Daniel Barbero Martin
c4f0305f9b
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-08 08:29:59 +01:00
Alejandro Campos
0468c85a4d
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
...
# Conflicts:
# pandora_console/godmode/setup/setup_visuals.php
2020-01-07 12:00:27 +01:00
Daniel Rodriguez
eea9b0337c
Merge branch 'ent-5081-Fallo-estético-en-el-Update-manager-Offline' into 'develop'
...
Ent 5081 fallo estético en el update manager offline
See merge request artica/pandorafms!2977
2020-01-07 11:12:59 +01:00
alejandro-campos
7c952eaaa8
changes visual setup
2020-01-07 10:56:37 +01:00
vgilc
5f3889b5f6
Merge branch 'ent-4573-Cambio-en-el-switch-de-deshabilitar-agentes' into 'develop'
...
Change label for disabled status - #4573
See merge request artica/pandorafms!2693
2020-01-07 10:48:11 +01:00
vgilc
22e0a4c818
Merge branch 'ent-4620-Campo-module-inservible-en-open' into 'develop'
...
Ent 4620 campo module inservible en open
See merge request artica/pandorafms!2721
2020-01-07 10:46:13 +01:00
Daniel Rodriguez
997d1e46e5
Merge branch 'ent-4996-no-funciona-el-select-multiple-de-agente-en-el-wizard-de-consolas-visuales' into 'develop'
...
Added hint
See merge request artica/pandorafms!2904
2020-01-07 09:26:11 +01:00
Tatiana Llorente
4cd1ca38a4
Ent 5091 unificacion de tamaño de letra en informes
2020-01-07 09:25:31 +01:00
Daniel Barbero Martin
5e008e684d
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-02 17:45:52 +01:00
Alejandro Fraguas
ec950b199e
Merge branch 'ent-4488-Añadir-confirmacion-al-borrado-de-consolas-visuales' into 'develop'
...
Ent 4488 añadir confirmacion al borrado de consolas visuales
See merge request artica/pandorafms!2859
2019-12-26 13:42:28 +01:00
manuel
3f09d13941
Fixed visual bug in grouped report item
2019-12-24 10:25:32 +01:00
Alejandro Fraguas
c91290f062
Merge branch 'ent-4955-Bug-nombre-y-descripcion-items-informes' into 'develop'
...
Changed title name or description in items table of reports
See merge request artica/pandorafms!2875
2019-12-23 17:13:39 +01:00
Alejandro Fraguas
7b97855dd7
Merge branch 'ent-3607-fallos-visuales-en-la-vista-de-plugin-de-la-metaconsola' into 'develop'
...
Fixed file.png in plugin
See merge request artica/pandorafms!2725
2019-12-23 17:10:56 +01:00
Alejandro Fraguas
7f61caaa15
Merge branch 'ent-5034-Bug-al-copiar-acción-de-alerta' into 'develop'
...
Ent 5034 bug al copiar acción de alerta
See merge request artica/pandorafms!2921
2019-12-23 10:51:10 +01:00
Alejandro Fraguas
fa34170e34
Merge branch 'ent-5117-problemas-con-el-inventory-en-meta' into 'develop'
...
Fixed bug in inventory item
See merge request artica/pandorafms!2975
2019-12-23 10:23:21 +01:00
Alejandro Fraguas
69159d158d
Merge branch 'ent-1786-Rango-de-tiempo-en-container-graphs' into 'develop'
...
Ent 1786 rango de tiempo en container graphs
See merge request artica/pandorafms!2931
2019-12-23 10:18:39 +01:00
Alejandro Fraguas
c5af1823e3
Merge branch 'ent-2023-Poder-editar-la-opcion-Safe-operation-mode-mediante-Bulk-operations' into 'develop'
...
Ent 2023 poder editar la opcion safe operation mode mediante bulk operations
See merge request artica/pandorafms!2918
2019-12-23 10:18:14 +01:00
Tatiana Llorente
4aa57143e7
Fixed visual bug in update manager offline
2019-12-19 09:42:54 +01:00
marcos
b551f1a13c
update
2019-12-18 17:48:29 +01:00
manuel
9e88c1c2c2
Fixed bug in inventory item
2019-12-18 17:00:14 +01:00
marcos
91fe85e90e
updates2
2019-12-18 15:15:25 +01:00
Daniel Barbero
49ab5e95aa
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2019-12-18 07:50:08 +01:00
marcos
168dfcf32d
minnor error
2019-12-17 15:23:01 +01:00
Tatiana Llorente
eca876212c
Ent 5095 visualizacion formato de fechas
2019-12-17 12:15:51 +01:00
Daniel Barbero
d77d50bb74
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2019-12-17 08:26:04 +01:00
Daniel Rodriguez
ad9879bc1e
Merge branch 'ent-5158-Informes-SQL-en-la-meta' into 'develop'
...
Fixed item sql
See merge request artica/pandorafms!2966
2019-12-16 18:23:17 +01:00
fbsanchez
ded6dcb41a
Merge remote-tracking branch 'origin/develop' into ent-5108-ws-cookie-parser
2019-12-16 16:44:02 +01:00
Daniel Maya
8bde504fc2
Fixed item sql
2019-12-16 15:50:21 +01:00
fbsanchez
abd2213e71
Menu entry for websocket engine settings
2019-12-16 15:42:54 +01:00
Daniel Rodriguez
24838cad0f
Merge branch 'ent-4233-Modificación-en-la-función-genérica-de-render-de-fecha-hora' into 'develop'
...
Added compact mode to show timestamp - #4233
See merge request artica/pandorafms!2688
2019-12-16 11:48:09 +01:00
artica
b71752ea03
Merge remote-tracking branch 'remotes/origin/ent-5108-ws-cookie-parser' into develop
2019-12-16 11:23:06 +01:00
Tatiana Llorente
b38c396837
Change date in hover in compact mode
2019-12-13 13:40:19 +01:00
fbsanchez
a558152cb2
minor fix
2019-12-13 13:20:44 +01:00
fbsanchez
ad6ea431bf
minor fix, hide quickshell settings while disabled
2019-12-13 13:13:09 +01:00
fbsanchez
bd1954ce38
Setup Websocket engine, unified
2019-12-13 13:11:38 +01:00
Daniel Barbero
9e01cb097c
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2019-12-13 13:02:04 +01:00
Daniel Rodriguez
13ac0a6229
Merge branch 'ent-5082-setup-visual-styles-reports' into 'develop'
...
Grouped report items on styles conf. Fixed font bug
See merge request artica/pandorafms!2953
2019-12-13 11:51:56 +01:00
fbsanchez
3b5ebd0bf7
Better quickshell integration and fixes
2019-12-13 11:46:44 +01:00
Daniel Barbero
319b3e604f
Merge remote-tracking branch 'origin' into new-vc-line-element
2019-12-13 08:15:23 +01:00
Manuel Montes
a2162948b4
Fixed minor bugs in metaconsole reports
2019-12-12 18:12:42 +01:00
vgilc
0a7f24192e
Merge branch 'ent-5110-formulario-de-modulos-remotos-erroneo' into 'develop'
...
Fixed bug in module creation view
See merge request artica/pandorafms!2954
2019-12-12 17:07:35 +01:00
Daniel Rodriguez
3223e0a8e1
Merge branch 'ent-4865-8983-modulos-snmp-v3-politicas' into 'develop'
...
Fixed snmp input
See merge request artica/pandorafms!2914
2019-12-12 17:01:12 +01:00
Daniel Barbero
63dd3c48f8
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
...
Conflicts:
pandora_console/include/javascript/pandora.js
2019-12-12 16:32:32 +01:00
manuel
2504a3dc09
Fixed bug in module creation view
2019-12-12 13:50:35 +01:00
Daniel Rodriguez
ab1c6e17ca
Merge branch 'ent-4508-desajustes-y-bug-en-open' into 'develop'
...
fixed minnor error
See merge request artica/pandorafms!2929
2019-12-12 11:03:22 +01:00
Manuel Montes
7ea61b7424
Added controls on report items
2019-12-12 09:11:15 +01:00
Luis Calvo
a364af3b2d
Grouped report items on styles conf. Fixed font bug
2019-12-11 18:32:49 +01:00
vgilc
0d16bc3188
Merge branch '4605-Bug-Wizard-SNMP' into 'develop'
...
Modified type of module when use SNMP Agent Wizard
See merge request artica/pandorafms!2947
2019-12-11 16:24:29 +01:00
daniel
3dbdfdb6eb
Fix Landscape reports
2019-12-11 15:07:38 +01:00
Jose Gonzalez
62de2fe396
Modified type of module when use SNMP Agent Wizard
2019-12-10 15:37:04 +01:00
vgilc
bc1109e0ae
Merge branch 'ent-5049-crear-accion-de-alerta-solo-deja-elegir-el-grupo-all' into 'develop'
...
Fixed bugs in alert actions
See merge request artica/pandorafms!2942
2019-12-10 15:32:51 +01:00
vgilc
1e0818786b
Merge branch 'ent-4652-ajustar-posicion-del-label-el-item-imagen-estatica-de-consolas-visuales' into 'develop'
...
Adjusted margin on static image item
See merge request artica/pandorafms!2895
2019-12-10 11:56:06 +01:00
Luis
6ba4a26564
Added timeoout option to command event responses
2019-12-10 11:54:30 +01:00
vgilc
7a616018a1
Merge branch 'ent-4619-fallos-css-advanced-options-agentes-open' into 'develop'
...
fixed visual error
See merge request artica/pandorafms!2758
2019-12-10 11:48:45 +01:00
alejandro-campos
5880bec88a
changes in module data formatting when printed across the application and new setup options
2019-12-05 17:41:44 +01:00
manuel
85f4301e4c
Fixed bugs in alert actions
2019-12-05 16:43:26 +01:00
vgilc
810fe8f860
Revert "Merge branch 'ent-4968-Comandos-de-alerta-con-saltos-de-linea' into 'develop'"
...
This reverts merge request !2886
2019-12-03 15:59:08 +01:00
vgilc
809628560b
Merge branch 'ent-4968-Comandos-de-alerta-con-saltos-de-linea' into 'develop'
...
Ent 4968 comandos de alerta con saltos de linea
See merge request artica/pandorafms!2886
2019-12-03 15:53:23 +01:00
Tatiana Llorente
fecd2c74b5
Added button to refresh graph in container graphs
2019-12-03 13:00:59 +01:00
marcos
d7288114ad
fixed minnor error
2019-12-02 18:17:54 +01:00
Tatiana Llorente
0420a439d1
Send params to copy and delete action alert by post
2019-11-28 11:51:32 +01:00
Alejandro Fraguas
ed0ad76e61
Merge branch 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este' into 'develop'
...
Add new search for id source event in metaconsole
See merge request artica/pandorafms!2438
2019-11-27 10:14:35 +01:00
Tatiana Llorente
d8e1786830
Added Save Operation Mode option in agents bulk operations
2019-11-26 16:44:53 +01:00
Jose Gonzalez
d181d5357b
Created function for initialize TinyMCE
2019-11-26 13:19:28 +01:00
Daniel Maya
d89ec20c52
Fixed snmp input
2019-11-25 17:24:28 +01:00
fbsanchez
5423e78d62
Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/agentes/configurar_agente.php
pandora_console/godmode/wizards/Wizard.main.php
pandora_console/include/functions_agents.php
pandora_console/include/styles/alert.css
pandora_console/pandoradb.sql
pandora_server/lib/PandoraFMS/Recon/Base.pm
2019-11-22 15:49:07 +01:00
marcos
21bf49c218
update id_source_event
2019-11-22 13:38:08 +01:00
daniel
960326b980
Add menu omnishell
2019-11-21 18:21:46 +01:00
manuel
e4ba7ccde0
Added hint
2019-11-21 12:06:00 +01:00
fbsanchez
624a1e0086
WIP alert correlation
2019-11-20 18:17:43 +01:00
Daniel Barbero Martin
1b5dcc3e28
Fixed errors in remote command
2019-11-19 12:35:52 +01:00
manuel
fe1e7da0ed
Adjusted margin on static image item
2019-11-18 17:36:16 +01:00
fbsanchez
61eb7f0635
Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF
2019-11-18 09:55:15 +01:00
marcos
91f28384b8
changed sap icon button
2019-11-15 16:22:30 +01:00
fbsanchez
8edbb74354
discovery help link and minor fixes
2019-11-14 21:52:02 +01:00
fbsanchez
f69b86663a
Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/godmode/wizards/Wizard.main.php
2019-11-14 21:40:35 +01:00
marcos
f348310675
ADD function to get SAP agents and sap view to sap agents
2019-11-14 19:01:23 +01:00
fbsanchez
0d3817d64d
dynamic toggle in wizard input printForm
2019-11-14 17:45:45 +01:00
Tatiana Llorente
9a17a02d61
Fixed bug with line breaks in alert commands
2019-11-14 12:29:02 +01:00
Alejandro Fraguas
0199c6312a
Merge branch 'ent-4752-Herramientas-de-diagnostico' into 'develop'
...
refactoriced diagnostics pandoraFMS
See merge request artica/pandorafms!2809
2019-11-14 11:49:23 +01:00
marcos
a8b6f40ca1
change sap view menu position
2019-11-14 10:51:00 +01:00
fbsanchez
83590146b1
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
2019-11-13 17:38:24 +01:00
fbsanchez
9b1a3a9cd1
Firts_task => first_task
2019-11-13 14:58:53 +01:00
Daniel Rodriguez
f844c660af
Merge branch 'ent-4766-feedback-de-ayudas' into 'develop'
...
add feedback
See merge request artica/pandorafms!2813
2019-11-13 13:43:08 +01:00
fbsanchez
875d4430a7
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
2019-11-13 12:21:42 +01:00
fbsanchez
b11dbc639f
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
...
Conflicts:
pandora_console/general/header.php
2019-11-13 12:20:29 +01:00
Daniel Barbero Martin
7103317bc2
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
...
Conflicts:
pandora_console/general/header.php
pandora_console/include/styles/pandora.css
2019-11-13 12:12:17 +01:00
marcos
fe45afa662
Merge remote-tracking branch 'origin/develop' into ent-4226-mejoras-plugin-sap
2019-11-13 12:01:36 +01:00
Daniel Rodriguez
d4c4b3c2d8
Merge branch 'ent-4664-Bug-Automatically-combined-graph' into 'develop'
...
Ent 4664 bug automatically combined graph
See merge request artica/pandorafms!2776
2019-11-13 10:01:19 +01:00
fbsanchez
d1fbd36a97
WIP omnishell
2019-11-12 19:31:38 +01:00
Daniel Rodriguez
073ca73b2a
Merge branch 'ent-4670-Cambiar-tamaño-fuente-en-informes' into 'develop'
...
Added token in visual styles to change the font size in items of reports - #4670
See merge request artica/pandorafms!2798
2019-11-12 18:09:39 +01:00
fbsanchez
b9633933e1
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/general/header.php
2019-11-12 14:17:45 +01:00
marcos
7b06ceaafc
add sap menu
2019-11-12 10:54:36 +01:00
fbsanchez
19d06dc061
Merge remote-tracking branch 'origin/ent-EDF' into ent-4226-mejoras-plugin-sap
2019-11-12 10:19:34 +01:00
Tatiana Llorente
5ea93011d3
Changed title name or description in items table of reports
2019-11-12 09:53:10 +01:00
fbsanchez
53954ec853
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
2019-11-11 14:26:23 +01:00
fbsanchez
65f5223698
validation alerts
2019-11-11 14:26:04 +01:00
fbsanchez
0b610cd8ba
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
2019-11-11 13:39:08 +01:00
fbsanchez
430af38fa6
minor fixes in flow control
2019-11-11 13:38:27 +01:00
manuel
ea83ee1292
Fixed bug in prediction report item 4740
2019-11-08 12:06:06 +01:00
fbsanchez
d9d8cbfd35
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
2019-11-07 19:43:18 +01:00
Alejandro Fraguas
adc0f24f8e
Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into 'develop'
...
Ent 3178 integrar terminal web en la consola de pandora y explorar otras utilidades anyterm replace
See merge request artica/pandorafms!2825
2019-11-07 15:48:12 +01:00
fbsanchez
79d165b164
Merge remote-tracking branch 'origin/develop' into ent-EDF
2019-11-06 20:01:28 +01:00
Tatiana Llorente
90d567a064
Merge branch 'develop' into 'ent-4664-Bug-Automatically-combined-graph'
...
Conflicts:
pandora_console/godmode/reporting/graphs.php
2019-11-06 17:48:51 +01:00
Daniel Rodriguez
e81932cf0d
Merge branch 'ent-4809-Seleccion-de-tamaño-de-fuente-en-Agent-detail' into 'develop'
...
Fixed visual styles ticket 4809
See merge request artica/pandorafms!2867
2019-11-06 16:23:51 +01:00
Daniel Rodriguez
0647b156a5
Merge branch 'ent-4904-8870-No-se-puede-ver-usuarios-sin-permisos-AR' into 'develop'
...
fix bug in user list permission checks
See merge request artica/pandorafms!2865
2019-11-06 16:06:49 +01:00
fbsanchez
98237a8d34
Merge remote-tracking branch 'origin/develop' into ent-EDF
...
Conflicts:
pandora_console/general/header.php
2019-11-06 15:36:53 +01:00
manuel
a486738920
Fixed visual styles ticket 4809
2019-11-06 10:31:26 +01:00
alejandro-campos
4b9d6f1ae2
fix bug in user list permission checks
2019-11-05 17:18:38 +01:00
Daniel Rodriguez
dd86598298
Merge branch 'ent-4902-Querys-predefinidas-en-plantillas-de-informes-no-funcionan' into 'develop'
...
Fixed visual bug in general report item
See merge request artica/pandorafms!2854
2019-11-05 16:43:52 +01:00
fbsanchez
276fc82556
Merge branch 'ent-EDF' into ent-4226-mejoras-plugin-sap
...
Conflicts:
pandora_console/extras/mr/33.sql
2019-11-05 15:39:18 +01:00
Daniel Barbero Martin
e5f24ca884
Merge develop
2019-11-05 15:27:06 +01:00
fbsanchez
58cbc3c738
Merge remote-tracking branch 'origin/develop' into ent-EDF
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/pandoradb_data.sql
2019-11-05 15:17:09 +01:00
fbsanchez
b1d4bfe149
Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
...
Conflicts:
pandora_console/pandoradb_data.sql
2019-11-05 11:16:26 +01:00
Tatiana Llorente
c83b85c225
Ent 4801 error informes pdf csv
2019-11-04 18:41:03 +01:00
Tatiana Llorente
7c73d5f51a
Added confirmation to delete a visual console
2019-11-04 17:56:28 +01:00
Alejandro Fraguas
cf3bcefddf
Merge branch 'ent-4826-error-accesso-con-sin-acl' into 'develop'
...
Fixed planned downtime acl
See merge request artica/pandorafms!2829
2019-11-04 11:25:17 +01:00
manuel
d0c2c0d1eb
Fixed visual bug in general report item
2019-11-04 10:39:16 +01:00
fbsanchez
aa30a12f31
wizard doc minor fix
2019-10-31 21:15:18 +01:00
fbsanchez
115c884cd4
Discovery SAP
2019-10-31 21:13:18 +01:00
fbsanchez
72b1fb2b16
Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF
...
Conflicts:
pandora_console/include/javascript/pandora.js
modified: pandora_console/general/register.php
modified: pandora_console/godmode/agentes/configurar_agente.php
modified: pandora_console/godmode/agentes/module_manager_editor.php
new file: pandora_console/include/ajax/welcome_window.php
new file: pandora_console/include/class/WelcomeWindow.class.php
modified: pandora_console/include/constants.php
modified: pandora_console/include/functions_config.php
modified: pandora_console/include/javascript/pandora.js
new file: pandora_console/include/styles/new_installation_welcome_window.css
2019-10-30 16:56:44 +01:00
Daniel Barbero Martin
2bb81a839a
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/menu.php
pandora_console/pandoradb_data.sql
2019-10-29 17:15:19 +01:00
fbsanchez
c07baa614f
Merge remote-tracking branch 'origin/ent-4766-feedback-de-ayudas' into ent-EDF
2019-10-29 17:00:57 +01:00
Marcos Alconada
613e5741fb
Merge branch 'develop' into 'ent-4766-feedback-de-ayudas'
...
# Conflicts:
# pandora_console/include/functions_ui.php
2019-10-29 17:00:39 +01:00
fbsanchez
383967f68a
Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF
2019-10-29 16:56:01 +01:00
fbsanchez
0a53c0b915
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
2019-10-29 16:50:46 +01:00
Tatiana Llorente
898945d47f
Added icon for gis maps connections in tabs of setup
2019-10-29 13:26:36 +01:00
marcos
57bfc364ae
add modal confirmation window
2019-10-28 18:57:10 +01:00
fbsanchez
6d21f71617
removed trace
2019-10-28 18:38:56 +01:00
fbsanchez
7d5b845e1f
minor fixes
2019-10-28 18:37:01 +01:00
fbsanchez
e12bcb2ac4
Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
2019-10-28 12:59:02 +01:00
fbsanchez
ccf971c2eb
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
2019-10-28 12:18:19 +01:00
Daniel Barbero Martin
b54ece2b70
Add menu omnishell
2019-10-28 10:46:25 +01:00
fbsanchez
709f4cac81
WebSocket configuration, quickShell settings, quickShell proxied url compatibility
2019-10-23 19:56:48 +02:00
Daniel Barbero Martin
de22fb70e3
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
2019-10-23 19:51:49 +02:00
fbsanchez
5b3fd5dd79
Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
2019-10-22 17:34:41 +02:00
fbsanchez
eb98f695f9
Merge branch 'ent-4745-8826-cofares-han-dejado-de-llegar-las-graficas-que-nos-llegaban-en-los-correos-de-alerta-por-mail' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
2019-10-22 17:34:34 +02:00
marcos
b35c9dd96d
ajust changes
2019-10-22 16:42:13 +02:00
Luis Calvo
33d26144f1
Fixed planned downtime acl
2019-10-22 16:00:01 +02:00
manuel
bbeb750e46
Merge branch 'develop' into ent-4690-revision-completa-de-informes-templates-en-meta
...
Conflicts:
pandora_console/include/functions_graph.php
2019-10-22 15:51:38 +02:00
manuel
deb217906c
Fixed bug in templates
2019-10-22 15:41:13 +02:00
Marcos Alconada
6963ce894b
Merge branch 'develop' into 'ent-4836-menu-duplicado-en-reports-de-metaconsola'
...
# Conflicts:
# pandora_console/godmode/reporting/reporting_builder.php
2019-10-22 13:26:15 +02:00
marcos
70978f838c
fixed visual error metaconsole
2019-10-22 13:22:13 +02:00
Daniel Rodriguez
0cf3e01f74
Merge branch 'ent-1880-Umbrales-inversos-en-negativo' into 'develop'
...
Ent 1880 umbrales inversos en negativo
See merge request artica/pandorafms!2818
2019-10-22 12:56:21 +02:00
marcos
ca49cefb0d
fixed
2019-10-22 12:19:25 +02:00
marcos
ee97ed8a5e
segunda ronda
2019-10-21 18:36:02 +02:00
fbsanchez
6c52462c8c
Modular WebSocket engine, added ssh and telnet to quickshell extension
2019-10-21 17:36:26 +02:00
Daniel Rodriguez
547607c21e
Merge branch 'ent-4794-Permiso-Manage-Users-no-funciona' into 'develop'
...
Ent 4794 permiso manage users no funciona
See merge request artica/pandorafms!2804
2019-10-21 10:48:36 +02:00
marcos
353246f9f6
first changed to welcome window
2019-10-18 10:30:19 +02:00
Daniel Rodriguez
e5890b038d
Merge branch 'ent-4069-Graphs-containers-in-Custom-graphs-error' into 'develop'
...
Ent 4069 graphs containers in custom graphs error
See merge request artica/pandorafms!2787
2019-10-17 14:20:06 +02:00
Tatiana Llorente
adf3b08537
Add text (inv) in the help of the thresholds for inverse intervals - #1880
2019-10-17 11:50:50 +02:00
Daniel Rodriguez
e80ef83d66
Merge branch 'ent-4692-vodat-al-editar-un-item-de-un-custom-report-devuelve-la-pantalla-de-item-editor' into 'develop'
...
When an item is updated, it is redirected to the item lists
See merge request artica/pandorafms!2755
2019-10-17 10:13:40 +02:00
Alejandro Fraguas
039d854441
Merge branch 'ent-4784-Selector-de-intervalo-en-bulks-pule-el-conf-de-los-agentes-con-remote-dependiendo-de-la-opción-que-seleccionemos' into 'develop'
...
Ent 4784 selector de intervalo en bulks pule el conf de los agentes con remote dependiendo de la opción que seleccionemos
See merge request artica/pandorafms!2800
2019-10-16 14:16:13 +02:00
marcos
8999f408ef
redirect to list items when update item
2019-10-15 14:13:07 +02:00
marcos
a31e66a9bd
add feedback
2019-10-15 12:16:50 +02:00
Alejandro Fraguas
8407d7fe9a
Merge branch 'ent-3913-gis-data-refresh-bug' into 'develop'
...
Added current gis location to agent gis view list
See merge request artica/pandorafms!2772
2019-10-14 15:57:27 +02:00
Luis Calvo
a1c4b3eaeb
Fixed minor bug
2019-10-14 13:38:10 +02:00
Daniel Barbero
66bad65550
refactoriced diagnostics pandoraFMS
2019-10-11 14:55:20 +02:00
Jose Gonzalez
5ffa93bb25
Modified character for string fusion
2019-10-11 13:49:19 +02:00
fbsanchez
4c6d924495
Review remote execution modules
2019-10-11 12:50:29 +02:00
Tatiana Llorente
8c556d7d19
Changed permissions for management users - #4794
2019-10-11 11:47:38 +02:00
Daniel Barbero
4fedfe92fc
fix is enterprise
2019-10-11 09:39:20 +02:00
Tatiana Llorente
fc0e4827ea
No change interval if is empty in massive edit - #4784
2019-10-10 13:37:01 +02:00
Daniel Barbero Martin
7eb4d3c51c
add CMD command a network components
2019-10-10 11:55:32 +02:00
Daniel Barbero
40076b0a55
remove debug
2019-10-09 17:33:06 +02:00
Daniel Barbero
8af72c1c9d
add Remote CMD
2019-10-09 17:26:06 +02:00
Tatiana Llorente
18679f90e5
Added token in visual styles to change the font size in items of reports - #4670
2019-10-09 16:24:37 +02:00
fbsanchez
d09c071684
discovery ACL
2019-10-09 15:45:02 +02:00
manuel
93bca4673f
Fixed bugs in reports
2019-10-09 13:15:07 +02:00
Daniel Rodriguez
2eca6c7df3
Merge branch 'ent-4717-nombre-de-extensiones-erroneo-en-menu-php' into 'develop'
...
Deleted unnecessary "if" statement
See merge request artica/pandorafms!2759
2019-10-08 15:32:55 +02:00
Daniel Rodriguez
0b14cb64b6
Merge branch 'ent-4293-bug-keepcounter-policies' into 'develop'
...
Fixed module update bug
See merge request artica/pandorafms!2769
2019-10-08 14:30:49 +02:00
Luis Calvo
941362776e
Fixed keepcounters ckbox bug
2019-10-08 14:06:30 +02:00
Alejandro Fraguas
13b3099553
Merge branch 'ent-4775-Error-masivas-de-agente-sin-cambios' into 'develop'
...
added condition in agent massive edition
See merge request artica/pandorafms!2791
2019-10-08 13:11:55 +02:00
alejandro-campos
646f2607ab
added condition in agent massive edition
2019-10-07 19:02:19 +02:00
Daniel Rodriguez
375fac7f3d
Merge branch 'ent-4681-8764-Fallo-en-Vodat-a-la-hora-de-editar-módulos-de-politica' into 'develop'
...
Fixed modules_get_relations
See merge request artica/pandorafms!2751
2019-10-07 14:01:24 +02:00
Tatiana Llorente
3b85842fb2
Hidden Graph Container section from open version - #4069
2019-10-07 12:44:00 +02:00
Daniel Rodriguez
658d71568a
Merge branch 'ent-1945-eliminar-informes-tipo-itil' into 'develop'
...
the itil type is removed in the report types
See merge request artica/pandorafms!2757
2019-10-04 13:55:54 +02:00
Daniel Rodriguez
6802b32d93
Merge branch 'ent-4578-No-se-registran-los-nombres-de-los-items-text-en-reports' into 'develop'
...
Fixed visual bug in item names from report template
See merge request artica/pandorafms!2707
2019-10-03 17:35:03 +02:00
marcos.alconada
ec86380ee7
changed hint from home screen edit user
2019-10-03 14:27:10 +02:00
Alejandro Fraguas
a40592b041
Merge branch 'ent-4626-Checks-de-Custom-Graphs-desplazados' into 'develop'
...
Fixed bug in list graphs view
See merge request artica/pandorafms!2711
2019-10-03 10:37:49 +02:00
Tatiana Llorente
380ce879ef
Added io_safe_output to custom graphs name - #4664
2019-10-02 10:59:40 +02:00
Daniel Barbero Martin
5de2b8f069
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2019-09-30 08:09:08 +02:00
Luis Calvo
1eb0b27da3
Fixed module update bug
2019-09-27 16:09:11 +02:00
alejandro-campos
5e0b7fc2b7
fixed integria logo redirection in integria setup
2019-09-27 09:07:09 +02:00
Daniel Barbero
cf0ad42e2a
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2019-09-27 08:20:29 +02:00
alejandro-campos
2ec562fcc0
changed help in setup integria
2019-09-26 13:36:14 +02:00
alejandro-campos
96622933fc
added new section in integria setup to configure different options for event responses and alert created tickets
2019-09-26 13:22:10 +02:00
alejandro-campos
ad01cd0303
Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria
2019-09-26 09:48:13 +02:00
alejandro-campos
91f90d07d6
minor fixes in integria integration
2019-09-26 09:44:58 +02:00
Kike
63f4f894eb
Deleted unnecessary "if" statement
2019-09-26 09:41:08 +02:00
marcos.alconada
df7f4553c0
fixed visual error
2019-09-25 17:52:06 +02:00
Tatiana Llorente
5436df5575
Changed the word incident for ticket - #4461
2019-09-25 16:13:37 +02:00
marcos.alconada
93941f334a
the itil type is removed in the report types
2019-09-25 16:12:57 +02:00
marcos.alconada
e363b17476
When an item is updated, it is redirected to the item lists
2019-09-25 10:51:02 +02:00
Tatiana Llorente
84ae4a8391
Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria
...
Conflicts:
pandora_console/extras/mr/32.sql
2019-09-25 10:50:31 +02:00
alejandro-campos
a5ea095734
Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria
2019-09-24 15:16:22 +02:00
Daniel Barbero Martin
cd5fd4782c
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
...
Conflicts:
pandora_console/include/visual-console-client/vc.main.css
2019-09-24 13:20:25 +02:00
fbsanchez
7d52614064
Ent 4615 implementar cifrado en los contenedores de credenciales usando el sistema de cifrado interno de pandora
2019-09-24 11:25:53 +02:00
Alejandro Campos
20cebbe988
Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria'
...
# Conflicts:
# pandora_console/extras/mr/32.sql
2019-09-23 17:16:15 +02:00
Daniel Maya
4e47aede4c
Fixed modules_get_relations
2019-09-23 16:55:43 +02:00
alejandro-campos
f73cd80336
minor changes in integria integration
2019-09-23 15:16:31 +02:00
alejandro-campos
9153330832
minor changes in integria integration
2019-09-23 14:47:08 +02:00
alejandro-campos
9bf2980f01
fix minor bugs in integria integration
2019-09-23 12:48:20 +02:00
Daniel Rodriguez
409ac061e0
Merge branch 'ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email' into 'develop'
...
Ent 4047 simplificacion de la configuracion del sistema de email
See merge request artica/pandorafms!2712
2019-09-20 11:57:58 +02:00
Luis Calvo
37fd876a22
Fixed bug
2019-09-19 10:31:54 +02:00
alejandro-campos
1177cce25f
added attached files section to incident edition
2019-09-19 10:24:43 +02:00
Daniel Barbero Martin
0c59c89d8f
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2019-09-19 09:35:52 +02:00
Alejandro Fraguas
4adf584827
Merge branch 'ent-4655-nomenclatura-licencia' into 'develop'
...
Changed caption Expires
See merge request artica/pandorafms!2736
2019-09-18 16:49:55 +02:00
Daniel Rodriguez
c81cb1d222
Merge branch 'ent-3878-Report-type-summation-not-working-properly' into 'develop'
...
Ent 3878 report type summation not working properly
See merge request artica/pandorafms!2599
2019-09-18 14:41:35 +02:00
Jose Gonzalez
73a341912f
Changed caption Expires
2019-09-18 13:35:11 +02:00
alejandro-campos
f2a6dbb60e
Merge remote-tracking branch 'origin/ent-4642-Listado-de-tickets-integración-Integria' into ent-4461-Configuracion-integracion-integria
2019-09-17 14:56:54 +02:00
alejandro-campos
87f8badc18
completed integria setup and incident creation and update
2019-09-17 13:38:17 +02:00
Tatiana Llorente
027f9fd9d4
New view - List of Integria IMS tickets - #4642
2019-09-17 12:59:29 +02:00
Daniel Rodriguez
66a97f2f66
Merge branch 'ent-4508-desajustes-y-en-bug-en-open' into 'develop'
...
fixed visual error
See merge request artica/pandorafms!2669
2019-09-17 11:36:07 +02:00
Luis Calvo
0b8ff69a36
Fixed modules first load on edit agent/module item report
2019-09-16 12:57:37 +02:00
Luis Calvo
a04268b33c
Merge remote-tracking branch 'origin/develop' into ent-3878-Report-type-summation-not-working-properly
2019-09-16 11:02:18 +02:00
Luis
daa70f84db
Merge branch 'develop' into 'ent-3314-Agents/Modules-item-error-on-report'
...
# Conflicts:
# pandora_console/godmode/reporting/reporting_builder.item_editor.php
2019-09-16 10:09:52 +02:00
Tatiana Llorente
ca6fe42298
Merge remote-tracking branch 'origin/ent-4461-Configuracion-integracion-integria' into ent-4642-Listado-de-tickets-integración-Integria
2019-09-13 12:00:04 +02:00
alejandro-campos
2218ad7d60
Added email check functionality
2019-09-12 15:37:16 +02:00
Daniel Maya
482037b378
Fixed file.png in plugin
2019-09-12 15:28:32 +02:00
Tatiana Llorente
33296f448c
Hidden field module in edit agent view - #4620
2019-09-12 10:29:14 +02:00
Alejandro Fraguas
3eadb07058
Merge branch 'ent-4166-No-se-añade-module_unit-personalizado' into 'develop'
...
Fixed bug in custom unit #4166
See merge request artica/pandorafms!2675
2019-09-11 16:47:40 +02:00
alejandro-campos
4722d4a08b
changed setup option text
2019-09-10 11:38:02 +02:00
alejandro-campos
93b9c76f58
Merge branch 'develop' into ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email
2019-09-10 10:50:53 +02:00
alejandro-campos
c2e47e0ffa
Revert "ddded comment"
...
This reverts commit 4ec832f523
.
2019-09-10 10:06:33 +02:00
alejandro-campos
4ec832f523
ddded comment
2019-09-10 10:03:30 +02:00
Manuel Montes
90c94e74d9
Fixed bug in list graphs view
2019-09-09 21:02:53 +02:00
Daniel Rodriguez
d02f3621f3
Merge branch 'ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module' into 'develop'
...
Removed autofill proxi in auth server
See merge request artica/pandorafms!2361
2019-09-05 18:29:43 +02:00
marcos.alconada
9e4b5ca5c8
Merge remote-tracking branch 'origin/develop' into ent-4457-bug-visual-style-font
2019-09-05 12:03:37 +02:00
marcos.alconada
c12d672109
Add visual condition for JA and CH Lenguage
2019-09-05 12:01:25 +02:00
manuel
e4d014923b
Fixed visual bug in item names from report template
2019-09-05 10:44:18 +02:00
Daniel Rodriguez
2f0a19ae6e
Merge branch 'ent-4446-Bug-Creacion-filtro-SNMP' into 'develop'
...
Fixed bug create snmp filter - #4446
See merge request artica/pandorafms!2638
2019-09-03 17:07:27 +02:00
Daniel Rodriguez
b3b0f082d7
Merge branch 'ent-4484-Acceso-update-manager-offline-en-open' into 'develop'
...
Don't allow access to update manager offline in community edition - #4484
See merge request artica/pandorafms!2648
2019-09-03 13:37:02 +02:00
Daniel Rodriguez
81511d1ac4
Merge branch 'ent-4422-campos-vacios-al-crear-modulos-wb' into 'develop'
...
Fixed empty http_auth_user and pass
See merge request artica/pandorafms!2656
2019-09-03 12:09:04 +02:00
alejandro-campos
11cb53582c
backup changes
2019-09-02 17:01:41 +02:00
Daniel Rodriguez
20cc562911
Merge branch 'ent-3895-Pete-permisos-al-intentar-borrar-un-report-sin-seleccionar-ninguno-en-los-checkboxs' into 'develop'
...
Fixed bug in report deletions
See merge request artica/pandorafms!2362
2019-09-02 13:18:20 +02:00
Daniel Rodriguez
c47b24d84c
Merge branch 'ent-4278-Bug-ACL-al-cargar-o-gestionar-filtros-de-eventos' into 'develop'
...
Fixed bug permissions on filter events- 4278
See merge request artica/pandorafms!2671
2019-08-30 16:07:45 +02:00
Daniel Rodriguez
aa383e3f56
Merge branch 'ent-4513-bugs-en-password-policy' into 'develop'
...
fixed visual error
See merge request artica/pandorafms!2678
2019-08-30 14:35:57 +02:00
Daniel Rodriguez
ab5ad9a459
Merge branch 'ent-4519-iconos-no-alineados-en-reporting-builder' into 'develop'
...
fixed error
See merge request artica/pandorafms!2665
2019-08-30 14:12:42 +02:00
Daniel Rodriguez
85b7ee034f
Merge branch 'ent-4524-Campo-Command-en-respuestas-de-eventos' into 'develop'
...
Changed input for textarea in command field - #4524
See merge request artica/pandorafms!2676
2019-08-30 14:12:21 +02:00
Daniel Rodriguez
f292780aa2
Merge branch 'ent-4377-Fallo-al-listar-los-items-de-tipo-text-en-los-reports-de-metaconsola' into 'develop'
...
Added item type text to list of items- #4377
See merge request artica/pandorafms!2652
2019-08-30 14:11:18 +02:00
Daniel Rodriguez
cbfb8b1e89
Merge branch 'ent-4389-Error-al-mostrar-el-nombre-de-un-agente-en-la-edicion-de-un-item-de-un-report' into 'develop'
...
Show alias instead of name - #4389
See merge request artica/pandorafms!2651
2019-08-30 14:10:52 +02:00
Tatiana Llorente
a9a2ca5178
Change label for disabled status - #4573
2019-08-30 11:58:50 +02:00
marcos.alconada
d650ff6959
fixed error
2019-08-30 11:28:24 +02:00
manuel
94e377c3c3
Merge branch 'develop' into ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module
...
Conflicts:
pandora_console/godmode/agentes/configurar_agente.php
2019-08-30 09:46:27 +02:00
manuel
ce4f4f003d
Merge branch 'develop' into ent-3895-Pete-permisos-al-intentar-borrar-un-report-sin-seleccionar-ninguno-en-los-checkboxs
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
2019-08-30 09:30:11 +02:00
Tatiana Llorente
8fd1f3c99e
Added compact mode to show timestamp - #4233
2019-08-29 10:07:50 +02:00
Tatiana Llorente
d38f1f8aec
Fixed bug in unit in massive operations - #4166
2019-08-27 12:21:00 +02:00
marcos.alconada
4bdcab108f
ajuste visual en tabla user management
2019-08-27 10:32:48 +02:00
Luis Calvo
2dc084da8a
Merge remote-tracking branch 'origin/develop' into ent-4132-custom-fields-url
2019-08-27 09:11:45 +02:00
marcos.alconada
efd6a72bb8
Merge remote-tracking branch 'origin/develop' into ent-4513-bugs-en-password-policy
2019-08-26 08:09:14 +02:00
marcos.alconada
8d8e08d37b
fixed visual error
2019-08-22 15:25:35 +02:00
Tatiana Llorente
e8a873de7c
Changed input for textarea in command field - #4524
2019-08-22 11:22:40 +02:00
Alejandro Fraguas
1e5b6a8416
Merge branch 'ent-4507-bug-visual-en-version-open' into 'develop'
...
fixed visual error in Open
See merge request artica/pandorafms!2670
2019-08-22 08:43:44 +02:00
Tatiana Llorente
b444be87b4
Fixed bug in custom unit #4166
2019-08-21 14:46:58 +02:00
Tatiana Llorente
d515e510f3
Fixed bug in custom unit #4166
2019-08-21 13:38:53 +02:00
Luis Calvo
a8c351d177
Custom fields type hint BBCode updated
2019-08-21 09:55:53 +02:00
marcos.alconada
ff44666e41
fixed visual error2
2019-08-21 09:49:17 +02:00
Daniel Barbero Martin
ee1eed93b4
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2019-08-21 07:58:08 +02:00
Tatiana Llorente
32a3776260
Fixed bug permissions on filter events- 4278
2019-08-20 13:46:13 +02:00
Tatiana Llorente
38547052fb
Fixed bug permissions on filter events- 4278
2019-08-20 13:42:04 +02:00
marcos.alconada
a77a72cea5
fixed visual error on Open
2019-08-20 13:07:47 +02:00
marcos.alconada
d46e013567
fixed visual error!
...
ç2
2019-08-19 14:29:04 +02:00
marcos.alconada
44eb8dd3d1
fixed visual error
2019-08-19 12:31:47 +02:00
marcos.alconada
e83f001948
fixed error
2019-08-16 13:47:06 +02:00
Tatiana Llorente
747e06c8b0
Added margin - #4300
2019-08-12 12:54:06 +02:00
Luis Calvo
db349a4783
Fixed empty http_auth_user and pass
2019-08-12 12:26:00 +02:00
Tatiana Llorente
b893d55a49
Added item type text to list of items- #4377
2019-08-09 12:09:49 +02:00
Tatiana Llorente
8bfde74a06
Show alias instead of name - #4389
2019-08-09 11:06:17 +02:00
alejandro-campos
97353bbfed
backup changes
2019-08-08 13:36:12 +02:00
Tatiana Llorente
77f57ae87f
Don't allow access to update manager offline in community edition - #4484
2019-08-08 09:23:23 +02:00
marcos.alconada
b7009657f5
fixed visual ID agent error
2019-08-07 10:32:00 +02:00
Tatiana Llorente
c32c15ed94
Fixed bug create snmp filter - #4446
2019-08-07 09:35:08 +02:00
marcos.alconada
9cfa8be1e9
font size for jap and chinese adjusted agents
2019-08-06 14:35:15 +02:00
alejandro-campos
9b8e3c540c
created integria integration setup
2019-08-05 13:42:01 +02:00
fbsanchez
6ac21acd39
wip agent deployment scan
2019-07-25 18:35:51 +02:00
fbsanchez
8d9c4682c7
WIP Agent repository
2019-07-17 20:37:13 +02:00
fbsanchez
17dc0b82ac
Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora
2019-07-17 17:19:58 +02:00
fbsanchez
9b57ab8c13
Review minor
2019-07-17 17:17:54 +02:00
Daniel Barbero Martin
6b6d852ceb
Merge remote-tracking branch 'origin/develop' into ent-4205-gigas-proyectos-funcionamiento-incorrecto-del-wizard-snmp-con-exec-server
...
Conflicts:
pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
2019-07-17 15:06:38 +02:00
Daniel Rodriguez
c97074ea74
Merge branch 'ent-4354-Revision_completa_de_macros_de_reports' into 'develop'
...
fixed macros reports
See merge request artica/pandorafms!2595
2019-07-17 13:49:38 +02:00
Alejandro Fraguas
657515d79c
Merge branch 'ent-2140-Faltan-OIDs-SNMP-Interface-Wizard' into 'develop'
...
Added selector for all or common modules- #2140
See merge request artica/pandorafms!2540
2019-07-17 13:14:39 +02:00
Daniel Barbero Martin
7f4701f22e
exec server error wizard
2019-07-17 11:11:38 +02:00
fbsanchez
f0bfe6910d
WIP agent deployment
2019-07-16 20:56:47 +02:00
Daniel Rodriguez
4dc5ee2fca
Merge branch 'ent-4318-Añadir-buscador-en-operaciones-masivas-vol2' into 'develop'
...
Added filter by agent - #4318
See merge request artica/pandorafms!2588
2019-07-16 14:05:39 +02:00
Tatiana Llorente
0fbe7e0128
Merge branch 'develop' into 'ent-2140-Faltan-OIDs-SNMP-Interface-Wizard'
...
Conflicts:
pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
2019-07-16 11:57:36 +02:00
Daniel Rodriguez
ab7743b578
Merge branch 'ent-4307-No-se-puede-copiar-agent_name-ni-ID-de-agente-en-vista-de-agente-Firefox' into 'develop'
...
Changed disabled to readonly in agent name and id- #4307
See merge request artica/pandorafms!2578
2019-07-16 11:52:12 +02:00
Daniel Rodriguez
e69024f4e2
Merge branch 'ent-4267-edicion-text-informes' into 'develop'
...
Solved wrong variable rewriting
See merge request artica/pandorafms!2553
2019-07-16 10:10:53 +02:00
fbsanchez
3bbd01026e
WIP agent deployment
2019-07-15 19:37:04 +02:00
Alejandro Fraguas
8c55c1b287
Merge branch 'ent-4094-Error-al-cambiar-intervalo-de-agentes-por-masivas' into 'develop'
...
fixed bug: agent interval not being changed in agent config when changing its…
See merge request artica/pandorafms!2601
2019-07-15 16:56:41 +02:00
Daniel Rodriguez
81c4bd1a76
Merge branch 'ent-3333-etiquetas-a-los-items-en-el-builder-de-consolas-visuales' into 'develop'
...
Ent 3333 etiquetas a los items en el builder de consolas visuales
See merge request artica/pandorafms!2344
2019-07-15 14:12:16 +02:00
Daniel Rodriguez
5f3684fb4e
Merge branch 'ent-3786-evitar-cambio-tipo-modulo-politicas' into 'develop'
...
Modified control for module edition
See merge request artica/pandorafms!2563
2019-07-15 14:09:32 +02:00
Daniel Rodriguez
6765544b66
Merge branch 'ent-3382-comprobacion-de-grupos-secundarios-y-primarios-al-creareditar-un-agente' into 'develop'
...
Added advice when a primary group will be selected when is currentl a secondary group
See merge request artica/pandorafms!2353
2019-07-15 13:59:29 +02:00
Alejandro Fraguas
9ea7ac0859
Merge branch 'ent-4080-nombre-agente-lista-modulos' into 'develop'
...
Modified agent alias name
See merge request artica/pandorafms!2556
2019-07-15 13:02:37 +02:00
Daniel Rodriguez
ab308b7d10
Merge branch 'ent-4167-cambio-recon-task-listado-servidores' into 'develop'
...
Changed link to Discovery task list and added ui_get_full_url function over other links
See merge request artica/pandorafms!2555
2019-07-15 12:36:52 +02:00
Luis Calvo
ef9502a552
Fixed errors on sum report uncompressed checkbox
2019-07-15 11:56:57 +02:00
alejandro-campos
95254341ce
add condition to check if agent interval token should be updated in massive operations based on previous result
2019-07-15 11:53:25 +02:00
alejandro-campos
eb831dbbcd
fixed bug: agent interval not being changed in agent config when changing its value through massive operations
2019-07-15 11:46:35 +02:00
Daniel Barbero Martin
2f110b8e2e
Merge remote-tracking branch 'origin/develop' into ent-4354-Revision_completa_de_macros_de_reports
2019-07-15 11:37:02 +02:00
fbsanchez
9fb32c4699
Deployment area single targets
2019-07-12 18:29:58 +02:00
Alejandro Fraguas
bfc267691b
Merge branch 'ent-3105-comportamiento-public_url' into 'develop'
...
Ent 3105 comportamiento public url
See merge request artica/pandorafms!2568
2019-07-12 13:02:42 +02:00
Luis Calvo
a1e2693d4b
Merge remote-tracking branch 'origin/develop' into ent-3875-Report-type-summation-not-working-properly
2019-07-12 11:33:27 +02:00
Luis Calvo
41d8afaeea
added summation report uncompressed module cehckbox
2019-07-12 11:32:56 +02:00
Daniel Rodriguez
24cbe3bd8e
Merge branch 'ent-4347-Desplazamiento-de-un-cuadro-sobre-otro-en-la-configuracion-de-las-visual-styles' into 'develop'
...
Ent 4347 desplazamiento de un cuadro sobre otro en la configuracion de las visual styles
See merge request artica/pandorafms!2598
2019-07-12 10:26:05 +02:00
Daniel Barbero
ecaba5ebd3
fixed errorsr macros reports
2019-07-12 10:24:46 +02:00
fbsanchez
c386a29b80
Merge remote-tracking branch 'origin/develop' into ent-3105-comportamiento-public_url
2019-07-12 09:38:28 +02:00
fbsanchez
1e05f9a396
WIP agent deployment
2019-07-11 19:25:49 +02:00
Alejandro Fraguas
99a219aa64
Merge branch 'ent-3545-8250-7558-7882-monitorizar-servicios-de-azure' into 'develop'
...
Ent 3545 8250 7558 7882 monitorizar servicios de azure
See merge request artica/pandorafms!2591
2019-07-11 18:28:34 +02:00