Jose Gonzalez
|
0363a90e1f
|
Resolve merge issues
|
2023-01-31 17:35:44 +01:00 |
Diego Muñoz-Reja
|
46079855f7
|
Merge branch 'ent-10233-descuadre-en-snmp-interface-wizard' into 'develop'
Ent 10233 descuadre en snmp interface wizard
See merge request artica/pandorafms!5463
|
2023-01-31 12:17:25 +00:00 |
|
Jose Gonzalez
|
891e485781
|
Fixed users list view
|
2023-01-30 16:14:05 +01:00 |
|
Jose Gonzalez
|
6496c08f28
|
Polish TreeView
|
2023-01-30 13:39:27 +01:00 |
daniel
|
69db3c8031
|
blink button test sound events pandora_enterprise#10189
|
2023-01-27 12:44:15 +01:00 |
Rafael Ameijeiras
|
6dd4fda229
|
Merge branch 'ent-10222-imagen-en-el-about-no-se-ve' into 'develop'
Ent 10222 imagen en el about no se ve
See merge request artica/pandorafms!5451
|
2023-01-26 15:55:33 +00:00 |
Daniel Cebrian
|
e8a355870e
|
#10233 fixed filter styles in snmp interfaces wizard
|
2023-01-26 15:46:02 +01:00 |
|
Jose Gonzalez
|
251fc46d17
|
Resolve issue with filters
|
2023-01-26 13:43:03 +01:00 |
|
Jose Gonzalez
|
17c0e78d06
|
Improve TreeView
|
2023-01-26 13:25:24 +01:00 |
|
Daniel Cebrian
|
8353a356d8
|
#10138 changed signature footer
|
2023-01-25 11:44:00 +01:00 |
|
Daniel Cebrian
|
614475624c
|
#10138 changed color button and fixed input password
|
2023-01-25 11:12:20 +01:00 |
|
Daniel Cebrian
|
786d035f85
|
#10138 refactored
|
2023-01-25 10:34:18 +01:00 |
Pablo Aragon
|
8d7671f35f
|
10222 Fix image About and black css About
|
2023-01-24 12:34:04 +01:00 |
|
Jose Gonzalez
|
6f4b55e076
|
WIP: TreeView improve
|
2023-01-19 23:26:26 +01:00 |
|
Daniel Cebrian
|
cddfcd5f25
|
#10138 changed position signature in footer
|
2023-01-19 11:29:26 +01:00 |
|
Jose Gonzalez
|
8510629781
|
Treeview improvement
|
2023-01-19 00:31:11 +01:00 |
|
Daniel Cebrian
|
7433d1296e
|
cambiado footer y popup
|
2023-01-18 19:32:31 +01:00 |
|
Daniel Cebrian
|
e0b1acb9c4
|
#10138 finished step 3
|
2023-01-18 17:02:23 +01:00 |
|
Daniel Cebrian
|
4e00fe4f83
|
#10138 changed step 3
|
2023-01-18 12:08:08 +01:00 |
|
Daniel Cebrian
|
88a205322a
|
#10138 step 3 design
|
2023-01-17 17:57:02 +01:00 |
|
Jose Gonzalez
|
9356f05056
|
Minor fixes with inputs in fixed filter tables
|
2023-01-17 16:46:18 +01:00 |
|
Jose Gonzalez
|
8c1bd2c1ee
|
Agent module manager fixed and improve action buttons
|
2023-01-17 15:21:07 +01:00 |
|
Jose Gonzalez
|
8c852fb3df
|
Agent improvements
|
2023-01-16 01:28:53 +01:00 |
|
Jose Gonzalez
|
2ec9c8a7de
|
Fix styles
|
2023-01-13 14:37:06 +01:00 |
Calvo
|
d8428a46a7
|
Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API
|
2023-01-13 10:12:21 +01:00 |
|
Jose Gonzalez
|
a9c4dd625c
|
Merge develop branch
|
2023-01-11 13:46:15 +01:00 |
|
Jose Gonzalez
|
118099cd24
|
Minor fixes and solve issues with module templates
|
2023-01-11 13:02:18 +01:00 |
|
Jose Gonzalez
|
33c9b50ddc
|
Polishing agent detail view
|
2023-01-10 14:57:40 +01:00 |
|
Jose Gonzalez
|
313240378e
|
Fix filter view for module table
|
2023-01-10 12:03:16 +01:00 |
|
Jose Gonzalez
|
60685cdccc
|
Table fixes
|
2023-01-10 10:18:37 +01:00 |
Jonathan
|
1fc4af9492
|
#7250 config pandora_server.conf multiple columns
|
2023-01-09 09:56:19 +01:00 |
|
Jose Gonzalez
|
8421fb49ca
|
Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones
|
2023-01-04 15:54:16 +01:00 |
|
Jose Gonzalez
|
8728551c08
|
Agent details modules table upgraded
|
2023-01-04 15:46:32 +01:00 |
|
Jose Gonzalez
|
5f300a160e
|
Agent view improvement
|
2023-01-03 10:13:58 +01:00 |
|
Jose Gonzalez
|
03226b1f23
|
Polishing agent main view
|
2023-01-02 16:50:13 +01:00 |
|
Jose Gonzalez
|
9f3d2db92a
|
Minor changes
|
2023-01-02 10:30:30 +01:00 |
|
Calvo
|
6d9149e11b
|
Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API
|
2022-12-29 17:39:12 +01:00 |
|
Calvo
|
c14842a4f9
|
WIP:Api auth with bearer token
|
2022-12-29 17:20:34 +01:00 |
|
Pablo Aragon
|
ab54a26815
|
9868 Remove footer and create About section
|
2022-12-29 16:21:36 +01:00 |
|
Jose Gonzalez
|
735cec1441
|
WIP: Agent status
|
2022-12-23 10:21:53 +01:00 |
|
Jose Gonzalez
|
ffa4ec756c
|
Agent Group icons adding
|
2022-12-20 17:22:35 +01:00 |
|
Calvo
|
f84f9733e3
|
Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API
|
2022-12-20 12:15:10 +01:00 |
Daniel Rodriguez
|
0f4e3d4056
|
Merge branch 'ent-9292-13830-vista-traps-snmp-peta-con-muchos-elementos' into 'develop'
Ent 9292 13830 vista traps snmp peta con muchos elementos
See merge request artica/pandorafms!5255
|
2022-12-20 10:20:26 +00:00 |
|
Jose Gonzalez
|
977c358fa0
|
Grouped somethings
|
2022-12-19 15:08:53 +01:00 |
|
jose.gonzalez@pandorafms.com
|
2b896bcd17
|
Minor fixes over module data tables
|
2022-12-16 12:55:56 +01:00 |
|
jose.gonzalez@pandorafms.com
|
d43ae677a3
|
Changed icons and minor fixes
|
2022-12-15 12:41:38 +01:00 |
|
Daniel Barbero
|
a0ddad63b8
|
Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos
Conflicts:
pandora_console/extras/mr/59.sql
|
2022-12-13 09:17:39 +01:00 |
|
Rafael Ameijeiras
|
8a6e3e5e06
|
Merge branch 'ent-8854-13786-alertas-sonoras-en-metaconsola' into 'develop'
add sound events to metaconsole pandora_enterprise#8854
See merge request artica/pandorafms!5246
|
2022-12-12 14:02:36 +00:00 |
|
jose.gonzalez@pandorafms.com
|
caad626c39
|
Minor changes
|
2022-12-10 14:39:17 +01:00 |
|
jose.gonzalez@pandorafms.com
|
5a2e969b85
|
Module type changes
|
2022-12-07 18:17:11 +01:00 |
|
jose.gonzalez@pandorafms.com
|
e57f9b8794
|
Some changes
|
2022-12-05 17:31:08 +01:00 |
|
Calvo
|
c5c36dab8b
|
Fix dashboard dialog tranlations and search bar size
|
2022-12-05 17:20:08 +01:00 |
|
jose.gonzalez@pandorafms.com
|
912f1d0d7a
|
Module manager upgrade
|
2022-12-05 13:39:51 +01:00 |
|
jose.gonzalez@pandorafms.com
|
445a8161cf
|
Merge
|
2022-12-05 09:44:35 +01:00 |
|
jose.gonzalez@pandorafms.com
|
79be611e91
|
CSS Styles
|
2022-12-02 14:26:05 +01:00 |
|
jose.gonzalez@pandorafms.com
|
dccd950e9e
|
Changes
|
2022-11-30 10:14:42 +01:00 |
|
Daniel Barbero
|
117c2e6d5c
|
visual error pandora_enterprise#9923
|
2022-11-25 14:12:11 +01:00 |
|
jose.gonzalez@pandorafms.com
|
9d0f465874
|
Minor improvements
|
2022-11-24 10:00:42 +01:00 |
Daniel Maya
|
ac910412a3
|
#9663 WIP menu redesing
|
2022-11-24 09:36:18 +01:00 |
|
jose.gonzalez@pandorafms.com
|
9144bd9d32
|
Table definition
|
2022-11-23 17:40:40 +01:00 |
|
Daniel Rodriguez
|
33966c0ace
|
Merge branch 'ent-9875-fallo-visual-en-el-filtro-de-eventos' into 'develop'
visual error pandora_enterprise#9875
See merge request artica/pandorafms!5282
|
2022-11-23 12:51:22 +00:00 |
|
jose.gonzalez@pandorafms.com
|
251fddacd0
|
From merge
|
2022-11-23 13:26:54 +01:00 |
|
jose.gonzalez@pandorafms.com
|
a688182062
|
Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones
|
2022-11-22 17:47:02 +01:00 |
|
Daniel Rodriguez
|
de9eb0551b
|
Merge branch 'ent-9705-14417-pestanas-dentro-de-widget-events-incorrecta-visualizacion' into 'develop'
fix styles events list dashboards pandora_enterprise#9705
See merge request artica/pandorafms!5220
|
2022-11-22 14:03:35 +00:00 |
|
Daniel Barbero
|
899352443d
|
visual error pandora_enterprise#9875
|
2022-11-22 13:16:50 +01:00 |
|
Daniel Rodriguez
|
155349fbbb
|
Merge branch 'ent-9417-bug-visual-en-acciones-extra-de-autoconfiguracion' into 'develop'
Ent 9417 bug visual en acciones extra de autoconfiguracion
See merge request artica/pandorafms!5170
|
2022-11-22 09:20:00 +00:00 |
|
jose.gonzalez@pandorafms.com
|
01f543d6b9
|
CSS Updates
|
2022-11-21 23:45:32 +01:00 |
|
jose.gonzalez@pandorafms.com
|
8e0e249b81
|
Fixed views and styles
|
2022-11-21 14:49:07 +01:00 |
|
Daniel Barbero
|
4118a46b9f
|
add new filter search events pandora_enterprise#9135
|
2022-11-18 14:04:54 +01:00 |
|
jose.gonzalez@pandorafms.com
|
88766eb7cc
|
Fixed action-buttons
|
2022-11-16 16:04:22 +01:00 |
|
jose.gonzalez@pandorafms.com
|
6e41c4d1bb
|
Agent changes
|
2022-11-16 12:24:11 +01:00 |
|
jose.gonzalez@pandorafms.com
|
03157caefe
|
Redo agent edition-creation view
|
2022-11-15 16:02:40 +01:00 |
|
jose.gonzalez@pandorafms.com
|
a0612485f8
|
CSS Files fixes
|
2022-11-15 08:24:15 +01:00 |
|
jose.gonzalez@pandorafms.com
|
15b9acf9d8
|
CSS Files fixes
|
2022-11-15 08:23:01 +01:00 |
|
jose.gonzalez@pandorafms.com
|
325bbea8db
|
Agent view fixed and other minor fixes
|
2022-11-15 08:05:04 +01:00 |
|
Daniel Maya
|
564cd837ae
|
#9292 code refactoring
|
2022-11-14 17:43:35 +01:00 |
|
jose.gonzalez@pandorafms.com
|
bf678b55dc
|
Several views updated
|
2022-11-11 16:15:17 +01:00 |
|
jose.gonzalez@pandorafms.com
|
52ee0cdfa6
|
Infoboxes and select2 selection with green colour
|
2022-11-10 15:59:23 +01:00 |
|
jose.gonzalez@pandorafms.com
|
197aced536
|
Inputs update and several style improvements
|
2022-11-10 15:06:39 +01:00 |
|
jose.gonzalez@pandorafms.com
|
f543f73c2c
|
Minor fixes and added new icons
|
2022-11-07 14:03:34 +01:00 |
|
jose.gonzalez@pandorafms.com
|
37c63a5001
|
Styles ando code adaptation
|
2022-11-04 12:55:41 +01:00 |
|
jose.gonzalez@pandorafms.com
|
ead583b3bf
|
Input type file changed
|
2022-11-04 08:43:18 +01:00 |
|
Daniel Barbero
|
ccc2e830f4
|
add sound events to metaconsole pandora_enterprise#8854
|
2022-11-03 15:12:50 +01:00 |
|
jose.gonzalez@pandorafms.com
|
195611a3c1
|
Adapt views and refactor
|
2022-10-28 15:01:00 +02:00 |
|
jose.gonzalez@pandorafms.com
|
97b249d5a5
|
Improved color picker
|
2022-10-28 10:54:30 +02:00 |
|
jose.gonzalez@pandorafms.com
|
809fbb4dc0
|
Fix somethings about styles
|
2022-10-27 17:31:48 +02:00 |
|
jose.gonzalez@pandorafms.com
|
356d6eccf7
|
Fix CSS styles
|
2022-10-27 16:21:27 +02:00 |
|
Daniel Barbero
|
6d19391c72
|
fix interfaces charts pandora_enterprise#9683
|
2022-10-27 16:12:17 +02:00 |
|
Daniel Barbero
|
59f0bba7f3
|
fix styles events list dashboards pandora_enterprise#9705
|
2022-10-27 09:07:04 +02:00 |
|
jose.gonzalez@pandorafms.com
|
30fb724359
|
Made some changes for better visualization
|
2022-10-26 16:58:28 +02:00 |
|
jose.gonzalez@pandorafms.com
|
ffa0d24083
|
Improve CSS
|
2022-10-25 21:59:30 +02:00 |
|
jose.gonzalez@pandorafms.com
|
3e8267d1fc
|
More changes in CSS
|
2022-10-25 16:25:10 +02:00 |
|
jose.gonzalez@pandorafms.com
|
ab865cd133
|
Added new image
|
2022-10-25 13:13:09 +02:00 |
|
jose.gonzalez@pandorafms.com
|
21e0a39b40
|
Improve CSS
|
2022-10-25 11:46:59 +02:00 |
|
Daniel Rodriguez
|
8aa6ea8bc8
|
Merge branch 'ent-8725-lista-exclusion-passwords' into 'develop'
Added exclude words for passwords control
See merge request artica/pandorafms!5174
|
2022-10-25 09:07:08 +00:00 |
|
jose.gonzalez@pandorafms.com
|
15f2a6ae88
|
Testing with links
|
2022-10-25 09:08:34 +02:00 |
|
jose.gonzalez@pandorafms.com
|
3634aab807
|
Code improvement
|
2022-10-24 19:54:15 +02:00 |
|
jose.gonzalez@pandorafms.com
|
300a07c3b2
|
Improve buttons
|
2022-10-24 14:54:15 +02:00 |
|
jose.gonzalez@pandorafms.com
|
dca36cbe0b
|
Improve CSS
|
2022-10-24 13:12:11 +02:00 |
|
jose.gonzalez@pandorafms.com
|
828f12e6f3
|
Defined buttons
|
2022-10-24 12:34:03 +02:00 |
|
jose.gonzalez@pandorafms.com
|
b2b9de1210
|
Improved visual styles continuing guide line
|
2022-10-24 12:05:51 +02:00 |
|
jose.gonzalez@pandorafms.com
|
95eecb1b7e
|
Little changes
|
2022-10-24 09:41:57 +02:00 |
Jimmy Olano
|
d6ae6d5dbb
|
Merge branch 'ent-9468-bug-vista-de-omnishell-boton-refresh-y-estilos' into 'develop'
Fix style issue
pandora_enterprise#9468
See merge request artica/pandorafms!5123
|
2022-10-21 11:48:11 +00:00 |
|
jose.gonzalez@pandorafms.com
|
6ab426e3ff
|
CSS changes
|
2022-10-21 13:32:57 +02:00 |
José González
|
984fd10897
|
Merge branch 'develop' into 'ent-8725-lista-exclusion-passwords'
# Conflicts:
# pandora_console/include/auth/mysql.php
|
2022-10-21 06:44:47 +00:00 |
|
jose.gonzalez@pandorafms.com
|
f2ebd96cc8
|
WIP: Created new way to do the menus
|
2022-10-20 09:43:02 +02:00 |
|
Daniel Barbero
|
40dc913aca
|
Merge remote-tracking branch 'origin/develop' into ent-8620-copiando-a-grafana-3-grouped-meter-graphs-como-widget-en-dashboard
|
2022-10-18 12:53:28 +02:00 |
|
Daniel Barbero
|
ce823dca38
|
new widget grouped meter graphs pandora_enterprise#8620
|
2022-10-10 11:20:03 +02:00 |
|
Daniel Barbero
|
54b44cc7fc
|
new widget grouped meter graphs pandora_enterprise#8620
|
2022-10-06 09:41:31 +02:00 |
|
Daniel Barbero
|
461f4f13cb
|
new widget grouped meter graphs pandora_enterprise#8620
|
2022-10-05 17:06:55 +02:00 |
|
José González
|
dc38e2e50a
|
Added exclude words for passwords control
|
2022-10-04 15:12:12 +02:00 |
sergio
|
7d9ffa59b0
|
ent #9417 fixed visual bug update buttom
|
2022-10-03 14:27:33 +02:00 |
|
Daniel Barbero
|
755432b381
|
Merge remote-tracking branch 'origin/develop' into ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo
|
2022-09-28 08:52:43 +02:00 |
|
Jimmy Olano
|
3ec710a62f
|
Merge branch 'ent-9229-revisar-comportamiento-de-widgets-con-elementos-eliminados' into 'develop'
fixed widget dashboards no exist item pandora_enterprise#9229
pandora_enterprise#9229
See merge request artica/pandorafms!5035
|
2022-09-28 00:55:09 +00:00 |
|
Daniel Rodriguez
|
5047f8afb9
|
Merge branch 'ent-8659-mostrar-nombre-completo-del-usuario-para-el-owner-de-un-evento' into 'develop'
Ent 8659 mostrar nombre completo del usuario para el owner de un evento
See merge request artica/pandorafms!5114
|
2022-09-27 10:50:17 +00:00 |
|
Daniel Barbero
|
fbce8b7533
|
fixed response events pandora_enterprise#9423
|
2022-09-27 09:51:37 +02:00 |
|
Daniel Barbero
|
225646cd9d
|
fixed response events pandora_enterprise#9423
|
2022-09-23 13:55:01 +02:00 |
|
José González
|
5a237971f8
|
Fix style issue
|
2022-09-20 13:02:32 +02:00 |
|
Daniel Barbero
|
b16c07fdb5
|
Merge remote-tracking branch 'origin/develop' into ent-9229-revisar-comportamiento-de-widgets-con-elementos-eliminados
Conflicts:
pandora_console/include/lib/Dashboard/Widgets/system_group_status.php
|
2022-09-20 09:10:25 +02:00 |
edu.corral
|
af7ad37b50
|
ent 8659 fullname event owner
|
2022-09-16 11:04:01 +02:00 |
|
Daniel Barbero
|
527daccd1d
|
fixed visual errors slides dashboards#9342
|
2022-09-12 09:46:37 +02:00 |
|
Jimmy Olano
|
661c77e107
|
Merge branch 'ent-9321-bugs-en-consolas-visuales' into 'develop'
fixed show modal label VC in list item pandora_enterprise#9321
pandora_enterprise#9321
See merge request artica/pandorafms!5036
|
2022-08-25 21:07:36 +00:00 |
|
Daniel Barbero
|
2a51a448ac
|
Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val
Conflicts:
pandora_console/godmode/menu.php
|
2022-08-02 10:34:21 +02:00 |
|
Daniel Barbero Martin
|
bd69105d7e
|
fix label color vc black theme pandora_enterprise#9321
|
2022-07-29 09:37:38 +02:00 |
|
Daniel Barbero Martin
|
72614130a8
|
fixed widget dashboards no exist item pandora_enterprise#9229
|
2022-07-28 14:25:31 +02:00 |
|
Jimmy Olano
|
33f6ae1875
|
Merge branch 'ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola' into 'develop'
Alerts list datatable
Ref: pandora_enterprise#8797
See merge request artica/pandorafms!5018
|
2022-07-22 02:39:35 +00:00 |
|
Daniel Barbero Martin
|
027f61daff
|
Merge remote-tracking branch 'origin/develop' into ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos
Conflicts:
pandora_console/extras/mr/56.sql
|
2022-07-19 10:18:04 +02:00 |
Calvo
|
642c60428c
|
Merge remote-tracking branch 'origin/develop' into ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola
|
2022-07-19 09:40:56 +02:00 |
|
Daniel Rodriguez
|
93e9992b19
|
Merge branch 'ent-9156-13785-cuadro-processing-ocupa-demasiado-en-eventos' into 'develop'
loading events pandora_enterprise#9156
See merge request artica/pandorafms!5014
|
2022-07-19 06:31:49 +00:00 |
|
Calvo
|
34333f9f88
|
Alerts list datatable
|
2022-07-15 12:15:37 +02:00 |
|
Diego Muñoz-Reja
|
74d19b3dbd
|
Merge branch 'ent-9029-Mejora-estética-en-header-vista-agente' into 'develop'
Ent 9029 mejora estética en header vista agente
See merge request artica/pandorafms!5003
|
2022-07-13 12:54:54 +00:00 |
|
Daniel Barbero Martin
|
1f394907c9
|
loading events pandora_enterprise#9156
|
2022-07-13 12:28:18 +02:00 |
|
Daniel Barbero Martin
|
01ba149280
|
new console report pandora_enterprise#6367
|
2022-07-08 13:40:20 +02:00 |
|
Daniel Maya
|
a71c26b4a7
|
#9029 Added starmap
|
2022-07-05 17:44:52 +02:00 |
|
Daniel Barbero Martin
|
12f73d86fd
|
new filter search eventspandora_enterprise#8942
|
2022-07-05 17:02:40 +02:00 |
|
Daniel Barbero Martin
|
033027f360
|
modal sound events pandora_enterprise#9095
|
2022-07-04 17:09:30 +02:00 |
|
Daniel Barbero Martin
|
15363b1ac5
|
Merge remote-tracking branch 'origin/develop' into ent-9095-cambios-visuales-en-la-interfaz-consola-sonora-de-eventos
|
2022-07-04 09:12:10 +02:00 |
|
Daniel Barbero Martin
|
2dc16a2a19
|
modal sound events pandora_enterprise#9095
|
2022-07-01 13:08:39 +02:00 |
|
Jimmy Olano
|
2bf757a364
|
Merge branch 'ent-8252-12671-ordenar-campos-custom-fields-eventos' into 'develop'
Ent 8252 12671 ordenar campos custom fields eventos
https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8252
See merge request artica/pandorafms!4948
|
2022-07-01 11:01:57 +00:00 |
|
Daniel Barbero Martin
|
a92d50303d
|
fix color tabs and block histogram pandora_enterprise#8621
|
2022-06-30 14:09:29 +02:00 |
|
Daniel Barbero Martin
|
c2c519694a
|
size modal form widget pandora_enterprise#8621
|
2022-06-28 17:49:58 +02:00 |
|
José González
|
c3dc1d820d
|
Frontend changes
|
2022-06-28 17:24:49 +02:00 |
|
Daniel Barbero Martin
|
867c6a1415
|
Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard
Conflicts:
pandora_console/include/javascript/pandora.js
|
2022-06-28 17:02:01 +02:00 |
|
daniel
|
4ca27cd5a9
|
Merge branch 'ent-7960-filtros-de-alertas-sonoras-sound-events-2' into 'develop'
events sound pandora_enterprise#7960
See merge request artica/pandorafms!4923
|
2022-06-28 13:47:05 +00:00 |
|
Daniel Barbero Martin
|
1c051f88bc
|
Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2
Conflicts:
pandora_console/include/functions_events.php
|
2022-06-27 16:07:19 +02:00 |
|
Daniel Barbero Martin
|
3cdde5054a
|
size form widgets dashboards pandora_enterprise#8827
|
2022-06-27 15:43:42 +02:00 |
|
Daniel Barbero Martin
|
24305b40b0
|
Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard
Conflicts:
pandora_console/include/javascript/pandora.js
pandora_console/include/lib/Dashboard/Widget.php
pandora_console/include/styles/dashboards.css
|
2022-06-27 08:38:50 +02:00 |
|
Daniel Barbero Martin
|
f89aaabc21
|
minor fixed events
|
2022-06-23 18:06:25 +02:00 |
|
Daniel Barbero Martin
|
5328cf21c6
|
Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado
|
2022-06-23 12:51:35 +02:00 |
|
Daniel Rodriguez
|
d6ab78ba68
|
Merge branch 'ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion' into 'develop'
Ent 8912 problemas en recuperación alertas de evento necesaria refactorizacion
See merge request artica/pandorafms!4959
|
2022-06-23 07:53:11 +00:00 |