fbsanchez
|
92ff713651
|
1st approach
|
2020-05-05 18:58:45 +02:00 |
marcos
|
2d48c67377
|
add modal on Webchat
|
2020-04-28 13:56:43 +02:00 |
|
marcos
|
bcc68c0034
|
add modal on Webchat
|
2020-04-28 13:42:27 +02:00 |
Daniel Maya
|
8ae8ac45f5
|
Ent 5690 vulnerabilidad critica inyeccion de comandos en llamada a event response
|
2020-04-15 15:50:08 +02:00 |
Alejandro Fraguas
|
254a32be22
|
Merge branch 'ent-5691-Vulnerabilidad-XSS-en-sistema-de-mensajes' into 'develop'
fix cross-site scripting vulnerability
See merge request artica/pandorafms!3156
|
2020-04-14 15:36:48 +02:00 |
alejandro-campos
|
268e317ca3
|
fix cross-site scripting vulnerability
|
2020-04-14 12:50:19 +02:00 |
|
fbsanchez
|
58eeffd04d
|
clearer maps
|
2020-04-13 18:28:56 +02:00 |
|
fbsanchez
|
72d20a6e57
|
Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps
Conflicts:
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
|
2020-04-07 12:55:27 +02:00 |
|
marcos
|
333f3ba9f0
|
show full graph
|
2020-04-06 18:18:39 +02:00 |
|
marcos
|
6a9b55ea36
|
fixed minnor error
|
2020-04-06 14:48:26 +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 |
|
alejandro-campos
|
60c766ca29
|
minor visual changes on user notifications editor
|
2020-04-02 10:37:59 +02:00 |
Luis Calvo
|
e575f65b6a
|
Added agent description to search and agent detail
|
2020-03-31 20:02:28 +02:00 |
|
fbsanchez
|
e48ef76f35
|
merge
|
2020-03-26 14:38:23 +01:00 |
daniel
|
709201bf23
|
dashboards
|
2020-03-26 12:29:38 +01:00 |
|
alejandro-campos
|
531e729ebe
|
added N/A in case last status change is not set
|
2020-03-25 18:01:39 +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 |
Tatiana Llorente
|
4777ecd4bf
|
Ent 5439 error grafica eventos de agente
|
2020-03-24 10:12:14 +01:00 |
|
alejandro-campos
|
9d14c25b40
|
added order functionality to last status change column
|
2020-03-23 13:19:08 +01:00 |
|
alejandro-campos
|
e05c292d7d
|
show last status change of module
|
2020-03-23 12:47:58 +01:00 |
|
fbsanchez
|
ce11d89953
|
Frontent changes
|
2020-03-13 14:03:50 +01:00 |
|
alejandro-campos
|
db3709164a
|
Merge branch 'develop' into ent-5214-Bug-rutas
|
2020-03-12 13:15:19 +01:00 |
|
Tatiana Llorente
|
04f2ebeaf1
|
Ent 4515 filtro de alertas en vista de agente
|
2020-03-12 10:47:59 +01:00 |
|
Luis Calvo
|
1196524581
|
Fixed monitor view groups without tags
|
2020-02-28 12:33:36 +01:00 |
|
alejandro-campos
|
b29e0c7966
|
added ui_get_full_url to paths
|
2020-02-28 11:38:41 +01:00 |
|
Luis
|
82fe47cfd9
|
Ent 5312 snmp browser enchancements
|
2020-02-27 16:31:09 +01:00 |
Daniel Rodriguez
|
4e403bca72
|
Merge branch 'ent-5436-Vulnerabilidad' into 'develop'
fix bug when saving netflow filters
See merge request artica/pandorafms!3064
|
2020-02-21 13:27:34 +01:00 |
|
alejandro-campos
|
0a1dd6fe24
|
fix save of filters
|
2020-02-21 13:01:47 +01:00 |
|
Daniel Barbero Martin
|
c96dd8e930
|
Fix selector modules only string in VC barsgraph and donutgraph
|
2020-02-13 09:55:49 +01:00 |
|
Daniel Barbero Martin
|
10972a2364
|
Fix bug icon builder view not legacy mode
|
2020-02-13 08:45:25 +01:00 |
|
Daniel Barbero Martin
|
cad6889c46
|
Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs
|
2020-02-13 07:58:06 +01:00 |
|
Daniel Maya
|
e908019d4f
|
Ent 5318 no hay opcion de pantalla completa para las consolas visuales en la meta
|
2020-02-12 17:05:29 +01:00 |
|
Daniel Barbero Martin
|
0042f390ef
|
Fixed errors VC
|
2020-02-10 17:31:48 +01:00 |
|
Daniel Barbero Martin
|
902c42b559
|
Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs
|
2020-02-05 14:05:26 +01:00 |
|
Daniel Rodriguez
|
22649e016f
|
Merge branch 'ent-5362-9464-Fallo-en-vista-de-agente-con-modulos-generic_string' into 'develop'
fix html special characters breaking html in modules search
See merge request artica/pandorafms!3046
|
2020-02-04 16:56:26 +01:00 |
|
alejandro-campos
|
a51c17b512
|
fix html special characters breaking html in modules search
|
2020-02-04 16:39:54 +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 |
|
fbsanchez
|
5da211aae0
|
ACL edit mode
|
2020-02-03 17:08:37 +01:00 |
|
alejandro-campos
|
d05551f85a
|
fix characters breaking html
|
2020-02-03 16:17:46 +01:00 |
|
Daniel Barbero Martin
|
dc6f1e3049
|
fixed errors VC
|
2020-01-29 10:56:29 +01:00 |
|
Daniel Barbero Martin
|
3f5e418d98
|
fixed errors VC
|
2020-01-28 16:42:51 +01:00 |
|
Daniel Barbero Martin
|
fe697a98ec
|
fixed errors VC
|
2020-01-23 19:54:47 +01:00 |
|
Daniel Barbero Martin
|
cd3691ecc3
|
fixed errors VC
|
2020-01-23 17:52:59 +01:00 |
|
Daniel Barbero Martin
|
3124e09c12
|
fixed errors VC
|
2020-01-23 09:20:40 +01:00 |
|
Daniel Barbero
|
203a91f065
|
fixed errors
|
2020-01-22 17:47:47 +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 |
|
Daniel Rodriguez
|
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 |
|
Daniel Barbero Martin
|
4a1801bc50
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-16 08:04:18 +01:00 |
|
Luis
|
2926ead13b
|
Fixed group change on networkmap.ACL and source group working separated
|
2020-01-15 12:14:37 +01:00 |
|
Daniel Barbero
|
ed53399c3c
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-14 09:34:31 +01:00 |
|
Tatiana Llorente
|
7c928b8100
|
Ent 4795 check seleccionar todos queda marcado
|
2020-01-14 08:37:04 +01:00 |
|
Daniel Maya
|
7204e7c0f2
|
Ent 4862 mas opciones en los filtros de severidad
|
2020-01-13 18:24:29 +01:00 |
|
Daniel Rodriguez
|
df721fc550
|
Merge branch 'ent-4602-Descuadre-Visual-console-Chrome-y-Chromium' into 'develop'
Fixed public_console height
See merge request artica/pandorafms!2950
|
2020-01-13 18:24:01 +01:00 |
|
Tatiana Llorente
|
1747806256
|
Ent 3136 no se ven los eventos en el mapa de servicios cuando haces click en los elementos de un servicio creado en la meta
|
2020-01-13 18:19:50 +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 |
|
Daniel Maya
|
c9a524b128
|
fixed interval counter
|
2020-01-10 11:12:05 +01:00 |
|
Daniel Barbero Martin
|
14e4e37c2a
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-10 08:09:13 +01:00 |
|
Daniel Barbero
|
7e4cb02ceb
|
fixed styles and more
|
2020-01-09 18:05:21 +01:00 |
|
Daniel Rodriguez
|
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 |
|
Daniel Barbero Martin
|
c4f0305f9b
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-08 08:29:59 +01:00 |
|
Daniel Rodriguez
|
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 |
|
Daniel Rodriguez
|
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 |
|
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
|
45c57abb70
|
Merge branch 'ent-4883-Mensaje-erroneo-WebChat' into 'develop'
Ent 4883 mensaje erroneo web chat
See merge request artica/pandorafms!2856
|
2019-12-23 17:45:25 +01:00 |
|
Alejandro Fraguas
|
7061ab81b6
|
Merge branch 'ent-4911-Informacion-mostrada-en-mapa-GIS-the-Satellite-Server' into 'develop'
Ent 4911 informacion mostrada en mapa gis the satellite server
See merge request artica/pandorafms!2876
|
2019-12-23 10:24:10 +01:00 |
|
alejandro-campos
|
cc574cdb39
|
fix pagination in meta monitor view
|
2019-12-16 11:46:07 +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 |
|
Daniel Maya
|
b2b2cdbede
|
Fixed public_console height
|
2019-12-11 12:05:57 +01:00 |
|
Alejandro Fraguas
|
9a21710cd5
|
Merge branch 'ent-5054-Vista-de-Netflow-live-view-descojonada' into 'develop'
Ent 5054 vista de netflow live view descojonada
See merge request artica/pandorafms!2928
|
2019-12-11 11:37:02 +01:00 |
|
Tatiana Llorente
|
9d3426c0e9
|
Ent 4897 filtro erroneo de eventos al clickar en grafica events 24h de agente 2
|
2019-12-10 15:29:35 +01:00 |
vgilc
|
f4372bb766
|
Merge branch 'ent-4917-Pete-SQL-al-añadir-un-dia-especial-a-la-lista-de-dias-especiales' into 'develop'
Ent 4917 pete sql al añadir un dia especial a la lista de dias especiales
See merge request artica/pandorafms!2861
|
2019-12-10 11:43:46 +01:00 |
|
vgilc
|
776c683ac9
|
Merge branch 'ent-4922-Filtros-del-visor-de-traps-actualizan-solos' into 'develop'
Ent 4922 filtros del visor de traps actualizan solos
See merge request artica/pandorafms!2879
|
2019-12-10 11:43:07 +01:00 |
|
Tatiana Llorente
|
2d62955020
|
Changed filters styles in netflow live view
|
2019-12-02 16:11:17 +01:00 |
|
Marcos Alconada
|
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 |
|
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 |
|
Daniel Rodriguez
|
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 |
|
marcos
|
0490024abc
|
add sap view to autorefresh edit my user
|
2019-11-25 15:01:27 +01:00 |
|
marcos
|
6f8bf104b4
|
update sap view
|
2019-11-25 13:50:26 +01:00 |
|
marcos
|
21bf49c218
|
update id_source_event
|
2019-11-22 13:38:08 +01:00 |
|
marcos
|
ab1a64a2e6
|
Merge remote-tracking branch 'origin/develop' into ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este
|
2019-11-22 10:56:36 +01:00 |
|
daniel
|
960326b980
|
Add menu omnishell
|
2019-11-21 18:21:46 +01:00 |
|
marcos
|
1640c03fc3
|
first changes pandora.js to pandora_ui.js
|
2019-11-21 16:42:39 +01:00 |
|
alejandro-campos
|
02780aed41
|
fix bug when checking acl permissions with regard to secondary groups in monitor view
|
2019-11-21 16:36:34 +01:00 |
|
Daniel Rodriguez
|
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 |
|
Marcos Alconada
|
34cdcdfd6e
|
Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este'
# Conflicts:
# pandora_console/extras/mr/29.sql
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
# pandora_console/include/functions_events.php
|
2019-11-21 10:13:00 +01:00 |
|
marcos
|
294c160622
|
semifinal sap sap view agent
|
2019-11-20 18:01:07 +01:00 |
Jose Gonzalez
|
93200e2af1
|
Changed definition of link in group icon
|
2019-11-18 10:51:09 +01:00 |
|
fbsanchez
|
9440570548
|
Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF
|
2019-11-15 13:08:09 +01:00 |
|
fbsanchez
|
e561b1f906
|
omnishell multiselect
|
2019-11-15 13:07:23 +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 |
|
fbsanchez
|
14128590d6
|
Minor corrections&fixes
|
2019-11-14 17:05:01 +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 |
|
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 |
|
marcos
|
fe45afa662
|
Merge remote-tracking branch 'origin/develop' into ent-4226-mejoras-plugin-sap
|
2019-11-13 12:01:36 +01:00 |
|
Daniel Rodriguez
|
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 |
|
Tatiana Llorente
|
50be60409e
|
Dont refresh the page when filter is changed in traps view
|
2019-11-12 15:58:36 +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 |
|
Tatiana Llorente
|
c652f758f4
|
Changed label agent version for agents with satellite os
|
2019-11-12 13:06:59 +01:00 |
|
fbsanchez
|
307eabc7b9
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-07 18:33:37 +01:00 |
|
Tatiana Llorente
|
90912e2636
|
Hide agent info when only GIS data is displayed and it is empty
|
2019-11-07 09:52:06 +01:00 |
|
fbsanchez
|
79d165b164
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
|
2019-11-06 20:01:28 +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 |
|
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 |
|
Daniel Rodriguez
|
137571f2d1
|
Merge branch 'ent-4856-8969-Filtro-user-ack-evento-no-funciona-del-todo-bien' into 'develop'
user ack filter in event list not displaying users with all group
See merge request artica/pandorafms!2860
|
2019-11-06 14:45:09 +01:00 |
|
Daniel Rodriguez
|
d460429509
|
Merge branch 'ent-4898-No-funciona-filtro-de-eventos-cuando-el-idioma-del-usuario-está-en-catalán' into 'develop'
Fixed agent name and error lenght
See merge request artica/pandorafms!2845
|
2019-11-06 13:14:06 +01:00 |
|
alejandro-campos
|
e9b516c399
|
change access permission to users in user ack filter in event list
|
2019-11-06 12:56:42 +01:00 |
manuel
|
a486738920
|
Fixed visual styles ticket 4809
|
2019-11-06 10:31:26 +01:00 |
|
Daniel Rodriguez
|
0f2d30698c
|
Merge branch 'ent-4872-Cambiar-titulo-a-archivo-XML-de-los-templates-de-reports' into 'develop'
Ent 4872 cambiar titulo a archivo xml de los templates de reports
See merge request artica/pandorafms!2862
|
2019-11-05 17:03:53 +01:00 |
|
Daniel Rodriguez
|
0e628a365d
|
Merge branch 'ent-4625-Cambiar-titulo-a-archivo-CSV-de-la-vista-de-eventos' into 'develop'
Ent 4625 cambiar titulo a archivo csv de la vista de eventos
See merge request artica/pandorafms!2783
|
2019-11-05 16:57:23 +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 |
|
Tatiana Llorente
|
945383b8ec
|
Changed name of xml report
|
2019-11-05 12:43:08 +01:00 |
|
Tatiana Llorente
|
32f4ad2c4f
|
Changed name of variable filter in menu
|
2019-11-05 11:20:57 +01:00 |
|
alejandro-campos
|
9fc635a7a9
|
user ack filter in event list not displaying users with all group
|
2019-11-05 11:03:28 +01:00 |
|
Tatiana Llorente
|
e94d8726c7
|
Changed date in webchat
|
2019-11-04 13:59:30 +01:00 |
|
Daniel Maya
|
8573add0b3
|
Fixed agent name and error lenght
|
2019-10-30 13:01:59 +01:00 |
|
alejandro-campos
|
14230d218a
|
fix bug in snmp console filter
|
2019-10-29 16:14:33 +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 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 |
|
Daniel Rodriguez
|
13898da4c1
|
Merge branch 'ent-4733-no-funciona-buscador-general-de-politicas' into 'develop'
fixed minor error
See merge request artica/pandorafms!2777
|
2019-10-18 11:42:30 +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 |
|
Tatiana Llorente
|
5264de2008
|
Merge branch 'develop' into 'ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos'
Conflicts:
pandora_console/operation/events/events.php
|
2019-10-17 09:27:00 +02:00 |
|
Daniel Rodriguez
|
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 |
|
Alejandro Fraguas
|
ca5a31db6a
|
Merge branch 'ent-3830-autorrefresh-en-mapas-gis' into 'develop'
add gis maps to autorefresh list
See merge request artica/pandorafms!2731
|
2019-10-15 13:21:19 +02:00 |
|
Alejandro Fraguas
|
78610b127c
|
Merge branch 'ent-4682-Comentarios-en-eventos-no-se-ven-en-metaconsola' into 'develop'
Ent 4682 comentarios en eventos no se ven en metaconsola
See merge request artica/pandorafms!2775
|
2019-10-15 11:42:00 +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 |
|
Daniel Barbero
|
8af72c1c9d
|
add Remote CMD
|
2019-10-09 17:26:06 +02:00 |
|
Tatiana Llorente
|
d2dc6ba9c1
|
Merge remote-tracking branch 'origin/develop' into ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos
Conflicts:
pandora_console/operation/events/events.php
|
2019-10-08 09:14:08 +02:00 |
|
Tatiana Llorente
|
8a85edac93
|
Merge remote-tracking branch 'origin/develop' into ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos
|
2019-10-08 08:59:39 +02:00 |
|
Daniel Rodriguez
|
d198cc3297
|
Merge branch 'ent-4567-Habilitar-borrado-masivo-de-traps-con-permisos-AW' into 'develop'
Changed permissions to delete traps to IM - #4567
See merge request artica/pandorafms!2690
|
2019-10-07 17:08:32 +02:00 |
|
Daniel Rodriguez
|
debbbdc4e5
|
Merge branch 'ent-4726-truncado-eventos-texto-muy-largo' into 'develop'
Improved truncate system and solved issue
See merge request artica/pandorafms!2774
|
2019-10-07 13:49:57 +02:00 |
|
Tatiana Llorente
|
305d74878c
|
Changed title of csv in events - #4625
|
2019-10-04 11:51:30 +02:00 |
Kike
|
b25c9ca793
|
Merge remote-tracking branch 'origin/develop' into 4689-mostrar-instrucciones-en-la-vista-de-eventos
Conflicts:
pandora_console/include/functions_events.php
|
2019-10-03 15:59:15 +02:00 |
|
marcos.alconada
|
6f14aa3d2a
|
Merge remote-tracking branch 'origin/develop' into ent-4583-hint-mal-construido-en-editar-usuario-home-screen
|
2019-10-03 14:17:23 +02:00 |
|
fbsanchez
|
e25d83b836
|
more comprehensible vc form display flow
|
2019-10-03 11:05:21 +02:00 |
|
fbsanchez
|
722ba58085
|
more comprehensible vc form display flow
|
2019-10-03 11:04:13 +02:00 |
|
fbsanchez
|
79dca2fe6b
|
Php OO form load
|
2019-10-02 18:37:50 +02:00 |
|
Kike
|
f34d30dd39
|
Fixed loop on network map migration process
|
2019-10-02 12:38:13 +02:00 |
|
Daniel Barbero Martin
|
c5022fc243
|
continue VC
|
2019-10-02 12:28:17 +02:00 |
|
marcos.alconada
|
d539b935bc
|
fixed minor error
|
2019-10-02 11:27:52 +02:00 |
|
marcos.alconada
|
a44e1feeb4
|
fixed error comments events
|
2019-10-01 16:24:02 +02:00 |
|
Jose Gonzalez
|
f55b2ce80f
|
Improved truncate system and solved issue
|
2019-10-01 11:22:25 +02:00 |
|
Luis Calvo
|
0aa73b1a60
|
Added current gis location to agent gis view list
|
2019-09-30 14:58:44 +02:00 |
|
Tatiana Llorente
|
9875b7c701
|
Added link to go to agent view (node) from metaconsole in events view - #4720
|
2019-09-30 13:31:15 +02:00 |
|
Daniel Barbero
|
d35a5d4f71
|
continue VC form create items
|
2019-09-27 15:44:39 +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
|
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
|
0fdf3874d4
|
Add ACL in integria ticket dashboard
|
2019-09-26 11:05:27 +02:00 |
|
alejandro-campos
|
93b176269c
|
remove acl check in integria ticket dashboard
|
2019-09-26 10:38:12 +02:00 |
|
alejandro-campos
|
ca184faaa0
|
minor visual fix in integria ticket creation
|
2019-09-26 10:10:55 +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 |
|
Tatiana Llorente
|
5436df5575
|
Changed the word incident for ticket - #4461
|
2019-09-25 16:13:37 +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 |
|
Kike
|
4ae14e0888
|
Fixed issue with instructions in events view
|
2019-09-24 15:14:17 +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 |
|
Daniel Barbero Martin
|
50c37e56c9
|
continue VC
|
2019-09-23 19:16:36 +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 |
|
alejandro-campos
|
b8e1caba9d
|
minor fixes
|
2019-09-23 16:59:16 +02:00 |
|
manuel
|
b7ff7bc121
|
Fixed bug in report items
|
2019-09-23 15:27:06 +02:00 |
|
alejandro-campos
|
8d2820df37
|
Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria
|
2019-09-23 15:17:22 +02:00 |
|
alejandro-campos
|
f73cd80336
|
minor changes in integria integration
|
2019-09-23 15:16:31 +02:00 |
|
Tatiana Llorente
|
59eed5f1af
|
Minor fixes - #4644
|
2019-09-23 15:09:52 +02:00 |
|
alejandro-campos
|
637700422e
|
Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria
|
2019-09-23 14:47:23 +02:00 |
|
alejandro-campos
|
9153330832
|
minor changes in integria integration
|
2019-09-23 14:47:08 +02:00 |
|
Tatiana Llorente
|
51a1d7c0b7
|
Merge branch 'ent-4461-Configuracion-integracion-integria' of brutus.artica.lan:artica/pandorafms into ent-4461-Configuracion-integracion-integria
|
2019-09-23 13:18:08 +02:00 |
|
Tatiana Llorente
|
f9a903319c
|
Adding tabs and new functions - #4644
|
2019-09-23 13:14:20 +02:00 |
|
alejandro-campos
|
9bf2980f01
|
fix minor bugs in integria integration
|
2019-09-23 12:48:20 +02:00 |
|
alejandro-campos
|
be3de8dcfb
|
Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria
|
2019-09-20 12:45:22 +02:00 |
|
alejandro-campos
|
0df2447770
|
added comment management and fixed some errors in incident edition
|
2019-09-20 12:37:47 +02:00 |
|
Tatiana Llorente
|
375bfca6ff
|
New view - Dashboard details of Integria IMS tickets - #4644
|
2019-09-20 12:27:36 +02:00 |
|
Jose Gonzalez
|
aa345b168d
|
Upload of forgot file
|
2019-09-20 11:04:12 +02:00 |
|
Jose Gonzalez
|
d7ca703c99
|
Cleaned the javascript call
|
2019-09-20 10:53:09 +02:00 |
|
Kike
|
279b360236
|
Fixed open and enterprise network map migration
|
2019-09-20 10:13:09 +02:00 |
|
Jose Gonzalez
|
3c609b4d6d
|
Changed the mode of obtain the title
|
2019-09-19 13:17:29 +02:00 |
|
alejandro-campos
|
e09db0b9a9
|
Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria
|
2019-09-19 10:24:58 +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 |
|
Tatiana Llorente
|
8acdde9f3a
|
Added date filter - #4642
|
2019-09-18 18:19:29 +02:00 |
|
Tatiana Llorente
|
eb271a93eb
|
Added button for export to csv - #4642
|
2019-09-18 15:32:36 +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 |
|
Luis Calvo
|
0c60f13ccd
|
Event column instructions maked unsortabe
|
2019-09-17 19:54:34 +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
|
326b053f23
|
New view - List of Integria IMS tickets - #4642
|
2019-09-17 13:03:36 +02:00 |
|
Tatiana Llorente
|
027f9fd9d4
|
New view - List of Integria IMS tickets - #4642
|
2019-09-17 12:59:29 +02:00 |
|
marcos.alconada
|
53850a8c1f
|
add gis maps to autorefresh list
|
2019-09-16 15:51:04 +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 |
|
Daniel Maya
|
a4a84c154f
|
Fixed refresh
|
2019-09-13 12:04:30 +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 |
|
Tatiana Llorente
|
770ac250d8
|
Merge branch 'develop' into 'ent-4567-Habilitar-borrado-masivo-de-traps-con-permisos-AW'
Conflicts:
pandora_console/operation/snmpconsole/snmp_view.php
|
2019-09-11 18:17:39 +02:00 |
|
Daniel Rodriguez
|
566b7ec7bd
|
Merge branch 'ent-3898-name-alias-statistics-SNMP' into 'develop'
Changed name for alias when identify an agent in SNMP statistics
See merge request artica/pandorafms!2698
|
2019-09-06 12:51:19 +02:00 |
|
Daniel Rodriguez
|
64fc679d89
|
Merge branch 'ent-4599-no-se-muestran-items-vista-de-consola-visual-de-meta' into 'develop'
Fixed some errors in visual console
See merge request artica/pandorafms!2708
|
2019-09-05 15:27:41 +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 |
|
Daniel Maya
|
86cf025317
|
Fixed some errors in visual console
|
2019-09-05 11:58:15 +02:00 |
|
Daniel Rodriguez
|
c0a0364164
|
Merge branch 'ent-4608-Bug-en-el-visor-de-eventos-cuando-el-lenguaje-esta-en-español' into 'develop'
fix bug in events advanced filter: default option other than All
See merge request artica/pandorafms!2706
|
2019-09-05 11:39:45 +02:00 |
|
alejandro-campos
|
42fad5acb1
|
fix bug in events advanced filter: default option other than All
|
2019-09-05 10:37:12 +02:00 |
|
marcos.alconada
|
2538504036
|
chaged hint from home screen
|
2019-09-04 16:05:10 +02:00 |
|
Daniel Rodriguez
|
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 |
|
Jose Gonzalez
|
b60b41878c
|
Changed name for alias when identify an agent in SNMP statistics
|
2019-09-03 11:14:33 +02:00 |
|
alejandro-campos
|
11cb53582c
|
backup changes
|
2019-09-02 17:01:41 +02:00 |
|
Daniel Rodriguez
|
71a6394967
|
Merge branch 'ent-4357-fallo-visual-en-el-menu-topology-maps' into 'develop'
add space in networkp map
See merge request artica/pandorafms!2661
|
2019-08-30 14:22:39 +02:00 |
|
Daniel Rodriguez
|
258a2f41ce
|
Merge branch 'ent-4363-Marquesinas-ilegibles-desde-Firefox' into 'develop'
Reduced the speed of events marquee - #4363
See merge request artica/pandorafms!2653
|
2019-08-30 14:19:47 +02:00 |
|
Daniel Rodriguez
|
191161dbfc
|
Merge branch '4474-Paginacion-SNMP-se-pierde-al-actualizar-Intracom' into 'develop'
Fixed pagination bug
See merge request artica/pandorafms!2637
|
2019-08-30 14:13:29 +02:00 |
|
manuel
|
b6870178c9
|
Fixed minor error
|
2019-08-29 15:21:39 +02:00 |
|
Tatiana Llorente
|
a9e02bbb41
|
Changed permissions to delete traps to IM - #4567
|
2019-08-29 12:40:13 +02:00 |
|
Tatiana Llorente
|
94195cf70a
|
Change permissions to save custom graph in agent view - #4575
|
2019-08-29 11:27:40 +02:00 |
|
manuel
|
3901a1abb6
|
Fixed bug in metaconsole filter events
|
2019-08-27 15:46:22 +02:00 |
|
Daniel Barbero Martin
|
31da17db03
|
fixed event view metaconsole
|
2019-08-22 14:27:45 +02:00 |
|
Alejandro Fraguas
|
38d6a587fd
|
Merge branch 'ent-4504-contador-de-graficas-encontradas-no-funciona' into 'develop'
fixed error
See merge request artica/pandorafms!2663
|
2019-08-22 10:12:57 +02:00 |
|
Alejandro Fraguas
|
d42bcd17c2
|
Merge branch 'ent-4366-fallos-visuales-en-el-log-de-pandora' into 'develop'
fixed visual error
See merge request artica/pandorafms!2666
|
2019-08-21 12:17:53 +02:00 |
|
Alejandro Fraguas
|
73a421db14
|
Merge branch 'ent-4502-busqueda-global' into 'develop'
fixed security warning
See merge request artica/pandorafms!2664
|
2019-08-21 11:26:27 +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
|
d85e4caa99
|
Fixed bug in autorefresh in events view with fullscreen - #4522
|
2019-08-19 11:36:13 +02:00 |
|
Tatiana Llorente
|
7eeafaf351
|
Fixed bug in autorefresh in events view with fullscreen - #4522
|
2019-08-19 11:32:40 +02:00 |
|
marcos.alconada
|
0414b4033e
|
fixed visual error
|
2019-08-19 10:05:06 +02:00 |
|
marcos.alconada
|
323c877890
|
fixed security warning
|
2019-08-16 11:25:08 +02:00 |
|
marcos.alconada
|
e89193ca0f
|
fixed error
|
2019-08-16 10:43:56 +02:00 |
|
marcos.alconada
|
3d68641e4e
|
add space in networkp map
|
2019-08-13 14:41:57 +02:00 |
|
Tatiana Llorente
|
2bc57b9561
|
Reduced the speed of events marquee - #4363
|
2019-08-09 12:50:07 +02:00 |
|
Daniel Rodriguez
|
a1bac9d851
|
Merge branch '4439-bugs-vista-eventos' into 'develop'
Added text control to avoid show more of 255 chars in his field
See merge request artica/pandorafms!2619
|
2019-08-09 09:01:18 +02:00 |
|
alejandro-campos
|
97353bbfed
|
backup changes
|
2019-08-08 13:36:12 +02:00 |
|
Jose Gonzalez
|
191db192c9
|
Solved issue with metaconsole
|
2019-08-07 14:14:14 +02:00 |
|
Tatiana Llorente
|
4436d96717
|
Fixed scroll in other ip addres in agent view - #4463
|
2019-08-07 12:09:34 +02:00 |
|
manuel
|
324690ddad
|
Fixed pagination bug
|
2019-08-06 14:52:43 +02:00 |
|
Jose Gonzalez
|
6ca2caa511
|
Added hint and solved other issues when events has a lot of characters
|
2019-08-06 11:06:11 +02:00 |
|
alejandro-campos
|
b43c489b1a
|
Merge branch 'ent-4388-Nuevos-eventos' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4388-Nuevos-eventos
|
2019-08-05 16:24:00 +02:00 |
|
alejandro-campos
|
225491feb1
|
fix minor visual bug in event list
|
2019-08-05 16:23:37 +02:00 |
|
Alejandro Campos
|
12eacc1933
|
Merge branch 'develop' into 'ent-4388-Nuevos-eventos'
# Conflicts:
# pandora_console/extras/mr/31.sql
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2019-08-05 09:26:18 +02:00 |
|
alejandro-campos
|
41029196d8
|
fix minor visual bug in events table
|
2019-08-02 10:04:10 +02:00 |
Alejandro Gallardo Escobar
|
a56a26b3d5
|
Merge branch 'new-vc-line-element' of https://brutus.artica.lan:8081/artica/pandorafms into new-vc-line-element
|
2019-07-31 15:15:57 +02:00 |
|
Alejandro Gallardo Escobar
|
542d4a94bd
|
Added SVG FontAwesome icons to the visual console client
|
2019-07-31 15:15:33 +02:00 |
|
Daniel Maya
|
2030c0beee
|
added copy an item
|
2019-07-31 13:23:25 +02:00 |
|
alejandro-campos
|
b4bd7f0f63
|
fixed problems in event view and event view custom fields
|
2019-07-30 16:10:34 +02:00 |
|
Daniel Maya
|
8845fc9330
|
item deletion improvements
|
2019-07-30 11:20:03 +02:00 |
|
Luis Calvo
|
00662058f3
|
Fixed agent detail events permission
|
2019-07-29 15:16:24 +02:00 |
|
Jose Gonzalez
|
243c298ff8
|
Added text control to avoid show more of 255 chars in his field
|
2019-07-29 08:59:56 +02:00 |
|
Daniel Maya
|
f7ab47e637
|
Fixed delete item
|
2019-07-26 14:17:14 +02:00 |
|
Daniel Maya
|
5067462620
|
Added remove item
|
2019-07-25 17:58:37 +02:00 |
|
Daniel Rodriguez
|
f08b5204c7
|
Merge branch 'ent-3673-bug-webchat-consola' into 'develop'
Modified jquery window function
See merge request artica/pandorafms!2550
|
2019-07-18 12:50:56 +02:00 |
|
Daniel Rodriguez
|
bfb4cb19a0
|
Merge branch 'ent-4330-Bug-con-autorefresh-en-eventos' into 'develop'
Added feature to autorefresh in events view with datatables - #4330
See merge request artica/pandorafms!2605
|
2019-07-18 12:22:44 +02:00 |
|
Luis Calvo
|
53c239f558
|
fixed minor errors
|
2019-07-17 10:34:56 +02:00 |
|
Jose Gonzalez
|
b7c662d3f9
|
Added session control for unexpected or forced logouts
|
2019-07-16 17:55:44 +02:00 |
|
Daniel Rodriguez
|
c80561f595
|
Merge branch 'ent-4338-No_funcionan_las_alertas_sonoras' into 'develop'
fixed events sound
See merge request artica/pandorafms!2603
|
2019-07-16 11:57:59 +02:00 |
|
Daniel Rodriguez
|
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 |
|
Daniel Barbero Martin
|
397ee95849
|
fixed minor error sound events
|
2019-07-16 10:16:25 +02:00 |
|
Tatiana Llorente
|
7d119bfe5a
|
Added feature to autorefresh in events view with datatables - #4330
|
2019-07-15 17:41:20 +02:00 |
|
Daniel Barbero Martin
|
45e1c32473
|
fixed events sound
|
2019-07-15 15:31:01 +02:00 |
|
Daniel Barbero Martin
|
56ddf0700e
|
fixed error SQL
|
2019-07-15 11:58:27 +02:00 |
|
Luis Calvo
|
ef9502a552
|
Fixed errors on sum report uncompressed checkbox
|
2019-07-15 11:56:57 +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 |
|
Tatiana Llorente
|
46f55c6d65
|
Fixed several minor visual bugs - #4347
|
2019-07-12 08:59:26 +02:00 |
|
Daniel Rodriguez
|
f3060dd428
|
Merge branch 'ent-4099-8092-busqueda-general-politicas' into 'develop'
Ent 4099 8092 busqueda general politicas
See merge request artica/pandorafms!2479
|
2019-07-11 18:40:48 +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 |
|
marcos.alconada
|
055bafe4d7
|
changed UM to AW for search policies
|
2019-07-11 17:28:22 +02:00 |
|
marcos.alconada
|
1dbf8240c4
|
deelted duplicated count
|
2019-07-11 15:51:35 +02:00 |
|
Daniel Rodriguez
|
cdf7c84b81
|
Merge branch 'ent-4302-Opcion_para_deshabilitar_aviso_de_suscripcion_a_newsletter' into 'develop'
new tocken user edit newslatter info
See merge request artica/pandorafms!2589
|
2019-07-11 15:36:56 +02:00 |
|
Tatiana Llorente
|
fd24398219
|
Fixed several minor visual bugs - #4347
|
2019-07-11 14:46:41 +02:00 |
|
Daniel Barbero Martin
|
bd070b706b
|
fixed minor error
|
2019-07-11 12:45:52 +02:00 |
|
marcos.alconada
|
a4518819e4
|
add link and change table
|
2019-07-10 17:58:52 +02:00 |
|
marcos.alconada
|
abfa8933f5
|
Merge remote-tracking branch 'origin/develop' into ent-4099-8092-busqueda-general-politicas
|
2019-07-10 17:13:39 +02:00 |
|
Daniel Rodriguez
|
e0b6da9615
|
Merge branch 'ent-4337-8327-bug-tags-filtros-eventos' into 'develop'
Fix: user filter load tags
See merge request artica/pandorafms!2592
|
2019-07-10 12:20:14 +02:00 |
|
fbsanchez
|
85e40b30dc
|
Fix: user filter load tags
|
2019-07-09 17:54:23 +02:00 |
|
Tatiana Llorente
|
eaf29b798a
|
Fixed minor visual bugs in black theme- #4194
|
2019-07-09 15:03:38 +02:00 |
|
Daniel Maya
|
aafba795ee
|
Update visual console
|
2019-07-08 17:51:01 +02:00 |
|
fbsanchez
|
0e3fd848f7
|
minor fixes and visual change in azure credentials
|
2019-07-04 19:34:03 +02:00 |
|
Tatiana Llorente
|
2298019e6b
|
Dont show empty custom fields in agent view - #4201
|
2019-07-03 12:41:22 +02:00 |
|
Alejandro Fraguas
|
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 |
|
Tatiana Llorente
|
52f391667a
|
Style changes - #4250
|
2019-06-28 10:24:53 +02:00 |
|
Jose Gonzalez
|
0e1ad43422
|
Update webchat.php. Forgotten console log
|
2019-06-27 09:33:31 +02:00 |
|
Jose Gonzalez
|
77419ee709
|
Modified jquery window function
|
2019-06-27 09:05:22 +02:00 |
|
fbsanchez
|
58483e8748
|
improved countdown
|
2019-06-26 16:23:54 +02:00 |
|
Daniel Rodriguez
|
4136f19190
|
Merge branch 'ent-4258-visual-console-movement-redimension-mode' into 'develop'
Visual Console's movement and redimension mode
See merge request artica/pandorafms!2527
|
2019-06-26 13:06:02 +02:00 |
|
fbsanchez
|
674c68bd2b
|
avoided issue latin1 btoa javascript event transfer
|
2019-06-25 12:49:17 +02:00 |
|
fbsanchez
|
86600ca454
|
RSS menu filter loaded
|
2019-06-25 12:21:18 +02:00 |
|
fbsanchez
|
c1ac6b7ed6
|
mini_severity virtual column added
|
2019-06-24 19:23:41 +02:00 |
|
Alejandro Gallardo Escobar
|
b6f10f89d0
|
Fixed missing styles
|
2019-06-24 17:57:45 +02:00 |
|
Alejandro Gallardo Escobar
|
d9fee539a8
|
Merge branch 'develop' into 'ent-4258-visual-console-movement-redimension-mode'
# Conflicts:
# pandora_console/include/visual-console-client/vc.main.css
|
2019-06-24 10:31:53 +02:00 |
|
Daniel Maya
|
8f5a206027
|
Fixed vc-control in public visual console
|
2019-06-21 13:17:37 +02:00 |
|
Daniel Maya
|
379a0039ae
|
Fixed vc-control
|
2019-06-21 12:41:05 +02:00 |
|
marcos.alconada
|
effbf5094f
|
Merge branch 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este
|
2019-06-21 11:34:49 +02:00 |
|
marcos.alconada
|
3fd12975aa
|
added 2 lines
|
2019-06-21 11:34:36 +02:00 |
|
Marcos Alconada
|
f1110c6d56
|
Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este'
# Conflicts:
# pandora_console/extras/mr/29.sql
|
2019-06-21 11:31:01 +02:00 |
|
marcos.alconada
|
a0c6dc69aa
|
add element id_source_event to filters events
|
2019-06-21 11:22:06 +02:00 |
|
fbsanchez
|
526ebdebd9
|
ajax comments
|
2019-06-20 21:11:56 +02:00 |
|
fbsanchez
|
8671c7c88c
|
events qa adjustments
|
2019-06-20 19:23:13 +02:00 |
|
fbsanchez
|
2c5cd007d2
|
reset form on load filter none
|
2019-06-20 14:18:49 +02:00 |
|
fbsanchez
|
aa238165d9
|
events rss
|
2019-06-20 13:33:37 +02:00 |
|
fbsanchez
|
cfe16ee8c3
|
minor fixes
|
2019-06-20 11:46:01 +02:00 |
|
fbsanchez
|
275261e6b3
|
wip csv export events
|
2019-06-19 17:30:32 +02:00 |
|
fbsanchez
|
44d8b977cb
|
event advanced filter fixes
|
2019-06-19 16:52:14 +02:00 |
|
fbsanchez
|
524575171a
|
event history viewer
|
2019-06-19 12:56:16 +02:00 |
|
fbsanchez
|
a7f9484adb
|
minor style change
|
2019-06-19 08:43:37 +02:00 |
|
fbsanchez
|
37e98d108b
|
fit mc
|
2019-06-18 19:17:21 +02:00 |
|
fbsanchez
|
8b8d17f089
|
event ajax validation little improvement
|
2019-06-18 18:35:34 +02:00 |
|
fbsanchez
|
24025ebb74
|
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
|
2019-06-18 17:48:03 +02:00 |
|
fbsanchez
|
c3ebe88178
|
style review
|
2019-06-18 17:40:31 +02:00 |
|
fbsanchez
|
d290b91b28
|
RC1 event viewer v2
|
2019-06-18 16:07:53 +02:00 |
|
fbsanchez
|
a1f004fdec
|
minor fixes
|
2019-06-18 15:03:49 +02:00 |
|
fbsanchez
|
f7cf6e1e8b
|
wip events
|
2019-06-18 10:32:04 +02:00 |
|
fbsanchez
|
a8a206fa10
|
events
|
2019-06-17 19:12:45 +02:00 |
|
fbsanchez
|
457c1c9edf
|
wip event view
|
2019-06-17 18:33:39 +02:00 |
|
fbsanchez
|
ab7d72a1c9
|
wip event vwr ui-box close tick
|
2019-06-17 17:02:33 +02:00 |
|
Daniel Rodriguez
|
a583da3de3
|
Merge branch 'ent-3992-anadir-el-modo-de-edicion-a-la-vista-de-la-consola-visual' into 'develop'
Añadir el modo de edición a la vista de la consola visual
Closes pandora_enterprise#3981
See merge request artica/pandorafms!2482
|
2019-06-17 15:07:12 +02:00 |
|
fbsanchez
|
132076198d
|
minor fixes and event ACL - groups
|
2019-06-14 13:20:34 +02:00 |
|
Tatiana Llorente
|
bdeb456a44
|
Added sorting in last fired column - #3965
|
2019-06-14 12:54:03 +02:00 |
|
fbsanchez
|
7226a45df5
|
improved ui_progress now accepts ajax updates
|
2019-06-14 10:35:10 +02:00 |
|
fbsanchez
|
b08e8b595d
|
multiple fixes
|
2019-06-13 19:41:21 +02:00 |
|
fbsanchez
|
9740275388
|
dyn redraw
|
2019-06-13 13:07:11 +02:00 |
|
fbsanchez
|
d12773cfd0
|
Avoid double validation, avoid redraw
|
2019-06-13 12:36:31 +02:00 |
|
fbsanchez
|
ecc2fef8f6
|
event validation/in process
|
2019-06-13 12:30:09 +02:00 |
|
Alejandro Fraguas
|
fef1441d9f
|
Merge branch 'ent-4197-#8171-Permisos-en-consolas-visuales-con-ACLS' into 'develop'
Fixed bug in visual consoles permissions with ACLS
See merge request artica/pandorafms!2492
|
2019-06-13 10:46:39 +02:00 |
|
fbsanchez
|
f3a0f37a1c
|
Events agent grouped
|
2019-06-12 18:19:39 +02:00 |
|
Daniel Rodriguez
|
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 |
|
fbsanchez
|
4bb300889d
|
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
|
2019-06-12 13:17:36 +02:00 |
|
fbsanchez
|
b615b50920
|
wip event grouped
|
2019-06-12 13:17:18 +02:00 |
|
marcos.alconada
|
4b224d1314
|
ad coments and delete is_metaconsole() condition
|
2019-06-12 10:13:37 +02:00 |
|
marcos.alconada
|
23469796f8
|
Limited result for user groups
|
2019-06-11 16:23:42 +02:00 |
|
fbsanchez
|
48e6fef0b7
|
Event filters
|
2019-06-11 12:58:18 +02:00 |
|
manuel
|
40119f6d2e
|
Fixed bug in visual consoles permissions with ACLS
|
2019-06-11 12:55:43 +02:00 |
|
marcos.alconada
|
738958386a
|
guardo cambios
|
2019-06-11 10:01:51 +02:00 |
|
Tatiana Llorente
|
80ed5dc9c1
|
Removed empty helps - #4183
|
2019-06-11 09:33:43 +02:00 |
|
fbsanchez
|
ef3d299d58
|
wip event view
|
2019-06-10 15:18:35 +02:00 |
|
fbsanchez
|
f67bf8c2b7
|
wip event list filters
|
2019-06-07 22:44:02 +02:00 |
|
fbsanchez
|
d4d4509266
|
wip event view
|
2019-06-07 21:22:07 +02:00 |
|
fbsanchez
|
419a90d69c
|
wip event list
|
2019-06-07 17:35:13 +02:00 |
|
fbsanchez
|
23e6711f09
|
WIP Events
|
2019-06-06 17:50:47 +02:00 |
|
Tatiana Llorente
|
a4ea5e7c77
|
Added image for unknown and no data status - 4088
|
2019-06-06 14:16:09 +02:00 |
|
marcos.alconada
|
1ee347684e
|
Added condition if enterprise installed
|
2019-06-05 10:17:28 +02:00 |
|
Alejandro Gallardo Escobar
|
1e74502866
|
Bugfix
|
2019-06-05 09:08:23 +02:00 |
|
fbsanchez
|
b14cdfb4c2
|
minor fix in tactical
|
2019-06-04 22:22:33 +02:00 |
|
Alejandro Gallardo Escobar
|
0c21a2956c
|
Bugfix
|
2019-06-04 17:34:40 +02:00 |
|
Alejandro Gallardo Escobar
|
795542b311
|
Added a mode to enable the edit mode of the visual console client items
|
2019-06-04 17:21:54 +02:00 |
|
marcos.alconada
|
9bc83b4ffd
|
Add new else
|
2019-06-04 17:08:08 +02:00 |
|
marcos.alconada
|
22efc4ba44
|
Resolved problem with counts on search main
|
2019-06-04 17:05:17 +02:00 |
|
fbsanchez
|
2f5265fcbb
|
color updates
|
2019-06-04 14:08:07 +02:00 |
|
fbsanchez
|
c741020538
|
styles review
|
2019-06-04 13:57:55 +02:00 |
|
marcos.alconada
|
c5cb76b271
|
Add policies to general search
|
2019-06-04 11:52:56 +02:00 |
|
marcos.alconada
|
4b6c21bb30
|
Add policies to general search and deleted help functions
|
2019-06-04 11:44:11 +02:00 |
|
fbsanchez
|
974db824a8
|
style review
|
2019-06-03 19:13:29 +02:00 |
|
fbsanchez
|
551a21ed86
|
Next contact fixes
|
2019-06-03 13:11:00 +02:00 |
|
fbsanchez
|
13086b596c
|
Next contact
|
2019-06-03 13:04:49 +02:00 |
|
fbsanchez
|
b4dcf4a6f1
|
style review
|
2019-06-03 11:55:56 +02:00 |
|
fbsanchez
|
9de5dadbf2
|
style review
|
2019-06-03 11:16:51 +02:00 |
|
fbsanchez
|
88b0802472
|
style review
|
2019-06-03 10:46:52 +02:00 |
|
fbsanchez
|
69054571ab
|
Style review
|
2019-05-31 09:50:59 +02:00 |
|
Luis Calvo
|
cdbd5b3487
|
Fixed bug in meta user_edir form url
|
2019-05-30 17:23:32 +02:00 |
|
Alejandro Fraguas
|
bc279e99b0
|
Merge branch 'fix/styles' into 'develop'
Fix/styles
See merge request artica/pandorafms!2461
|
2019-05-29 18:31:43 +02:00 |
|
fbsanchez
|
c2346842c9
|
ui_toggle revierw
|
2019-05-29 18:13:21 +02:00 |
|
fbsanchez
|
f16f35ad10
|
Changes styles
|
2019-05-29 17:49:09 +02:00 |
|
fbsanchez
|
121ae89b1d
|
dyn style ui_print_help_tip
|
2019-05-29 17:34:11 +02:00 |
|
fbsanchez
|
3c730fbedf
|
BC updated
|
2019-05-29 17:10:21 +02:00 |
|
fbsanchez
|
47c9220cbb
|
clippy positions and control overflow
|
2019-05-29 17:02:01 +02:00 |
|
fbsanchez
|
e9198af17c
|
multiple changes
|
2019-05-29 16:45:53 +02:00 |
|
Alejandro Fraguas
|
2e3338b595
|
Merge branch 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual' into 'develop'
Ent 3961 añadir caché para los elementos de la consola visual
See merge request artica/pandorafms!2443
|
2019-05-29 15:48:45 +02:00 |
|
fbsanchez
|
f58d1bc6ee
|
Styling review
|
2019-05-29 15:14:13 +02:00 |
|
fbsanchez
|
8bd4a2f8f7
|
Style align-top
|
2019-05-29 13:20:31 +02:00 |
|
fbsanchez
|
3046cc5224
|
Style align-top
|
2019-05-29 13:13:24 +02:00 |
|
fbsanchez
|
7da60b447a
|
Merge remote-tracking branch 'origin/develop' into fix/styles
|
2019-05-29 13:06:53 +02:00 |
|
fbsanchez
|
505229abe4
|
minor style change - box
|
2019-05-29 13:03:58 +02:00 |
|
Daniel Rodriguez
|
ad1251052e
|
Merge branch 'ent-4105-fallo-desplegable-snmp-wizard' into 'develop'
SNMP Browser fix
See merge request artica/pandorafms!2455
|
2019-05-29 12:50:09 +02:00 |
|
fbsanchez
|
49dee1e2bc
|
Next contact to seconds
|
2019-05-29 12:42:55 +02:00 |
|
fbsanchez
|
5131c24772
|
Merge remote-tracking branch 'origin/develop' into fix/styles
|
2019-05-29 12:24:28 +02:00 |
|
fbsanchez
|
37af0ad612
|
Styles
|
2019-05-29 12:06:05 +02:00 |
|
fbsanchez
|
c8649a8dc4
|
Styles
|
2019-05-29 11:21:57 +02:00 |
|
Daniel Maya
|
552467286c
|
Merge branch 'develop' into 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual'
# Conflicts:
# pandora_console/extras/mr/28.sql
|
2019-05-29 11:10:31 +02:00 |
|
Luis Calvo
|
27963c4370
|
Fixed minor bug
|
2019-05-29 09:51:26 +02:00 |
|
fbsanchez
|
22de7964c2
|
Merge remote-tracking branch 'origin/develop' into fix/styles
|
2019-05-29 08:52:34 +02:00 |
|
fbsanchez
|
d64e2cfb8c
|
Merge remote-tracking branch 'origin/develop' into fix/styles
|
2019-05-28 18:05:33 +02:00 |
|
Luis Calvo
|
58a0ef1bf7
|
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
|
2019-05-28 18:03:55 +02:00 |
|
Luis Calvo
|
77dbb53db4
|
Fixed minor bug
|
2019-05-28 18:03:40 +02:00 |
|
fbsanchez
|
70469c4909
|
Event list agent view
|
2019-05-28 18:03:01 +02:00 |
|
Luis Calvo
|
e993dcc3a5
|
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
|
2019-05-28 17:37:20 +02:00 |
|
Luis Calvo
|
6fdd88ab65
|
Fixed errors on eHorus user level conf
|
2019-05-28 17:19:13 +02:00 |
|
fbsanchez
|
445db7c43b
|
module list agent view
|
2019-05-28 16:20:24 +02:00 |
|
Tatiana Llorente
|
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 |
|
fbsanchez
|
c57949079b
|
RC1 agent view
|
2019-05-28 13:32:17 +02:00 |
|
fbsanchez
|
348f0c2a65
|
agent view styling
|
2019-05-28 13:27:17 +02:00 |
|
Luis Calvo
|
5966367f8f
|
eHorus user level login conf added in user editor
|
2019-05-28 13:14:42 +02:00 |
|
fbsanchez
|
2cd19aa0cb
|
updates styles
|
2019-05-28 10:47:31 +02:00 |
|
fbsanchez
|
bdd7cc1317
|
Flex agent view
|
2019-05-28 09:48:09 +02:00 |
|
fbsanchez
|
f57915285f
|
review styles agent view
|
2019-05-27 22:36:55 +02:00 |
|
fbsanchez
|
f1499082fa
|
agent view rebuilt
|
2019-05-27 21:30:46 +02:00 |
|
fbsanchez
|
5be124f315
|
Styles review
|
2019-05-27 19:00:48 +02:00 |
|
Luis Calvo
|
588d19102f
|
Resolve merge conflict
|
2019-05-27 18:30:24 +02:00 |
|
Tatiana Llorente
|
2fd37b531e
|
Visual changes in module graph - #4104
|
2019-05-27 17:37:57 +02:00 |
|
Tatiana Llorente
|
1eb1120c6e
|
Rename class events_show_more_table to table_modal_alternate - #4102
|
2019-05-27 16:18:10 +02:00 |
|
fbsanchez
|
9eecc414dd
|
cps changes - switch core touched - test this commit carefully
|
2019-05-27 14:12:53 +02:00 |
|
Alejandro Gallardo Escobar
|
ce8ba54e09
|
Merge remote-tracking branch 'origin/develop' into ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual
|
2019-05-27 11:31:24 +02:00 |
|
fbsanchez
|
1d403ec2f8
|
SNMP Browser fix
|
2019-05-24 13:42:49 +02:00 |
|
fbsanchez
|
4400d9303f
|
subscription manager udp
|
2019-05-23 19:22:05 +02:00 |
|
fbsanchez
|
211b05c9d6
|
minor fix in newsletter logic
|
2019-05-23 18:59:38 +02:00 |
|
fbsanchez
|
058c9d3806
|
Newsletter reminder settings ent
|
2019-05-23 18:54:04 +02:00 |
|
Daniel Maya
|
4c874e152c
|
Merge
|
2019-05-23 10:43:32 +02:00 |
|
Alejandro Fraguas
|
88234503c0
|
Merge branch 'ent-4078-7999-Error-al-actualizar-los-cambios-en-la-vista-de-usuario' into 'develop'
Fixed url in user_edit
See merge request artica/pandorafms!2436
|
2019-05-22 14:14:15 +02:00 |
|
Alejandro Fraguas
|
5b286b4f67
|
Merge branch 'ent-3975-mejorar-la-actualizacion-de-los-datos-y-elementos-de-la-consola-visual' into 'develop'
Mejorar la actualizacion de los datos y elementos de la consola visual
See merge request artica/pandorafms!2429
|
2019-05-22 13:06:18 +02:00 |
|
marcos.alconada
|
36afbea8b7
|
Add new search for id source event in metaconsole
|
2019-05-22 11:53:57 +02:00 |
|
Daniel Maya
|
edbde3fecb
|
Fixed url in user_edit
|
2019-05-21 17:14:29 +02:00 |
|
manuel
|
ada49966e0
|
Merge branch 'develop' into ent-3468-Ayudas_online
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
|
2019-05-21 10:05:06 +02:00 |
|
Daniel Maya
|
5c0a197b6b
|
Added cache
|
2019-05-20 15:15:54 +02:00 |
|
Alejandro Gallardo Escobar
|
2c8dd3b5e5
|
Merge remote-tracking branch 'origin/develop' into ent-3975-mejorar-la-actualizacion-de-los-datos-y-elementos-de-la-consola-visual
|
2019-05-17 14:16:23 +02:00 |
|
Alejandro Gallardo Escobar
|
34218fa7eb
|
Improved the management of the async requests of the visual console client
|
2019-05-17 14:09:30 +02:00 |
|
Luis Calvo
|
a0faffe161
|
Form eHorus user login with title
Former-commit-id: 7b55f446802bb9c24602d2e626789a3365599835
|
2019-05-16 18:59:17 +02:00 |
|
Luis Calvo
|
0cd60d0431
|
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
Former-commit-id: fb3ba4cbda0daa688550708e4bc99e6512eea413
|
2019-05-16 18:11:33 +02:00 |
|
Daniel Maya
|
b508e40a73
|
Changed simple quote in alerts
Former-commit-id: 48f06d79b9f6e93ba2164d8da6240f28cc4f785c
|
2019-05-14 11:11:27 +02:00 |
|
Luis Calvo
|
ce34adb9d8
|
Fixed errors and corrected style
Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a
|
2019-05-13 17:28:23 +02:00 |
|
manuel
|
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 |
|
Luis Calvo
|
27096276ec
|
agent view user acces ehorus
Former-commit-id: 66739ce807d5bd5f2e46ce9fd1aa0cc72afbb4bc
|
2019-05-13 15:00:29 +02:00 |
|
Luis Calvo
|
c527435a0e
|
eHorus user-login settings
Former-commit-id: e62be3b137ef5583fbd29186a834a86b075e78fb
|
2019-05-10 15:32:25 +02:00 |
|
Luis Calvo
|
44b14debdc
|
Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings
Former-commit-id: 781b73ee3896c138223d46d40abdb3a7100bcf2c
|
2019-05-10 09:38:31 +02:00 |
|
Luis Calvo
|
ecce1160e1
|
Added button to select ehorus conf type and box into user conf
|
2019-05-09 19:23:18 +02:00 |
|
Daniel Rodriguez
|
3e91207186
|
Merge branch 'ent-3617-Gráfica-de-módulos' into 'develop'
Ent 3617 gráfica de módulos
See merge request artica/pandorafms!2407
Former-commit-id: ac545e4211f9e68e81482657c6e294dcac082a8e
|
2019-05-09 17:03:03 +02:00 |
|
Tatiana Llorente
|
fd83540ad5
|
New menu module graph for interface modules- #3617
|
2019-05-09 12:39:03 +02:00 |
|
Alejandro Fraguas
|
0aa8bcda30
|
Merge branch 'ent-3758-7777-bug-validacion-eventos-en-consola' into 'develop'
Pending to review
See merge request artica/pandorafms!2295
|
2019-05-09 11:56:29 +02:00 |
|
Tatiana Llorente
|
ef45fc3ca6
|
Merge remote-tracking branch 'origin/develop' into ent-3617-Gráfica-de-módulos
|
2019-05-09 10:44:31 +02:00 |
|
Daniel Rodriguez
|
0a7539cc3a
|
Merge branch 'ent-3990-7999-colecciones-no-funcionan-no-se-puede-subir-ni-crear-archivos' into 'develop'
fixed filemanager
See merge request artica/pandorafms!2408
|
2019-05-08 18:26:23 +02:00 |
|
marcos.alconada
|
0b118f63ad
|
Merge remote-tracking branch 'origin/develop' into ent-3758-7777-bug-validacion-eventos-en-consola
|
2019-05-08 15:19:40 +02:00 |
|
Daniel Rodriguez
|
0c8fab6cb3
|
Merge branch 'ent-3574-7598-bug-botones-y-casillas-vista-de-eventos' into 'develop'
Ent 3574 7598 bug botones y casillas vista de eventos
See merge request artica/pandorafms!2222
|
2019-05-08 13:52:45 +02:00 |
|
Daniel Barbero Martin
|
99f5cab83d
|
fixed filemanager
|
2019-05-08 10:55:20 +02:00 |
|
Tatiana Llorente
|
cb49de4d81
|
New menu module graph - #3617
|
2019-05-08 10:28:00 +02:00 |
|
manuel
|
f5759abcad
|
Merge branch 'develop' into ent-3468-Ayudas_online
|
2019-05-08 09:35:32 +02:00 |
|
Tatiana Llorente
|
5e0b53e3c2
|
New menu module graph - #3617
|
2019-05-08 09:35:28 +02:00 |
|
Luis Calvo
|
3221bcf55a
|
Merge remote-tracking branch 'origin/develop' into ent-3782-module-visualization-bug
|
2019-05-07 16:08:29 +02:00 |
|
Tatiana Llorente
|
283be8f632
|
New menu module graph - #3617
|
2019-05-07 16:07:07 +02:00 |
Ramon Novoa
|
10fd9c4b57
|
Merge branch 'ent-3755-Vista-de-eventos-se-carga-dos-veces' into develop
|
2019-05-07 15:02:47 +02:00 |
|
alejandro-campos
|
a622dcc9d4
|
add condition to avoid trying to retrieve a non existing event filter when synchronizing meta and node
Former-commit-id: 83a1f9ad1c99de0e29a880de4ed6c518884bda31
|
2019-05-06 15:06:26 +02:00 |
|
Alejandro Fraguas
|
545afcb684
|
Merge branch 'ent-3866-7901-bug-en-busqueda-general-usuario-con-grupo-asignado' into 'develop'
Added secondary groups in global search
See merge request artica/pandorafms!2351
Former-commit-id: c9202c576699e7cd4df19e5d7a28bda5fc36826c
|
2019-05-06 10:33:30 +02:00 |
|
alejandro-campos
|
bcbcd763a1
|
fixed double load of events in event list
Former-commit-id: ea1294c680b5dbe3b069110012e2b54db5312fd1
|
2019-04-29 15:04:14 +02:00 |
|
manuel
|
6bd8221bc0
|
changed helps
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
|
2019-04-29 14:36:02 +02:00 |
|
Daniel Maya
|
a5379be0d9
|
Added refr in full screen and public visual console
Former-commit-id: 348ec996173e95dce73e5800ece9c6861219c7af
|
2019-04-29 12:09:40 +02:00 |
|
Alejandro Gallardo Escobar
|
7f6ec7a501
|
Visual Console Refactor: bugfix
Former-commit-id: 10f2a2199275475b7674364bb5f3d595b65f12c9
|
2019-04-29 11:03:56 +02:00 |
|
Alejandro Gallardo Escobar
|
c1272035cc
|
Merge remote-tracking branch 'origin/develop' into visual-console-refactor
Former-commit-id: 6cffccf44d4bf8c5b87c5c5f112d814c796645c6
|
2019-04-24 17:05:20 +02:00 |
|
Daniel Barbero Martin
|
62b30c6e91
|
Merge remote-tracking branch 'origin/develop' into ent-3866-7901-bug-en-busqueda-general-usuario-con-grupo-asignado
Former-commit-id: e51d5accb228485a309abae06d2a68352ae18a9b
|
2019-04-24 15:25:06 +02:00 |
|
Daniel Barbero Martin
|
ac41e9255f
|
helpers
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
|
2019-04-24 13:53:18 +02:00 |
|
Alejandro Fraguas
|
759a533180
|
Merge branch 'ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola' into 'develop'
Commit para revisar progreso
See merge request artica/pandorafms!2289
Former-commit-id: b8924b2fc0d151274809ab625fa840b27412d493
|
2019-04-24 13:47:15 +02:00 |
|
Alejandro Fraguas
|
a6df522df7
|
Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas_2' into 'develop'
Fixed header missing in table alert status - #3707
See merge request artica/pandorafms!2365
Former-commit-id: e56a9610bc358898b5dc61a7f47d32561c72e36b
|
2019-04-22 17:31:49 +02:00 |
|
Alejandro Gallardo Escobar
|
a03245a277
|
Visual Console Refactor: fixed the visual console background on the meta
Former-commit-id: 2c5ba2451691558502c0aab4f5bb91259afb2ef8
|
2019-04-22 09:40:08 +02:00 |
|
fbsanchez
|
cbdd8e7104
|
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 4efed0a1512550d09b8beb6a9851f7b1eeb3ff0c
|
2019-04-22 09:01:24 +02:00 |
|
marcos.alconada
|
fb87b97cd4
|
Merge remote-tracking branch 'origin/develop' into ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola
Former-commit-id: 628100b56c9528995e0f95ef8918dedaba16c8dd
|
2019-04-17 15:12:56 +02:00 |
|
Alejandro Gallardo Escobar
|
0911a00fe9
|
Visual Console Refactor: fixes
Former-commit-id: b180de5a6a105aa627f15895dc7890a294110db3
|
2019-04-17 13:50:53 +02:00 |
|
Tatiana Llorente
|
aa34cf17be
|
Fixed header missing in table alert status - #3707
Former-commit-id: 900b4023316d9e4946a8f81871e19f7f897a7a8f
|
2019-04-17 12:57:45 +02:00 |
|
Alejandro Gallardo Escobar
|
cbf921ba25
|
Visual Console Refactor: bugfixes
Former-commit-id: fc04eb9c6e6df024859e2b13034188ddaf1528ed
|
2019-04-17 12:32:08 +02:00 |
|
Alejandro Fraguas
|
6594095de7
|
Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas' into 'develop'
Ent 3707 nuevo diseño para las tablas
See merge request artica/pandorafms!2352
Former-commit-id: 684daf476bf288e294b67f97fc80fdf6a6ddcce4
|
2019-04-17 10:19:42 +02:00 |
|
Alejandro Gallardo Escobar
|
998a66f654
|
Visual Console Refactor: added a setting to use the legacy VC and added the relation line width setup option to the client
Former-commit-id: c6bb6ed82a8e84c485ad7270ebb46150fdfcfa8b
|
2019-04-16 12:23:03 +02:00 |
|
fbsanchez
|
6648e0268a
|
removed reconview link from menu
Former-commit-id: 41b80e4eaa41617982c91a218aee3902b76e4fde
|
2019-04-15 12:54:22 +02:00 |
|
Alejandro Gallardo Escobar
|
2bd88e858d
|
Merge remote-tracking branch 'origin/develop' into visual-console-refactor
Former-commit-id: 87f11087d0ce33be0be009d8e4e88ca525204350
|
2019-04-12 14:28:20 +02:00 |
|
Alejandro Gallardo Escobar
|
2bf49e43cc
|
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: c409495771d58549575f68c52da38d2510f4f653
|
2019-04-12 14:24:49 +02:00 |