daniel
|
8230ae616b
|
Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
pandora_console/godmode/users/user_list.php
pandora_console/operation/events/events.php
|
2023-02-22 12:35:34 +01:00 |
Pablo Aragon
|
e7d6afd636
|
10488-Fix views reports
|
2023-02-22 10:35:33 +01:00 |
|
Pablo Aragon
|
95fb797a7e
|
10488-Fix views reports
|
2023-02-22 10:33:45 +01:00 |
Jonathan
|
05c2232daa
|
Modals dashboard view fix
|
2023-02-21 17:07:03 +01:00 |
|
Pablo Aragon
|
57a6bf97b0
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-21 11:28:36 +01:00 |
|
Pablo Aragon
|
7ac794f5ff
|
10469-Fix omnishell view
|
2023-02-21 11:28:26 +01:00 |
|
Jonathan
|
005fbd27c1
|
Tree view meta fix
|
2023-02-21 11:20:17 +01:00 |
Jose Gonzalez
|
98bd383141
|
Minor html and ui improvements
|
2023-02-20 11:49:54 +01:00 |
|
Jonathan
|
f557309238
|
Button ok mesage too much agents
|
2023-02-16 09:09:40 +01:00 |
Daniel Maya
|
cac9f67153
|
#10195 Fixed minimap drawing
|
2023-02-15 10:49:31 +01:00 |
|
Jose Gonzalez
|
d6eedf07aa
|
Merge
|
2023-02-13 10:03:09 +01:00 |
Rafael Ameijeiras
|
616644c3cf
|
Merge branch 'ent-10189-mejora-visual-para-el-boton-de-testeo-de-alertas-consola-sonora' into 'develop'
blink button test sound events pandora_enterprise#10189
See merge request artica/pandorafms!5470
|
2023-02-10 08:01:34 +00:00 |
Daniel Cebrian
|
ea789804f4
|
#10190 fixed response option
|
2023-02-07 17:41:27 +01:00 |
|
Daniel Cebrian
|
6117e1741f
|
#10190 added popup for edit events in sound console
|
2023-02-07 16:48:23 +01:00 |
|
Jose Gonzalez
|
bd26aa8f8d
|
Minor fixes
|
2023-02-01 15:31:02 +01:00 |
|
Jose Gonzalez
|
0363a90e1f
|
Resolve merge issues
|
2023-01-31 17:35:44 +01:00 |
|
Jonathan
|
f0d20a5775
|
#10153 indexof pandora visual console
|
2023-01-31 10:47:31 +01:00 |
|
Jonathan
|
89442c3ef9
|
#10153 regenerate build:watch
|
2023-01-30 17:06:24 +01:00 |
|
Jose Gonzalez
|
6496c08f28
|
Polish TreeView
|
2023-01-30 13:39:27 +01:00 |
|
Rafael Ameijeiras
|
4984599132
|
Merge branch 'ent-9175-13829-visualizacion-de-contrasenas-en-texto-plano-dentro-del-inspector-onenet-pakistan' into 'develop'
Ent 9175 13829 visualizacion de contrasenas en texto plano dentro del inspector onenet pakistan
See merge request artica/pandorafms!5392
|
2023-01-30 11:24:39 +00:00 |
|
Jonathan
|
b48cd3ff73
|
#10153 refresh visual console maintenanceMode
|
2023-01-30 10:48:10 +01:00 |
|
Jonathan
|
be6c3e1602
|
#10153 refresh visual console maintenanceMode
|
2023-01-30 09:51:12 +01:00 |
|
daniel
|
69db3c8031
|
blink button test sound events pandora_enterprise#10189
|
2023-01-27 12:44:15 +01:00 |
|
Jose Gonzalez
|
deb69a0659
|
Fix issue with info box messages
|
2023-01-26 16:00:08 +01:00 |
|
Jose Gonzalez
|
17c0e78d06
|
Improve TreeView
|
2023-01-26 13:25:24 +01:00 |
|
daniel
|
ddebce7a3c
|
fix validate events pandora_enterprise#10175
|
2023-01-25 11:25:20 +01:00 |
|
Jose Gonzalez
|
6f4b55e076
|
WIP: TreeView improve
|
2023-01-19 23:26:26 +01:00 |
|
Jose Gonzalez
|
8510629781
|
Treeview improvement
|
2023-01-19 00:31:11 +01:00 |
|
Daniel Maya
|
04e039c515
|
resolved conflict
|
2023-01-18 11:31:26 +01:00 |
|
Daniel Maya
|
0f42a5fa88
|
#9783 Fixed networkmap 4
|
2023-01-18 11:29: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 |
|
Pablo Aragon
|
72acbae5a6
|
Hide module password value
|
2023-01-10 10:23:09 +01:00 |
Enrique Martin
|
f8e3353836
|
Merge branch 'ent-9787-14480-ventana-de-informacion-de-evento-no-se-actualiza-estado-en-la-pestana-general' into 'develop'
Ent 9787 14480 ventana de informacion de evento no se actualiza estado en la pestana general
See merge request artica/pandorafms!5379
|
2023-01-05 11:50:48 +00:00 |
|
Jonathan
|
e55d4f3019
|
#9787 Alert general Acknowledged recovery
|
2023-01-05 10:36:14 +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 |
|
Daniel Cebrian
|
49ebd5b576
|
fixed visual bug in calendar
|
2023-01-03 17:31:28 +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 |
|
Pablo Aragon
|
ab54a26815
|
9868 Remove footer and create About section
|
2022-12-29 16:21:36 +01:00 |
|
Rafael Ameijeiras
|
fa034e4ae2
|
Merge branch 'ent-9664-14349-modulos-pendingdelete-se-muestran-en-el-selector-de-modulos-en-paradas-planificadas' into 'develop'
Ent 9664 14349 modulos pendingdelete se muestran en el selector de modulos en paradas planificadas
See merge request artica/pandorafms!5359
|
2022-12-28 09:42:23 +00:00 |
|
Pablo Aragon
|
bbdc5b3e93
|
9664 Exclude pendingdelete modules from scheduled downtime
|
2022-12-27 15:22:39 +01:00 |
|
daniel
|
69e3203317
|
Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3
|
2022-12-27 09:06:20 +01:00 |
|
daniel
|
5907d55ec1
|
phpchartjs pandora_enterprise#9554
|
2022-12-22 23:03:52 +01:00 |
|
Pablo Aragon
|
78c4f15c16
|
9994 Add trigger to id_module_group
|
2022-12-21 12:56:26 +01:00 |
|
daniel
|
47c503bdab
|
Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3
|
2022-12-21 12:51:18 +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 |
alejandro.campos@artica.es
|
11c4319dd7
|
added link to node name
|
2022-12-16 11:19:23 +01:00 |
|
alejandro.campos@artica.es
|
69631da08a
|
added link to node name
|
2022-12-16 11:17:47 +01:00 |
|
alejandro.campos@artica.es
|
38d279581a
|
added link to node name
|
2022-12-16 11:09:04 +01:00 |
|
Daniel Barbero
|
62aea35d7b
|
fixed js render
|
2022-12-16 10:38:37 +01:00 |