marcos
|
063bbb4433
|
resolved conflict merge
|
2021-03-30 11:31:29 +02:00 |
fbsanchez
|
c3232b0f2a
|
Merge remote-tracking branch 'origin/develop' into ent-7010-nexcon-mejoras-widget-de-eventos
Conflicts:
pandora_console/include/class/ConsoleSupervisor.php
|
2021-03-24 09:55:31 +01:00 |
marcos
|
b6a7598c33
|
fixed visual error
|
2021-03-18 09:53:39 +01:00 |
Marcos Alconada
|
d8a628b1c4
|
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins
|
2021-03-11 14:40:23 +00:00 |
fbsanchez
|
0be3e0ab90
|
Event widget and some notices fixed
|
2021-02-10 15:00:23 +01:00 |
Daniel Rodriguez
|
ea86889673
|
Merge branch 'ent-6645-bug-acl-discovery-tasks' into 'develop'
Fixed acl on discovery tasklist
See merge request artica/pandorafms!3618
|
2021-01-14 14:43:42 +01:00 |
fbsanchez
|
186b807ff7
|
Merge remote-tracking branch 'origin/develop' into ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery
Conflicts:
pandora_console/include/styles/wizard.css
|
2021-01-07 10:50:57 +01:00 |
fbsanchez
|
54d5529599
|
removed duplicated methods (unified in HTML class) added minor improvements
|
2020-11-30 17:50:36 +01:00 |
Jose Gonzalez
|
649442f794
|
Updated copyrights
|
2020-11-27 13:52:35 +01:00 |
Jose Gonzalez
|
ed1b8f9713
|
Fix some bugs and added surround input feature
|
2020-11-24 15:51:02 +01:00 |
Luis Calvo
|
2ee187ae53
|
Fixed acl on discovery tasklist
|
2020-11-16 18:30:23 +01:00 |
Daniel Maya
|
bde52df2e8
|
Added datalist for target ip
|
2020-10-30 13:25:33 +01:00 |
fbsanchez
|
45a161426b
|
Services review
|
2020-06-24 18:01:34 +02:00 |
fbsanchez
|
f3d9f2d75e
|
Cluster view RC1
|
2020-05-22 13:13:19 +02:00 |
fbsanchez
|
523212afb8
|
WIP cluster view
|
2020-05-20 19:04:42 +02:00 |
fbsanchez
|
57ccd783b0
|
Merge branch 'develop' into 'ent-5756-pantallas-de-configuracion-del-cluster'
|
2020-05-14 17:42:58 +02:00 |
Jose Gonzalez
|
75de601f57
|
Forms modified for be able add raw inputs
|
2020-03-27 08:51:17 +01:00 |
Jose Gonzalez
|
28cdbf1409
|
Added rawInputs for forms construtor
|
2020-03-23 15:15:44 +01:00 |
fbsanchez
|
f58276ddbb
|
Templates
|
2020-03-18 19:31:58 +01:00 |
fbsanchez
|
b860c49383
|
target selections
|
2020-03-17 18:34:30 +01:00 |
fbsanchez
|
f3da919abc
|
WIP multiple changes
|
2020-03-16 23:52:20 +01:00 |
Daniel Barbero
|
a933a091ea
|
styles fixed
|
2020-01-09 12:07:19 +01:00 |
Daniel Barbero
|
2a92c9d38d
|
Fixed errors VC forms
|
2019-12-17 10:57:19 +01:00 |
fbsanchez
|
79dca2fe6b
|
Php OO form load
|
2019-10-02 18:37:50 +02:00 |