Rafael Ameijeiras
|
cc2709c42c
|
Merge branch 'ent-10699-errores-en-los-mapas-varios' into 'develop'
Ent 10699 errores en los mapas varios
See merge request artica/pandorafms!5632
|
2023-04-05 06:47:31 +00:00 |
Jonathan
|
4aaddf063c
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-31 09:52:06 +02:00 |
|
Jonathan
|
93966788eb
|
Slides require mesage
|
2023-03-31 09:51:48 +02:00 |
Daniel Cebrian
|
f442272177
|
Merge branch 'develop' into ent-10633-pantalla-de-timeout
|
2023-03-30 09:30:38 +02:00 |
|
Daniel Cebrian
|
b9fc352578
|
merge develop into ent-10633-pantalla-de-timeout
|
2023-03-30 09:15:10 +02:00 |
|
Jonathan
|
ee0619cc4a
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-29 16:50:25 +02:00 |
|
Jonathan
|
8c3b5d650d
|
tree view dashboard metaconsole
|
2023-03-29 16:50:17 +02:00 |
Pablo Aragon
|
2b121a2fd2
|
New qrcode.js version & vcard
|
2023-03-29 15:34:03 +02:00 |
Daniel Maya
|
490e547202
|
#10699 Fixed central node
|
2023-03-28 11:03:59 +02:00 |
daniel
|
3d815d56c8
|
fixed styles
|
2023-03-28 08:45:40 +02:00 |
|
daniel
|
4e01838238
|
fixed styles
|
2023-03-28 08:43:46 +02:00 |
Diego Muñoz-Reja
|
6bdecc43e7
|
Merge branch 'ent-8642-nuevo-widget-heatmap' into 'develop'
Ent 8642 nuevo widget heatmap
See merge request artica/pandorafms!5557
|
2023-03-27 10:43:48 +00:00 |
|
Pablo Aragon
|
95edb47d01
|
10408
|
2023-03-24 12:29:03 +01:00 |
|
daniel
|
95834b2de7
|
fixed styles
|
2023-03-23 12:41:39 +01:00 |
|
Daniel Maya
|
52231615f6
|
Merge branch 'develop' into ent-8642-nuevo-widget-heatmap
|
2023-03-23 11:51:54 +01:00 |
|
Pablo Aragon
|
904b526b30
|
Change pass login. Graph tree view width
|
2023-03-22 11:23:07 +01:00 |
|
Daniel Cebrian
|
bb794d603b
|
fixed button create tips and icon remove
|
2023-03-17 09:13:00 +01:00 |
|
Jonathan
|
c219ad91c7
|
Visual minor fix
|
2023-03-17 08:53:58 +01:00 |
|
Daniel Cebrian
|
f8f65bf5a1
|
fixed icon size
|
2023-03-16 17:26:48 +01:00 |
|
Daniel Cebrian
|
20b177d121
|
changed in welcome tips forms
|
2023-03-16 17:23:48 +01:00 |
|
daniel
|
a22b5479d9
|
fixed styles
|
2023-03-16 16:48:03 +01:00 |
|
Pablo Aragon
|
bed1e34fd2
|
Dashboards widgets
|
2023-03-15 15:58:28 +01:00 |
|
Daniel Cebrian
|
1b0477bd1f
|
Merge branch 'develop' into ent-10633-pantalla-de-timeout
|
2023-03-15 09:06:00 +01:00 |
|
daniel
|
cec81f1cc2
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
Conflicts:
pandora_console/extras/mr/62.sql
|
2023-03-14 18:17:54 +01:00 |
|
Jonathan
|
f9fe35e0c3
|
log viewer and sort reporting
|
2023-03-14 17:28:17 +01:00 |
|
Daniel Cebrian
|
d315d4cda7
|
#10633 added token for control check conexion interval
|
2023-03-14 13:16:58 +01:00 |
|
Daniel Maya
|
62d1249fe0
|
#8642 Added heatmap widget 4
|
2023-03-14 12:47:10 +01:00 |
|
Daniel Cebrian
|
e36bb1d065
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-14 08:36:12 +01:00 |
|
daniel
|
d092495482
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-13 19:31:26 +01:00 |
|
daniel
|
c96ac79726
|
fixed styles
|
2023-03-13 19:30:51 +01:00 |
|
Diego Muñoz-Reja
|
fa2918e8ed
|
Merge branch 'ent-10229-AXITY-Update-jquery-para-solventar-vulnerabilidades' into 'develop'
updated jquery-ui library
See merge request artica/pandorafms!5564
|
2023-03-13 16:03:04 +00:00 |
|
Daniel Cebrian
|
dfa2ab818e
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-13 08:53:35 +01:00 |
|
daniel
|
dcfaaea016
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-10 14:50:31 +01:00 |
Jose Gonzalez
|
a065833117
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-10 12:48:50 +01:00 |
|
Jose Gonzalez
|
dc216ff788
|
Tree view black
|
2023-03-10 12:47:44 +01:00 |
|
daniel
|
3be507ca7e
|
fixed styles
|
2023-03-10 12:40:21 +01:00 |
|
Daniel Cebrian
|
841478a86c
|
Merge branch 'develop' into 'ent-9073-nuevo-sistema-de-tips-de-bienvenida'
# Conflicts:
# pandora_console/pandoradb.sql
|
2023-03-10 10:41:08 +00:00 |
|
Pablo Aragon
|
ae6159c7a1
|
Events
|
2023-03-10 08:40:38 +01:00 |
|
daniel
|
9aa5d76963
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-09 20:00:32 +01:00 |
|
daniel
|
63d83b3f97
|
fixed styles
|
2023-03-09 11:25:43 +01:00 |
Rafael Ameijeiras
|
857c84f034
|
Merge branch 'ent-10359-GUARDIA-15007-No-se-visualizan-agentes-deshabilitados-en-operaciones-masivas-en-meta-sin-usar-opcion-Show-agents' into 'develop'
fixed error in massive agent operations in metaconsole
See merge request artica/pandorafms!5527
|
2023-03-09 08:08:58 +00:00 |
|
Daniel Cebrian
|
6efa1f46d7
|
#10324 fixed conflic wit tickets 10325
|
2023-03-08 16:01:50 +01:00 |
|
Jonathan
|
91a708dfb8
|
SNMP Browser and agent module SNMP walk
|
2023-03-08 13:41:00 +01:00 |
|
Daniel Cebrian
|
11250bd59b
|
Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida
|
2023-03-08 13:00:18 +01:00 |
|
Daniel Cebrian
|
3ec11f4c9d
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-08 12:55:53 +01:00 |
|
Daniel Cebrian
|
27005158ba
|
#9073 resolve conflics and bugs
|
2023-03-07 17:57:09 +01:00 |
|
daniel
|
1ba420a9ce
|
fixed styles
|
2023-03-07 16:22:13 +01:00 |
|
Pablo Aragon
|
3ecbf1e4fa
|
Alerts
|
2023-03-07 16:17:01 +01:00 |
|
Daniel Cebrian
|
a4634717d8
|
Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida
|
2023-03-07 13:49:39 +01:00 |
|
Jose Gonzalez
|
d0f2f7a9c1
|
TreeController fixed
|
2023-03-07 09:48:23 +01:00 |