tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,890 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

26890 Commits

Author SHA1 Message Date
Daniel Rodriguez 390d9df706 Merge branch 'ent-7173-Iconos-de-creacion-de-items-en-consolas-visuales-apenas-se-ven' into 'develop' 
fixed visuals errors black theme

See merge request artica/pandorafms!3937
 2021-03-22 12:48:39 +00:00
Daniel Rodriguez 8f33c767b7 Merge branch 'ent-7132-bug-en-vista-agents-alerts' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3911
 2021-03-22 12:46:58 +00:00
Daniel Rodriguez 8db123d364 Merge branch 'ent-7180-spinner-de-snmp-browere-ha-desaparecido' into 'develop' 
fixed spinner bug

See merge request artica/pandorafms!3933
 2021-03-22 12:46:02 +00:00
Daniel Rodriguez a7b19bd347 Merge branch 'ent-6865-uniway-funcionalidad-password-en-grupos-no-compatible-con-discovery-plugins-xml' into 'develop' 
Ent 6865 uniway funcionalidad password en grupos no compatible con discovery plugins xml

See merge request artica/pandorafms!3761
 2021-03-22 12:39:59 +00:00
fbsanchez e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
 2021-03-22 09:59:07 +01:00
artica 49e7ba7312 Auto-updated build strings. 2021-03-22 01:00:10 +01:00
artica 2dcc0cf9ee Auto-updated build strings. 2021-03-21 01:00:09 +01:00
artica db007bc0cf Auto-updated build strings. 2021-03-20 01:00:09 +01:00
artica 3a384dae0a Auto-updated build strings. 2021-03-19 01:00:13 +01:00
marcos ebf912437b fixed error with sort function 2021-03-18 18:05:53 +01:00
Daniel Rodriguez da4c5a1c28 Merge branch 'ent-7167-meta-varios-botones-y-ventanas-descuadradas' into 'develop' 
fixed visual errors

See merge request artica/pandorafms!3925
 2021-03-18 17:05:50 +00:00
Marcos Alconada 04bae1b4fb fixed visual errors 2021-03-18 17:05:50 +00:00
Daniel Barbero Martin 6d6b9fe5b9 fixed visuals errors black theme 2021-03-18 17:32:21 +01:00
Daniel Rodriguez 8eb06d8adc Merge branch 'ent-6753-consistencia-en-el-selector-de-grupos' into 'develop' 
group selector updates for report, required

See merge request artica/pandorafms!3763
 2021-03-18 16:05:16 +00:00
Daniel Rodriguez 3eaff54b73 Merge branch 'ent-6232-nt-incluir-metricas-en-el-wizard-de-interfaces-snmp' into 'develop' 
Ent 6232 nt incluir metricas en el wizard de interfaces snmp

See merge request artica/pandorafms!3935
 2021-03-18 16:02:56 +00:00
Daniel Rodriguez 0082e818a0 Merge branch 'ent-6852-integrar-edicion-de-sistema-de-credencial-boxes-con-edicion-de-coniguracion-del-satelite-en-la-misma-vista' into 'develop' 
Ent 6852 integrar edicion de sistema de credencial boxes con edicion de coniguracion del satelite en la misma vista

See merge request artica/pandorafms!3758
 2021-03-18 16:00:14 +00:00
Daniel Maya 6a9dff3355 Ent 6852 integrar edicion de sistema de credencial boxes con edicion de coniguracion del satelite en la misma vista 2021-03-18 16:00:14 +00:00
marcos bfaaba9dbd fixed spinner bug 2021-03-18 12:08:02 +01:00
fbsanchez ddb58f56e9 errata fix 2021-03-18 11:48:52 +01:00
marcos b55ebd69f0 fixed visual error 2021-03-18 11:30:53 +01:00
marcos 82d435c295 fixed visual error 2021-03-18 11:05:40 +01:00
Daniel Rodriguez c2f297c26a Merge branch 'ent-6574-mensaje-borrado-agentes-meta' into 'develop' 
Fixed api agent delete and show correct message when called by meta wizard

See merge request artica/pandorafms!3892
 2021-03-18 10:01:22 +00:00
