Daniel Rodriguez
|
f5a7dd40e9
|
Merge branch 'ent-10490-theme-base-de-tinymce' into 'develop'
Ent 10490 theme base de tinymce
See merge request artica/pandorafms!5649
|
2023-04-20 11:51:13 +00:00 |
|
Daniel Rodriguez
|
063dbf07d6
|
Merge branch 'ent-10564-15146-bug-en-comentarios-de-eventos' into 'develop'
fixed add commet event
See merge request artica/pandorafms!5672
|
2023-04-19 10:45:50 +00:00 |
Rafael Ameijeiras
|
852e7ae2a0
|
Merge branch 'ent-10714-mejoras-de-usabilidad-en-vista-de-inventario-export-csv' into 'develop'
Ent 10714 mejoras de usabilidad en vista de inventario export csv
See merge request artica/pandorafms!5726
|
2023-04-17 15:40:19 +00:00 |
Jonathan
|
cbf122f4c6
|
#10714 csv inventory button
|
2023-04-17 14:11:16 +02:00 |
Matias Didier
|
e4fd12f6de
|
Merge branch 'ent-10067-anadir-filtro-alerts-triggered-en-tree-view-y-widget-tree-view' into 'develop'
Ent 10067 anadir filtro alerts triggered en tree view y widget tree view
See merge request artica/pandorafms!5662
|
2023-04-17 11:06:10 +00:00 |
Pablo Aragon
|
0fa03f28b3
|
10067-Alerts triggered filter tree view
|
2023-04-16 20:21:29 +02:00 |
|
Matias Didier
|
250d65d94a
|
Merge branch 'ent-10740-mejoras-en-heatmap' into 'develop'
Ent 10740 mejoras en heatmap
See merge request artica/pandorafms!5660
|
2023-04-13 08:24:18 +00:00 |
daniel
|
b186d51329
|
fix icons pandora_enterprise#10909
|
2023-04-12 17:06:58 +02:00 |
Daniel Maya
|
cd030620b2
|
#10909 Fix icon group 4
|
2023-04-12 15:51:02 +02:00 |
|
daniel
|
ba1f299440
|
fixed add commet event
|
2023-04-10 10:35:47 +02:00 |
|
Pablo Aragon
|
5f6213f0f0
|
10863-Buttons Network maps
|
2023-04-05 14:15:23 +02:00 |
|
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 |
|
Daniel Maya
|
dc654c0b6d
|
#10740 heatmap improvements
|
2023-04-04 15:14:10 +02:00 |
|
Jonathan
|
000ab68327
|
#10490 TinyMCE Upgrade V6
|
2023-04-04 11:24:49 +02: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 |