9dd17acb57
fixed visual error
2021-03-26 13:40:55 +00:00
3d350ba481
fixed visual error
2021-03-26 09:32:30 +00:00
b4cc075870
resolved error with modal module detail on agent detail
2021-03-24 14:10:46 +01:00
3eb6a8b3c4
Merge branch 'ent-7125-bug-visual-en-group-view' into 'develop'
...
fixed visual error group view
See merge request artica/pandorafms!3897
2021-03-17 15:22:01 +00:00
0195a80b78
fixed visual error
2021-03-17 14:41:36 +01:00
137a2c31ad
fixed visual fails
2021-03-15 15:30:56 +01:00
5bae2be954
Merge branch 'ent-6898-Integracion-integria-en-pandora' into 'develop'
...
Ent 6898 integracion integria en pandora
See merge request artica/pandorafms!3898
2021-03-12 13:18:25 +00:00
3c5bf3eeef
Merge remote-tracking branch 'origin/develop' into temp
2021-03-12 12:34:47 +01:00
ac3587208b
fixed visual error
2021-03-12 12:10:56 +01:00
de716ddc4a
fixed visual error group view
2021-03-12 11:55:54 +01:00
5b1517f767
Merge
2021-03-12 11:07:44 +01:00
d8a628b1c4
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins
2021-03-11 14:40:23 +00:00
2422813a29
Merge branch 'ent-7085-11447-No-se-visualizan-nombres-de-modulos-en-graficas-combinadas-en-el-agente' into 'develop'
...
visual fixes in agent view graphs
See merge request artica/pandorafms!3884
2021-03-10 15:56:15 +00:00
b7bd28ba07
Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general'
...
# Conflicts:
# pandora_console/extras/delete_files/delete_files.txt
2021-03-10 10:17:27 +00:00
1846cb6471
Merge branch 'ent-6888-uniway-deshabilitar-boton-crear-una-vez-pulsado-para-evitar-duplicados' into 'develop'
...
avoid double networkmap creation
See merge request artica/pandorafms!3762
2021-03-09 16:38:51 +00:00
69e1f1fb33
Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general'
...
# Conflicts:
# pandora_console/extras/delete_files/delete_files.txt
# pandora_console/include/styles/pandora.css
2021-03-09 14:39:15 +00:00
0a8c478c47
visual fixes in agent view graphs
2021-03-08 17:48:59 +01:00
fbf26fab91
Fix styles file export_data
2021-03-04 10:29:52 +00:00
d4054f15d0
Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora'
...
# Conflicts:
# pandora_console/extras/mr/45.sql
# pandora_console/godmode/alerts/configure_alert_action.php
# pandora_server/util/pandora_db.pl
2021-03-04 10:27:07 +00:00
4fbfc14479
Merge branch 'ent-6817-Meter-spinning-Loading-en-la-visualizacion-de-graficas-de-modulos' into 'develop'
...
Fix loading charts modules and interfaces
See merge request artica/pandorafms!3700
2021-03-01 12:16:27 +00:00
f6d9997b16
Merge branch 'ent-6547-Visual-styles-cambio-de-tamaño-agente-modulo-y-descripcion' into 'develop'
...
Ent 6547 visual styles cambio de tamaño agente modulo y descripcion
See merge request artica/pandorafms!3707
2021-03-01 10:57:08 +00:00
5661f9fbdd
Merge branch 'ent-5163-error-texto-pestaña-Network-tools-agente' into 'develop'
...
Fixed
Closes pandora_enterprise#5163
See merge request artica/pandorafms!3713
2021-03-01 10:32:55 +00:00
901d12fec0
Integration with Integria
2021-02-25 13:18:04 +01:00
f92ba2ce3d
Merge branch 'ent-6503-vista-tactica-numero-alertas' into 'develop'
...
Modified query for show only available alerts
Closes pandora_enterprise#6503
See merge request artica/pandorafms!3672
2021-01-25 10:11:25 +01:00
579b8d4965
Solve issue and added correct headers
2021-01-14 19:08:01 +01:00
366d02f203
Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3
2021-01-14 09:22:06 +01:00
1fc1752b01
Solved merge
2021-01-12 13:26:48 +01:00
f89397996f
avoid double networkmap creation
2021-01-08 11:59:45 +01:00
b0f862b4c7
Merge branch 'ent-1175-copyright-actualizados' into 'develop'
...
Updated copyrights
Closes pandora_enterprise#1175
See merge request artica/pandorafms!3668
2020-12-23 17:19:46 +01:00
41730cbe58
Merge branch 'ent-6339-Monitors-View-Metaconsole' into 'develop'
...
Ent 6339 monitors view metaconsole
See merge request artica/pandorafms!3676
2020-12-23 11:46:00 +01:00
02475d25b6
Merge branch 'develop' into 'ent-1175-copyright-actualizados'
...
# Conflicts:
# pandora_console/general/header.php
# pandora_console/general/sap_view.php
2020-12-23 06:48:22 +01:00
5f0d686034
Changed Network Tools for External Tools
2020-12-18 12:31:44 +01:00
697b467a77
Merge branch 'ent-5115-Metaconsola-Vista-de-monitores' into 'develop'
...
Ent 5115 metaconsola vista de monitores
See merge request artica/pandorafms!3659
2020-12-17 16:51:57 +01:00
398cc3ac2a
Merge branch 'ent-6689-Selector-de-grupos-muy-estrecho-en-Monitors-View-metaconsola' into 'develop'
...
fix name filters
See merge request artica/pandorafms!3664
2020-12-17 16:37:31 +01:00
959fbd4764
WIP: Backup upload
2020-12-17 13:04:21 +01:00
623b729001
Merge branch 'develop' into 'ent-1175-copyright-actualizados'
...
# Conflicts:
# pandora_agents/pc/Win32/pandora_agent.conf
# pandora_agents/win32/bin/pandora_agent.conf
# pandora_console/extensions/realtime_graphs.php
# pandora_console/godmode/snmpconsole/snmp_alert.php
# pandora_console/include/functions_ui.php
# pandora_console/install.php
# pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
0e20c3d547
Fixed
2020-12-11 09:38:37 +01:00
fcf4b6c239
Fixed Agent and module text size
2020-12-10 12:06:56 +01:00
aa52ab01df
Fix loading charts modules and interfaces
2020-12-09 14:05:40 +01:00
50b1fa3c56
Changed check connection method to ajax. Check deleted from login
2020-12-03 12:27:55 +01:00
f72d924f1e
ticket 6435
2020-12-02 10:10:34 +01:00
2b52b3beef
Show data type
2020-12-01 12:29:53 +01:00
35bfd765f3
fix SNMP v3 show realtime charts
2020-11-30 14:26:49 +01:00
649442f794
Updated copyrights
2020-11-27 13:52:35 +01:00
b3437b3432
fix name filters
2020-11-27 08:24:01 +01:00
e9f8077c23
Fixed section in metaconsole
2020-11-26 12:28:12 +01:00
38c9dafa1b
Merge branch 'ent-6061-vmware-view' into 'develop'
...
Discovery task instead Recon task in some places
See merge request artica/pandorafms!3507
2020-11-17 16:38:29 +01:00
2f2556ef79
Ent 6680 ventana de perdida de conexion incorrecta
2020-11-04 16:41:25 +01:00
79db1c3236
Merge branch 'ent-6599-errores-en-filtro-de-monitor-detail' into 'develop'
...
removed strict-user from monitor detail
See merge request artica/pandorafms!3568
2020-10-30 13:28:35 +01:00
64df831302
Merge branch 'ent-6657-Se-quedan-bloqueados-zooms-en-las-graficas' into 'develop'
...
fix charts
See merge request artica/pandorafms!3581
2020-10-30 13:23:03 +01:00
4f3e09c6c3
Merge branch 'ent-6488-URL-creación-de-agentes-sin-redireccionar-se-crea-agente-con-grupo-0' into 'develop'
...
Ent 6488 url creación de agentes sin redireccionar se crea agente con grupo 0
See merge request artica/pandorafms!3541
2020-10-29 13:43:10 +01:00
98a04bfcf8
omg... what a file
2020-10-29 12:55:44 +01:00
2748f0ac29
Merge remote-tracking branch 'origin/develop' into ent-6599-errores-en-filtro-de-monitor-detail
2020-10-29 12:41:24 +01:00
9b81da193b
fix charts
2020-10-28 12:50:15 +01:00
29174a87ef
removed strict-user from monitor detail
2020-10-26 10:14:14 +01:00
def59508ae
changed behavior of all group acl check and fixed acl vulnerabilities
2020-10-22 12:00:44 +02:00
6b25ae6004
improved agent_module report (CSV)
2020-10-21 13:23:17 +02:00
42cca865ac
groups_get_children and propagate update
2020-10-21 11:38:57 +02:00
3c95d17482
Fixed new_agent
2020-10-20 16:15:42 +02:00
5ce1bd23e4
Discovery task instead Recon task in some places
2020-10-07 10:56:40 +02:00
e403c781ea
Merge branch 'ent-5822-prueba-concepto-modal-selector-de-grupos' into 'develop'
...
Group selection improvement
See merge request artica/pandorafms!3450
2020-10-05 13:11:23 +02:00
48831b5032
add new options char
2020-10-05 12:04:46 +02:00
2187f9d0c9
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
2020-10-02 14:56:07 +02:00
a5d5a45cac
add render graph to reports
2020-10-02 14:16:55 +02:00
0db539c444
fix visual windows charts
2020-10-01 15:29:54 +02:00
add9387876
fixed error on create empty network map
2020-09-30 14:42:51 +02:00
5f4893ef1a
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
2020-09-29 12:47:11 +02:00
f69166bd53
Updates style width group selector
2020-09-28 18:04:46 +02:00
d152ba2980
estado_agente prevent filter options overlapping
2020-09-28 16:11:26 +02:00
7f45a2133d
Added lost connection data in stat_win file
2020-09-21 17:40:54 +02:00
4a93f6c3a6
Fixed metaconsole SNMP interface graphs
2020-09-08 11:48:27 +02:00
37c8cb74ce
Merge branch 'ent-6123-Estado-de-los-log-source-de-agente' into 'develop'
...
Implemented log source status info box in agent view
See merge request artica/pandorafms!3379
2020-08-19 10:36:00 +02:00
29026ef3be
changed tooltip
2020-08-19 09:10:17 +02:00
50c089587d
Update estado_monitores.php
2020-08-07 08:39:58 +02:00
4edef7099b
added check to display log sources info box when log collector activated
2020-07-15 09:25:39 +02:00
909d7cba58
Implemented log source status info box in agent view
2020-07-14 17:12:38 +02:00
e2ae568ed3
change message in non initialited modules
2020-07-07 15:48:31 +02:00
2de8f2b730
minor fix
2020-05-29 13:40:43 +02:00
b3cf532c16
Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster
2020-05-29 12:30:49 +02:00
611291c217
Ent 5428 revision total de ayudas hint wiki
2020-05-29 11:37:06 +02:00
e66f33fd37
WIP Cluster references updated
2020-05-22 12:14:01 +02:00
46f1f44883
Merge branch 'ent-5574-field-description-not-in-general-search-nor-agent-detailed' into 'develop'
...
Added agent description to search and agent detail
See merge request artica/pandorafms!3130
2020-05-12 12:53:32 +02:00
58eeffd04d
clearer maps
2020-04-13 18:28:56 +02:00
333f3ba9f0
show full graph
2020-04-06 18:18:39 +02:00
6a9b55ea36
fixed minnor error
2020-04-06 14:48:26 +02:00
e575f65b6a
Added agent description to search and agent detail
2020-03-31 20:02:28 +02:00
709201bf23
dashboards
2020-03-26 12:29:38 +01:00
531e729ebe
added N/A in case last status change is not set
2020-03-25 18:01:39 +01:00
9d14c25b40
added order functionality to last status change column
2020-03-23 13:19:08 +01:00
e05c292d7d
show last status change of module
2020-03-23 12:47:58 +01:00
db3709164a
Merge branch 'develop' into ent-5214-Bug-rutas
2020-03-12 13:15:19 +01:00
04f2ebeaf1
Ent 4515 filtro de alertas en vista de agente
2020-03-12 10:47:59 +01:00
1196524581
Fixed monitor view groups without tags
2020-02-28 12:33:36 +01:00
b29e0c7966
added ui_get_full_url to paths
2020-02-28 11:38:41 +01:00
c96dd8e930
Fix selector modules only string in VC barsgraph and donutgraph
2020-02-13 09:55:49 +01:00
d05551f85a
fix characters breaking html
2020-02-03 16:17:46 +01:00
738361d237
Merge branch 'ent-4876-pandora_ui.js' into 'develop'
...
first changes pandora.js to pandora_ui.js
See merge request artica/pandorafms!2909
2020-01-20 09:54:20 +01:00
2926ead13b
Fixed group change on networkmap.ACL and source group working separated
2020-01-15 12:14:37 +01:00
c9a524b128
fixed interval counter
2020-01-10 11:12:05 +01:00
1cef8aa62f
Merge branch 'ent-4658-cross-site-seguridad-base64' into 'develop'
...
Changed the mode of obtain the title
See merge request artica/pandorafms!2743
2020-01-09 16:46:58 +01:00
fa9d60a3ef
Merge branch 'ent-5128-Metaconsola-conteo-y-paginacion' into 'develop'
...
fix pagination in meta monitor view
See merge request artica/pandorafms!2963
2020-01-07 09:46:22 +01:00
e6616374f0
Merge branch 'ent-5000-Bug-en-el-icono-de-graficas-de-Monitor-detail-con-modulos-con-tags' into 'develop'
...
fix bug when checking acl permissions with regard to secondary groups in monitor view
See merge request artica/pandorafms!2908
2020-01-07 09:41:11 +01:00
cc574cdb39
fix pagination in meta monitor view
2019-12-16 11:46:07 +01:00
888988572a
Merge branch 'develop' into 'ent-4876-pandora_ui.js'
...
# Conflicts:
# pandora_console/include/javascript/pandora.js
2019-11-27 11:39:11 +01:00
66c67ea74a
Merge branch 'ent-4226-mejoras-plugin-sap' into 'develop'
...
Ent 4226 mejoras plugin sap
See merge request artica/pandorafms!2853
2019-11-26 14:14:10 +01:00
6f8bf104b4
update sap view
2019-11-25 13:50:26 +01:00
960326b980
Add menu omnishell
2019-11-21 18:21:46 +01:00
1640c03fc3
first changes pandora.js to pandora_ui.js
2019-11-21 16:42:39 +01:00
02780aed41
fix bug when checking acl permissions with regard to secondary groups in monitor view
2019-11-21 16:36:34 +01:00
775289fc20
Merge branch 'ent-4550-ACL-acceso-denegado-detalles-agente-icono-grupo' into 'develop'
...
Changed definition of link in group icon
See merge request artica/pandorafms!2891
2019-11-21 10:21:07 +01:00
294c160622
semifinal sap sap view agent
2019-11-20 18:01:07 +01:00
93200e2af1
Changed definition of link in group icon
2019-11-18 10:51:09 +01:00
e561b1f906
omnishell multiselect
2019-11-15 13:07:23 +01:00
83590146b1
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
2019-11-13 17:38:24 +01:00
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
fe45afa662
Merge remote-tracking branch 'origin/develop' into ent-4226-mejoras-plugin-sap
2019-11-13 12:01:36 +01:00
2f0b646cd8
Merge branch 'ent-4463-Histórico-IP' into 'develop'
...
Fixed scroll in other ip addres in agent view - #4463
See merge request artica/pandorafms!2641
2019-11-12 18:10:16 +01:00
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
307eabc7b9
Merge remote-tracking branch 'origin/develop' into ent-EDF
2019-11-07 18:33:37 +01:00
90912e2636
Hide agent info when only GIS data is displayed and it is empty
2019-11-07 09:52:06 +01:00
79d165b164
Merge remote-tracking branch 'origin/develop' into ent-EDF
2019-11-06 20:01:28 +01:00
a486738920
Fixed visual styles ticket 4809
2019-11-06 10:31:26 +01:00
ccf971c2eb
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
2019-10-28 12:18:19 +01:00
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
adf3b08537
Add text (inv) in the help of the thresholds for inverse intervals - #1880
2019-10-17 11:50:50 +02:00
b6db2aa041
Merge branch 'ent-4684-migracion-de-mapas-open-y-enterprise-de-v6-a-v7' into 'develop'
...
Fixed open and enterprise network map migration
See merge request artica/pandorafms!2745
2019-10-16 19:03:24 +02:00
8af72c1c9d
add Remote CMD
2019-10-09 17:26:06 +02:00
f34d30dd39
Fixed loop on network map migration process
2019-10-02 12:38:13 +02:00
0aa73b1a60
Added current gis location to agent gis view list
2019-09-30 14:58:44 +02:00
d7ca703c99
Cleaned the javascript call
2019-09-20 10:53:09 +02:00
279b360236
Fixed open and enterprise network map migration
2019-09-20 10:13:09 +02:00
3c609b4d6d
Changed the mode of obtain the title
2019-09-19 13:17:29 +02:00
9e4b5ca5c8
Merge remote-tracking branch 'origin/develop' into ent-4457-bug-visual-style-font
2019-09-05 12:03:37 +02:00
c12d672109
Add visual condition for JA and CH Lenguage
2019-09-05 12:01:25 +02:00
66f6267495
Merge branch 'ent-4575-Problema-permisos-en-vista-de-gráficas-dentro-de-un-agente' into 'develop'
...
Change permissions to save custom graph in agent view - #4575
See merge request artica/pandorafms!2689
2019-09-03 17:08:48 +02:00
94195cf70a
Change permissions to save custom graph in agent view - #4575
2019-08-29 11:27:40 +02:00
3d68641e4e
add space in networkp map
2019-08-13 14:41:57 +02:00
4436d96717
Fixed scroll in other ip addres in agent view - #4463
2019-08-07 12:09:34 +02:00
00662058f3
Fixed agent detail events permission
2019-07-29 15:16:24 +02:00
b8f6626947
Merge branch 'ent-4201-Agent-info-campos-vacios-siguen-saliendo' into 'develop'
...
Dont show empty custom fields in agent view - #4201
See merge request artica/pandorafms!2572
2019-07-16 11:20:53 +02:00
56ddf0700e
fixed error SQL
2019-07-15 11:58:27 +02:00
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
46f55c6d65
Fixed several minor visual bugs - #4347
2019-07-12 08:59:26 +02:00
fd24398219
Fixed several minor visual bugs - #4347
2019-07-11 14:46:41 +02:00
0e3fd848f7
minor fixes and visual change in azure credentials
2019-07-04 19:34:03 +02:00
2298019e6b
Dont show empty custom fields in agent view - #4201
2019-07-03 12:41:22 +02:00
8c7acdb02e
Merge branch 'ent-3965-Ordenado-y-validado-de-alertas-disparadas' into 'develop'
...
Added sorting in last fired column - #3965
See merge request artica/pandorafms!2507
2019-07-01 15:41:04 +02:00
58483e8748
improved countdown
2019-06-26 16:23:54 +02:00
24025ebb74
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-18 17:48:03 +02:00
c3ebe88178
style review
2019-06-18 17:40:31 +02:00
bdeb456a44
Added sorting in last fired column - #3965
2019-06-14 12:54:03 +02:00
7226a45df5
improved ui_progress now accepts ajax updates
2019-06-14 10:35:10 +02:00
1780341524
Merge branch 'ent-4183-Ayudas-vacias' into 'develop'
...
Removed empty helps - #4183
See merge request artica/pandorafms!2491
2019-06-12 14:34:40 +02:00
4bb300889d
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-12 13:17:36 +02:00
80ed5dc9c1
Removed empty helps - #4183
2019-06-11 09:33:43 +02:00
23e6711f09
WIP Events
2019-06-06 17:50:47 +02:00
a4ea5e7c77
Added image for unknown and no data status - 4088
2019-06-06 14:16:09 +02:00
b14cdfb4c2
minor fix in tactical
2019-06-04 22:22:33 +02:00
2f5265fcbb
color updates
2019-06-04 14:08:07 +02:00
c741020538
styles review
2019-06-04 13:57:55 +02:00
974db824a8
style review
2019-06-03 19:13:29 +02:00
551a21ed86
Next contact fixes
2019-06-03 13:11:00 +02:00
13086b596c
Next contact
2019-06-03 13:04:49 +02:00
b4dcf4a6f1
style review
2019-06-03 11:55:56 +02:00
88b0802472
style review
2019-06-03 10:46:52 +02:00
69054571ab
Style review
2019-05-31 09:50:59 +02:00
c2346842c9
ui_toggle revierw
2019-05-29 18:13:21 +02:00
f16f35ad10
Changes styles
2019-05-29 17:49:09 +02:00
121ae89b1d
dyn style ui_print_help_tip
2019-05-29 17:34:11 +02:00
3c730fbedf
BC updated
2019-05-29 17:10:21 +02:00
47c9220cbb
clippy positions and control overflow
2019-05-29 17:02:01 +02:00
e9198af17c
multiple changes
2019-05-29 16:45:53 +02:00
f58d1bc6ee
Styling review
2019-05-29 15:14:13 +02:00
8bd4a2f8f7
Style align-top
2019-05-29 13:20:31 +02:00
3046cc5224
Style align-top
2019-05-29 13:13:24 +02:00
505229abe4
minor style change - box
2019-05-29 13:03:58 +02:00
49dee1e2bc
Next contact to seconds
2019-05-29 12:42:55 +02:00
5131c24772
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-29 12:24:28 +02:00
37af0ad612
Styles
2019-05-29 12:06:05 +02:00
c8649a8dc4
Styles
2019-05-29 11:21:57 +02:00
27963c4370
Fixed minor bug
2019-05-29 09:51:26 +02:00
22de7964c2
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-29 08:52:34 +02:00
d64e2cfb8c
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-28 18:05:33 +02:00
58a0ef1bf7
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
2019-05-28 18:03:55 +02:00
70469c4909
Event list agent view
2019-05-28 18:03:01 +02:00
e993dcc3a5
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
2019-05-28 17:37:20 +02:00
6fdd88ab65
Fixed errors on eHorus user level conf
2019-05-28 17:19:13 +02:00
445db7c43b
module list agent view
2019-05-28 16:20:24 +02:00
d68bb176cf
Merge branch 'develop' into 'ent-4102-Cambios-vista-detalle-de-evento'
...
Conflicts:
pandora_console/include/styles/pandora.css
2019-05-28 15:56:16 +02:00
c57949079b
RC1 agent view
2019-05-28 13:32:17 +02:00
348f0c2a65
agent view styling
2019-05-28 13:27:17 +02:00
5966367f8f
eHorus user level login conf added in user editor
2019-05-28 13:14:42 +02:00
2cd19aa0cb
updates styles
2019-05-28 10:47:31 +02:00
bdd7cc1317
Flex agent view
2019-05-28 09:48:09 +02:00
f57915285f
review styles agent view
2019-05-27 22:36:55 +02:00
f1499082fa
agent view rebuilt
2019-05-27 21:30:46 +02:00
5be124f315
Styles review
2019-05-27 19:00:48 +02:00
588d19102f
Resolve merge conflict
2019-05-27 18:30:24 +02:00
2fd37b531e
Visual changes in module graph - #4104
2019-05-27 17:37:57 +02:00
1eb1120c6e
Rename class events_show_more_table to table_modal_alternate - #4102
2019-05-27 16:18:10 +02:00
9eecc414dd
cps changes - switch core touched - test this commit carefully
2019-05-27 14:12:53 +02:00
ce34adb9d8
Fixed errors and corrected style
...
Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a
2019-05-13 17:28:23 +02:00
20dace7de8
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/agentes/agent_manager.php
Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
2019-05-13 16:20:12 +02:00
27096276ec
agent view user acces ehorus
...
Former-commit-id: 66739ce807d5bd5f2e46ce9fd1aa0cc72afbb4bc
2019-05-13 15:00:29 +02:00
fd83540ad5
New menu module graph for interface modules- #3617
2019-05-09 12:39:03 +02:00
cb49de4d81
New menu module graph - #3617
2019-05-08 10:28:00 +02:00
5e0b53e3c2
New menu module graph - #3617
2019-05-08 09:35:28 +02:00
283be8f632
New menu module graph - #3617
2019-05-07 16:07:07 +02:00
ac41e9255f
helpers
...
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +02:00
aa34cf17be
Fixed header missing in table alert status - #3707
...
Former-commit-id: 900b4023316d9e4946a8f81871e19f7f897a7a8f
2019-04-17 12:57:45 +02:00
2a37224653
New design for the tables - #3707
...
Former-commit-id: 3ff7435a5edbbd736d56df4c7fc02d21209c3d96
2019-04-10 10:06:27 +02:00
aa640efc44
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 43e5f9f044a351f1c6cf1c192b9f92cba6d1b0b3
2019-04-05 13:19:42 +02:00
d91631e0e1
New design for the tables - #3707
...
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
2019-04-05 13:18:38 +02:00
f497d3bd2e
Added class to action buttons and moved checkbox to the left side
...
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
2019-04-02 13:42:30 +02:00
59300bd757
Changed field for last contact to timestamp
...
Former-commit-id: 41678b6c2541a05a92bcb4631eff00e6b60d5660
2019-03-29 13:24:22 +01:00
34598f391b
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 8b576f68f26c1fe2b0d6c1f9029eac599f7a377f
2019-03-27 17:05:50 +01:00
845cb85c55
New design for tables - #3707
...
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
2019-03-27 17:03:55 +01:00
ee6ab43a8c
minor fix
...
Former-commit-id: e1a238bd34f4264e6be9c8a826cc1057578dd0a7
2019-03-26 16:54:11 +01:00
2d1463ee0c
minor fixes networkmaps
...
Former-commit-id: 85dda0470280e1f0cf142f7393f1492c61f42c6b
2019-03-26 16:46:32 +01:00
83a80b6aa2
minor fix
...
Former-commit-id: 0d68f24c418109858469dce32fb1cfd79e585775
2019-03-22 19:28:32 +01:00
26d231e78c
Improved user experience networkmaps
...
Former-commit-id: bd665ad24124b227c4aba763648e4735f61770c3
2019-03-21 20:52:01 +01:00
95d2259236
Improvements. networkmap class
...
Former-commit-id: b2e940cbb28112fe2ac9088ce2e76fd5b48239f9
2019-03-21 16:16:53 +01:00
8c8f368993
WIP: NetworkMaps rebuild
...
Former-commit-id: d3ca9d0de1b718a35bbc4aae80982b2c4705a454
2019-03-14 18:51:48 +01:00
f5b0e6b1a4
minor fix radial redirection
...
Former-commit-id: 0676ff2eb51a7ea281eb1410b1e5c4082c39d074
2019-03-13 12:55:24 +01:00
95c61024f7
Cleanup Networkmaps
...
Former-commit-id: 68893c73092e80bf4a67a0aa82c51ec242aab01f
2019-03-13 11:38:03 +01:00
750c64fbd7
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7
2019-03-13 09:52:00 +01:00
e61d409acc
fix in redirection after map creation
...
Former-commit-id: dbe1a326942df79f77d8973e8a83781778fa59b0
2019-03-12 19:23:40 +01:00
1bc326c00c
WIP: NetworkMap class
...
Former-commit-id: 888621c19262397298ac934e26e55a0b0ab218ec
2019-03-12 18:17:18 +01:00
06f8aae91a
WIP NetworkMap class
...
Former-commit-id: 575e0b5d078d01ac82ce313eda57084441fb4301
2019-03-12 16:22:28 +01:00
dbf0229ce0
Merge branch 'ent-3084-Warnings_en_PHP_7' into 'develop'
...
fixed warnings php
See merge request artica/pandorafms!2197
Former-commit-id: 486796c729a540e5ce75de80914a94dc3c1170ca
2019-03-12 13:24:48 +01:00
e55d7f0042
Merge branch '3547-7561-al-pinchar-en-un-icono-enlazado-a-un-monitor-no-aparece-en-la-busqueda-por-defecto-hasta-que-no-le-damos-a-buscar' into 'develop'
...
3547 7561 al pinchar en un icono enlazado a un monitor no aparece en la busqueda por defecto hasta que no le damos a buscar
See merge request artica/pandorafms!2192
Former-commit-id: 38c35e89b2af8f4c72b912afcbd77f4d08a3951d
2019-03-12 13:18:10 +01:00
15ca89068d
Merge remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7
...
Conflicts:
pandora_console/godmode/servers/manage_recontask_form.php
pandora_console/include/functions_events.php
Former-commit-id: 7ea5c9dcc8efe112ea64e2fcb6eef9670c9af613
2019-03-12 13:07:12 +01:00
5227390c87
se elimina linea de autosearch = false
...
Former-commit-id: aab03c4e38d41b098a8af818b45036f6524580de
2019-03-12 13:06:27 +01:00
ccb41f1b68
Fixed z_dash(zoom) in networkmap
...
Former-commit-id: 2d19cd9234717cd5066d2ddd7094d367262ed1c4
2019-03-11 16:57:54 +01:00
3e39e727b6
WIP: Unified class NetworkMapClass
...
Former-commit-id: 6e6f4afb70be008602f51dfbd383bb855613e084
2019-03-07 18:57:48 +01:00
e79e2a4fbc
Finished
...
Former-commit-id: 529f6297404b74dc41af77ae672a034530f18727
2019-03-06 17:25:36 +01:00
18ca3a191b
ticket changed
...
Former-commit-id: 532d461aa9ff0c956dbbe0dd931dc6f03d56498b
2019-03-06 16:47:56 +01:00
1f1c9de887
changes in default values in networkmap
...
Former-commit-id: 650abcc24fc19e565b9737e80e602f7188114148
2019-03-04 15:31:07 +01:00
d8ee90c285
Merge remote-tracking branch 'origin/develop' into ent-3430-discovery
...
Former-commit-id: cd7b77b0fe8fa41f03024af752b8793ae877de2b
2019-02-25 14:42:48 +01:00
7f01e47e1f
Merge branch '3281-Vista-monitor-detail-personalizar-campos-a-mostrar' into 'develop'
...
ent-3281-Vista-monitor-detail-personalizar-campos-a-mostrar
See merge request artica/pandorafms!2132
Former-commit-id: bebade5b9cd293eb6f062f5b6fb85aaad673a9b8
2019-02-25 13:48:37 +01:00
504a8e9d1a
fixed warnings php
...
Former-commit-id: d21cb02113c65a7f50a5e29f7f536e85ba5cb945
2019-02-25 13:02:39 +01:00
be7eadeb2c
extend status change functionality in monitor detail view custom fields
...
Former-commit-id: e48ae88416f50b47aac79ae28b9b4bcd08ebdf73
2019-02-25 11:32:26 +01:00
35ad2f4bb5
Validations for default values
...
Former-commit-id: a33139b817ece206a611d5f2678b62c876a8e41f
2019-02-22 11:21:38 +01:00
59159ec473
change last status change info
...
Former-commit-id: e40f4ce7f042219584f0224822ca8a112f453194
2019-02-21 17:22:00 +01:00
6ef1c3951a
Ticket Changed
...
Former-commit-id: e258f0932398d9fc58a8d097098c83b7bed084c5
2019-02-21 14:04:00 +01:00
d9e0f2ea42
Merge remote-tracking branch 'origin/develop' into 3088-Se_carga_filtro_en_vista_de_eventos_cuando_no_hay_filtro_activo
...
Former-commit-id: f0ab3426fdf23bbceed7c2cd991b37c33ec3ae2e
2019-02-21 13:26:12 +01:00
dc4d5b1bd7
fixed error in widget
...
Former-commit-id: 3b0d2e8641d35f7c339aa4229f0a7108216704e0
2019-02-21 13:21:05 +01:00
acf3c94642
fix bad solved conflict and added changes in bd to migrate and mr
...
Former-commit-id: d52e91d0f2b886620aa9fc07dda48bfeb27ffe0c
2019-02-21 13:16:32 +01:00
00cba4cbc9
Fixed bug in filtered modules by tag
...
Former-commit-id: 098d3c88a9a30fb1c38074e741f093ff40fd5d02
2019-02-19 13:05:31 +01:00
e4ca9b7fc8
Merge branch 'develop' into 3281-Vista-monitor-detail-personalizar-campos-a-mostrar
...
Former-commit-id: 1683307f273ba5676ec61709403249b24113c47f
2019-02-15 14:22:55 +01:00
Marcos Alconada
Daniel Rodriguez
alejandro.campos@artica.es
Jose Gonzalez
José González
daniel
fbsanchez
Daniel Maya
Luis
Manuel Montes
Tatiana Llorente
Kike
Alejandro Fraguas