Luis 085b5ece87 Fixed api agent delete and show correct message when called by meta wizard 2021-03-18 10:01:21 +00:00
Daniel Rodriguez cb1da6d7ba Merge branch 'ent-7062-vulneravilidad-xx-en-mensajes' into 'develop' 
fixed xss vulnerability

See merge request artica/pandorafms!3861
 2021-03-18 10:00:35 +00:00
Marcos Alconada 9040e832b8 fixed xss vulnerability 2021-03-18 10:00:34 +00:00
Daniel Rodriguez de175ec755 Merge branch 'ent-7081-snmp-wizard-con-muchas-interfaces-da-error-de-php' into 'develop' 
POST/GET reloaded if empty in ajax

See merge request artica/pandorafms!3867
 2021-03-18 09:59:55 +00:00
Daniel Rodriguez 9c4a6a56c7 Merge branch 'ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle' into 'develop' 
add discovery_app_microsoft_sql_serve on task list

See merge request artica/pandorafms!3058
 2021-03-18 09:56:31 +00:00
marcos bac8b98ad2 fixed visual error 2021-03-18 10:48:44 +01:00
fbsanchez 38695482c0 Validate custom text 2021-03-18 10:35:41 +01:00
marcos 13575a457c fixed visual error 2021-03-18 10:35:19 +01:00
fbsanchez a3069fdf76 Merge remote-tracking branch 'origin/develop' into ent-6753-consistencia-en-el-selector-de-grupos 2021-03-18 10:04:18 +01:00
marcos a0607e7230 fixed visual error 2021-03-18 10:03:52 +01:00
marcos b6a7598c33 fixed visual error 2021-03-18 09:53:39 +01:00
artica 572f8c9908 Auto-updated build strings. 2021-03-18 01:00:22 +01:00
Daniel Rodriguez 1729e158ca Merge branch 'ent-7152-iconos-de-flecha-descolacos-en-edit-my-user' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3928
 2021-03-17 16:31:34 +00:00
Daniel Rodriguez b6b399e635 Merge branch 'ent-7170-color-de-icono-de-alertas-en-tree-view-black-theme' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3926
 2021-03-17 16:29:41 +00:00
Daniel Rodriguez 372d367b8e Merge branch 'ent-6760-interfaces-con-guion-nombre-no-generan-correctamente' into 'develop' 
Fixed interfaces wizard modules genartion wit hypen

See merge request artica/pandorafms!3694
 2021-03-17 16:29:07 +00:00
Luis e667bdd2e8 Fixed interfaces wizard modules genartion wit hypen 2021-03-17 16:29:07 +00:00
Daniel Barbero Martin edb2dfb2fc Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-17 17:28:52 +01:00
Daniel Barbero Martin 5302f2b543 WIP command center 2021-03-17 17:28:32 +01:00
marcos e8e9b61d32 fixed visual error 2021-03-17 16:44:57 +01:00
marcos 667ccd50ce fixed visual error 2021-03-17 16:44:10 +01:00
Daniel Rodriguez 0c99745c37 Merge branch 'ent-6894-uniway-estado-pending-en-server-task-aws' into 'develop' 
Task list status

See merge request artica/pandorafms!3759
 2021-03-17 15:41:14 +00:00
Daniel Rodriguez 3eb6a8b3c4 Merge branch 'ent-7125-bug-visual-en-group-view' into 'develop' 
fixed visual error group view

See merge request artica/pandorafms!3897
 2021-03-17 15:22:01 +00:00
marcos 0195a80b78 fixed visual error 2021-03-17 14:41:36 +01:00
fbsanchez 61cb8a43c6 Merge remote-tracking branch 'origin/develop' into ent-6894-uniway-estado-pending-en-server-task-aws 
Conflicts:
	pandora_console/godmode/wizards/DiscoveryTaskList.class.php
 2021-03-17 13:25:38 +01:00
marcos 1ea562fe17 fixed visual error 2021-03-17 13:22:11 +01:00
fbsanchez 71a0dcfd0c Merge remote-tracking branch 'origin/develop' into ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle 
Conflicts:
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Recon/Base.pm
 2021-03-17 10:11:58 +01:00
Daniel Barbero Martin 6ec4b0cf98 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-17 08:47:45 +01:00
artica 610d41290e Auto-updated build strings. 2021-03-17 01:00:20 +01:00