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

26555 Commits

Author SHA1 Message Date
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
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
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
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
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 6745fb7c7a Merge branch 'ent-7150-Bug-en-edicion-de-dashboard' into 'develop' 
fixed visual error dashboards

See merge request artica/pandorafms!3908
 2021-03-16 16:46:38 +00:00
Daniel Rodriguez d933fd224d Merge branch 'ent-7154-estilos-rotos-en-attached-fies-en-la-vista-de-integria' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3910
 2021-03-16 16:46:14 +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 24f9ce7acf Merge branch 'ent-7160-SNMP-Browser-no-saca-las-opciones-de-v3' into 'develop' 
fixed errors visual snmp browser

See merge request artica/pandorafms!3918
 2021-03-16 16:42:51 +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
Daniel Rodriguez 128fabfde2 Merge branch 'ent-6648-Añadir-agentes-a-politicas-metaconsola' into 'develop' 
Ent 6648 añadir agentes a politicas metaconsola

See merge request artica/pandorafms!3912
 2021-03-16 16:41:13 +00:00
Daniel Rodriguez 8715cbceaf Merge branch 'ent-6984-server-log-permissions' into 'develop' 
adding permissions to apache group

See merge request artica/pandorafms!3877
 2021-03-16 16:39:48 +00:00
marcos df8695b015 fix green old theme 2021-03-16 16:25:09 +01:00
Daniel Rodriguez 785fa8f076 Merge branch 'ent-7067-agent-docker-change' into 'develop' 
change agent docker image to centos7

See merge request artica/pandorafms!3862
 2021-03-16 13:46:07 +00:00
Daniel Rodriguez 355af43c0c Merge branch 'ent-6918-giss-el-agente-unix-no-obtiene-la-ip-del-equipo-en-sistemas-solaris-y-aix' into 'develop' 
List IP address pandora_agent (AIX/*Nix)

See merge request artica/pandorafms!3768
 2021-03-16 12:38:53 +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
Daniel Barbero Martin e4a6c8c876 fixed errors visual snmp browser 2021-03-16 11:44:44 +01:00
marcos f765493ce7 revert selector theme 2021-03-16 11:24:05 +01:00
Daniel Rodriguez eea114e3d1 Merge branch 'ent-7119-Ticket-GUARDIA-SNMPBrowser-falla-a-la-hora-de-visualizar-datos-2' into 'develop' 
Ent 7119 ticket guardia snmp browser falla a la hora de visualizar datos 2

See merge request artica/pandorafms!3903
 2021-03-16 09:13:44 +00:00
Daniel Rodriguez cb6bb195b5 Merge branch 'ent-5700-traza-ejecucion-pandora-db-tgraph-source' into 'develop' 
Added log on deleting tgraph_source data in pandora_db

See merge request artica/pandorafms!3721
 2021-03-16 09:13:00 +00:00
alejandro.campos@artica.es 75d57c41ac remove constant 2021-03-16 09:22:43 +01:00
alejandro.campos@artica.es 8dc6ec4e07 added setup token 2021-03-16 09:21:16 +01:00
artica df269f52c1 Auto-updated build strings. 2021-03-16 01:00:18 +01:00
marcos 03cb6ef913 fixed visual error 2021-03-15 17:05:34 +01:00
marcos bd4cad3c83 fixed position 2021-03-15 16:28:30 +01:00
Daniel Barbero Martin 2b8b27a863 fixed visual error dashboards 2021-03-15 15:42:22 +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 Barbero Martin 505e724384 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-15 08:19:32 +01:00
artica fc29160c91 Auto-updated build strings. 2021-03-15 01:00:15 +01:00
artica 0f848d48e8 Auto-updated build strings. 2021-03-14 01:00:14 +01:00
artica 5fca622b3b Auto-updated build strings. 2021-03-13 01:00:19 +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