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

5587 Commits

Author SHA1 Message Date
marcos 3934096d03 Merge remote-tracking branch 'origin/develop' into ent-7202-fallos-visuales-discovery 2021-03-29 09:21:04 +02:00
Daniel Rodriguez 812007169d Merge branch 'ent-7209-boton-new-ayer-en-creacion-edicion-gis-maps-no-funciona' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3969
 2021-03-26 13:52:44 +00:00
Marcos Alconada 9dd17acb57 fixed visual error 2021-03-26 13:40:55 +00:00
marcos 56462b1b06 fixed visual error 2021-03-26 14:32:29 +01:00
Daniel Rodriguez 48b299ba67 Merge branch 'ent-7228-Errores-en-las-Visual-consoles-de-Metaconsola' into 'develop' 
fixed minor error

See merge request artica/pandorafms!3967
 2021-03-26 13:05:28 +00:00
Daniel Rodriguez dff3ef3484 Merge branch 'ent-7223-error-message-update-manager-offline' into 'develop' 
Restored not update error message on update manager offline

See merge request artica/pandorafms!3965
 2021-03-26 12:35:57 +00:00
Daniel Barbero Martin 487a9b96d9 fixed minor error 2021-03-26 13:25:42 +01:00
Calvo 887742a675 Restored not update error message on update manager offline 2021-03-26 13:02:55 +01:00
Calvo 2c86e3e26c Substituted eye with operation (magnifier) icon on credential store and tasklist 2021-03-26 12:20:37 +01:00
Marcos Alconada 3d350ba481 fixed visual error 2021-03-26 09:32:30 +00:00
Daniel Rodriguez 6413f6d551 Merge branch 'ent-4755-base-de-datos-historico-revision' into 'develop' 
DBMainainer, fixed Websockets library placement

See merge request artica/pandorafms!3797
 2021-03-25 14:33:31 +00:00
Daniel Rodriguez 29e7e3c844 Merge branch 'ent-7196-tabla-de-list-sla-no-se-muestra' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3946
 2021-03-25 11:55:33 +00:00
marcos 823bf52372 fixed visual error 2021-03-25 11:49:32 +01:00
fbsanchez fdc4133eaa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-25 10:20:02 +01:00
Daniel Maya 79914082e9 Ent 6850 quitar nta 2021-03-24 15:16:13 +00:00
marcos 90c825888a fixed visual error 2021-03-23 15:12:57 +01: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
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 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 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
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
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
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
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 Rodriguez 2c05a1fe72 Merge branch 'ent-7164-iconos-cambiados-en-varias-vistas' into 'develop' 
fixed icons

See merge request artica/pandorafms!3923
 2021-03-16 17:01:35 +00:00
Daniel Rodriguez aa1e5022a2 Merge branch 'ent-7126-recuperar-selector-de-temas-en-setup-visual' into 'develop' 
revert selector theme

See merge request artica/pandorafms!3915
 2021-03-16 16:49:43 +00:00
Daniel Rodriguez 4bf47eaa35 Merge branch 'ent-7145-boton-de-borrado-de-items-desplazado-en-lista-de-informes' into 'develop' 
fixed position

See merge request artica/pandorafms!3909
 2021-03-16 16:47:54 +00:00
Daniel Rodriguez 9e2d774d8f Merge branch 'ent-7148-estilos-rotos-en-varios-botones-de-custom-graphs-de-informes' into 'develop' 
fixed visual style error

See merge request artica/pandorafms!3905
 2021-03-16 16:47:26 +00:00
Daniel Rodriguez 7d4f6de646 Merge branch 'ent-7162-Botones-descolocados-en-remote-components' into 'develop' 
fixed errors visual

See merge request artica/pandorafms!3920
 2021-03-16 16:45:30 +00:00
Daniel Rodriguez e59600c10b Merge branch 'ent-7151-errores-visuales-en-manage-agents-modo-details' into 'develop' 
Ent 7151 errores visuales en manage agents modo details

See merge request artica/pandorafms!3922
 2021-03-16 16:44:40 +00:00
Daniel Rodriguez 989e6441d8 Merge branch 'ent-6868-massive-operations-snmp-modules' into 'develop' 
Fixed snmpv3 options on modules massive op

See merge request artica/pandorafms!3739
 2021-03-16 16:41:54 +00:00
Luis 6bb6f1121b Fixed snmpv3 options on modules massive op 2021-03-16 16:41:54 +00:00
marcos e689813e2c fixed icons 2021-03-16 13:37:13 +01:00
marcos f05592faeb fixed error 2021-03-16 13:12:03 +01:00
Daniel Rodriguez f880e0632d Merge branch 'ent-7137-error-en-merge-reporting-builder-y-policy-agents' into 'develop' 
resolved merge conflict

See merge request artica/pandorafms!3900
 2021-03-16 11:52:55 +00:00
Daniel Barbero Martin fd1c885e2f fixed errors visual 2021-03-16 12:06:59 +01:00
marcos f765493ce7 revert selector theme 2021-03-16 11:24:05 +01:00
marcos bd4cad3c83 fixed position 2021-03-15 16:28:30 +01:00
marcos 137a2c31ad fixed visual fails 2021-03-15 15:30:56 +01:00
marcos 95787e2fe8 fixed visual style error 2021-03-15 14:38:20 +01:00
Daniel Maya e4e3007def Fixed img 2021-03-15 13:32:25 +01:00
Daniel Rodriguez 971f86601a Merge branch 'ent-5276-AADCM-creacion-de-paradas-planificadas' into 'develop' 
Refactored downtime editor

See merge request artica/pandorafms!3879
 2021-03-15 11:29:04 +00:00
alejandro.campos@artica.es 88b4b4920f Merge remote-tracking branch 'origin/develop' into ent-5276-AADCM-creacion-de-paradas-planificadas 2021-03-15 12:13:05 +01:00
marcos 09e94bd0e9 resolved merge conflict 2021-03-15 11:43:36 +01:00
Daniel Rodriguez 5bae2be954 Merge branch 'ent-6898-Integracion-integria-en-pandora' into 'develop' 
Ent 6898 integracion integria en pandora

See merge request artica/pandorafms!3898
 2021-03-12 13:18:25 +00:00
alejandro.campos@artica.es b4927d6071 minor fix 2021-03-12 12:46:27 +01:00
alejandro.campos@artica.es 3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
Jose Gonzalez 6a427cfa8a Fixed 2021-03-12 11:09:34 +01:00
Jose Gonzalez 5b1517f767 Merge 2021-03-12 11:07:44 +01:00