tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
21,392 Commits 34 Branches 30 Tags
Commit Graph

21392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
slerena
9b51928e35 Added HTML edit feature, needed because TinyEdit adds lot's of HTML and is not practical. You need to edit the contents in HTML. Is not a security issue, because only admin can edit this news contents. 
Former-commit-id: 4039346ffe4fc2628f515b4cdaeaf1655377e74b
 2019-05-09 16:01:51 +02:00
Daniel Maya
dab12ecdc5 Fixed error window in visual console 
Former-commit-id: 97def5509195b687a1607810043076e58dd72fe0
 2019-05-09 15:06:03 +02:00
marcos.alconada
e0729b6ca6 Se vuelve a crear la rama 
Former-commit-id: 8ac69d4e1d15be23411faff82dc2bddcfcf7f7b6
 2019-05-09 14:59:47 +02:00
Daniel Rodriguez
c775d0359c Merge branch 'ent-3973-al-hacer-update-de-un-comando-persiste-valor-antiguo-de-los-campos-al-refrescar-la-vista' into 'develop' 
Show new values after update

See merge request artica/pandorafms!2405

Former-commit-id: aa2b2a4857e47a4999ef9ca42f6ba1b59fa9d714
 2019-05-09 14:36:51 +02:00
manuel
143def5d87 Added helps 2019-05-09 13:43:53 +02:00
Daniel Rodriguez
7c3e883c01 Merge branch 'ent-3770-texto-del-pandora-diag' into 'develop' 
Ent 3770 texto del pandora diag

Closes pandora_enterprise#3529, pandora_enterprise#1744, pandora_enterprise#3305, pandora_enterprise#3121, and pandora_enterprise#3252

See merge request artica/pandorafms!2393

Former-commit-id: d78409acd362ebc5308495c359344f5b706685cd
 2019-05-09 13:01:28 +02:00
Daniel Maya
c2b8ad22d3 Added cache_expiration in builder items 2019-05-09 12:44:58 +02:00
Tatiana Llorente
fd83540ad5 New menu module graph for interface modules- #3617 2019-05-09 12:39:03 +02:00
Alejandro Fraguas
0aa8bcda30 Merge branch 'ent-3758-7777-bug-validacion-eventos-en-consola' into 'develop' 
Pending to review

See merge request artica/pandorafms!2295
 2019-05-09 11:56:29 +02:00
Daniel Rodriguez
c7c7a8457f Merge branch 'ent-3952-6601-aadcm-fallo-visual-en-pdf-report-sla-semanal' into 'develop' 
fixed errors pdf SLA Weekly

See merge request artica/pandorafms!2410
 2019-05-09 11:05:54 +02:00
Tatiana Llorente
ef45fc3ca6 Merge remote-tracking branch 'origin/develop' into ent-3617-Gráfica-de-módulos 2019-05-09 10:44:31 +02:00
marcos.alconada
23b3d07f37 Merge remote-tracking branch 'origin/develop' into ent-3925-eliminar-custom-response-deprecated 2019-05-09 09:29:27 +02:00
Tatiana Llorente
f5114918b5 Unify the styles of Discovery with Pandora - #4004 2019-05-09 08:45:55 +02:00
artica
7da73afd08 Auto-updated build strings. 2019-05-09 00:01:10 +02:00
Daniel Rodriguez
8f6c8a9932 Merge branch 'ent-3613-Ventana-modal-de-vista-de-Eventos' into 'develop' 
Ent 3613 ventana modal de vista de eventos

See merge request artica/pandorafms!2387
 2019-05-08 19:07:39 +02:00
Daniel Barbero Martin
1644b492d2 fixed errors pdf SLA Weekly 2019-05-08 18:29:33 +02:00
Daniel Rodriguez
0a7539cc3a Merge branch 'ent-3990-7999-colecciones-no-funcionan-no-se-puede-subir-ni-crear-archivos' into 'develop' 
fixed filemanager

See merge request artica/pandorafms!2408
 2019-05-08 18:26:23 +02:00
Daniel Rodriguez
ac101af72f Merge branch '3631_Unidades_no_se_muestran_en_informes_de_graficas_combinadas' into 'develop' 
Added module units in module graphs

See merge request artica/pandorafms!2237
 2019-05-08 16:36:43 +02:00
Alejandro Fraguas
4b7f9e4882 Merge branch 'ent-3884-Error-Superredes' into 'develop' 
fixed errors IPAM subneting

See merge request artica/pandorafms!2395
 2019-05-08 15:57:53 +02:00
Daniel Maya
3833eb6463 elex's recommendations :D 2019-05-08 15:27:22 +02:00
marcos.alconada
0b118f63ad Merge remote-tracking branch 'origin/develop' into ent-3758-7777-bug-validacion-eventos-en-consola 2019-05-08 15:19:40 +02:00
marcos.alconada
1ffc6bd028 Merge remote-tracking branch 'origin/develop' into ent-3770-texto-del-pandora-diag 
Former-commit-id: 35f8be06ed6fff20ff930a19429a0cbcf5aff33d
 2019-05-08 14:36:04 +02:00
marcos.alconada
645730f11f Merge remote-tracking branch 'refs/remotes/origin/ent-3770-texto-del-pandora-diag' into ent-3770-texto-del-pandora-diag 
Former-commit-id: b273f92815e176976254a8c67cb0edd34e4bf9ca
 2019-05-08 14:35:00 +02:00
fbsanchez
9bc5a2d346 IPAM vlan wizard ExtremeXOS 2019-05-08 14:17:40 +02:00
Daniel Rodriguez
0ebf89a9eb Merge branch 'ent-3533-Mostrar-Contact-en-informacion-de-los-eventos' into 'develop' 
Show contact in events information

See merge request artica/pandorafms!2373
 2019-05-08 14:13:08 +02:00
Daniel Rodriguez
0c8fab6cb3 Merge branch 'ent-3574-7598-bug-botones-y-casillas-vista-de-eventos' into 'develop' 
Ent 3574 7598 bug botones y casillas vista de eventos

See merge request artica/pandorafms!2222
 2019-05-08 13:52:45 +02:00
Daniel Rodriguez
72a127c085 Merge branch 'ent-3773-fallo-paginacion-templates-alerts' into 'develop' 
Fixed pagination in Alert templates

See merge request artica/pandorafms!2391
 2019-05-08 13:40:18 +02:00
Daniel Rodriguez
d9e0d44a66 Merge branch 'ent-3782-module-visualization-bug' into 'develop' 
Added unknown status image

See merge request artica/pandorafms!2314
 2019-05-08 13:34:41 +02:00
Daniel Rodriguez
f13162abf1 Merge branch 'ent-3802-visual-constole-warning-state-bug' into 'develop' 
Fixed select bug not selectig value

See merge request artica/pandorafms!2346
 2019-05-08 13:17:02 +02:00
Daniel Rodriguez
247605f308 Merge branch 'ent-3664-Al_aplicar_un_cambio_en_un_agente_se_muestra_que_se_ha_realizado_con_exito_pero_no_actualiza_campos_a_primera_vista' into 'develop' 
Eliminated the cache when update agents

See merge request artica/pandorafms!2242
 2019-05-08 12:50:40 +02:00
Luis Calvo
ef1149d3bb Fixed get agent status on linked map 2019-05-08 12:39:53 +02:00
Luis Calvo
5b75b671aa Merge remote-tracking branch 'origin/develop' into ent-3802-visual-constole-warning-state-bug 2019-05-08 12:37:10 +02:00
Ramon Novoa
a9bf83cc5b Fix the call to docker build to always build the latest image. 2019-05-08 11:22:07 +02:00
Alejandro Fraguas
297f53b9de Merge branch 'ent-3608-Update-Manager-Online' into 'develop' 
Ent 3608 update manager online

See merge request artica/pandorafms!2379
 2019-05-08 11:20:12 +02:00
Daniel Maya
610e0dabbf Merge branch 'develop' into ent-3773-fallo-paginacion-templates-alerts 2019-05-08 11:17:15 +02:00
Daniel Barbero Martin
99f5cab83d fixed filemanager 2019-05-08 10:55:20 +02:00
Tatiana Llorente
cb49de4d81 New menu module graph - #3617 2019-05-08 10:28:00 +02:00
manuel
f5759abcad Merge branch 'develop' into ent-3468-Ayudas_online 2019-05-08 09:35:32 +02:00
Tatiana Llorente
5e0b53e3c2 New menu module graph - #3617 2019-05-08 09:35:28 +02:00
artica
f2873714a6 Auto-updated build strings. 2019-05-08 00:01:08 +02:00
marcos.alconada
fa14fa9510 Show new values after update 2019-05-07 17:47:47 +02:00
Luis Calvo
954aac3aeb Merge remote-tracking branch 'origin/develop' into ent-3802-visual-constole-warning-state-bug 2019-05-07 17:13:54 +02:00
Daniel Maya
e565ddee42 Round decimal value in percentil item and fixed value font size 2019-05-07 16:43:27 +02:00
Luis Calvo
3221bcf55a Merge remote-tracking branch 'origin/develop' into ent-3782-module-visualization-bug 2019-05-07 16:08:29 +02:00
Tatiana Llorente
283be8f632 New menu module graph - #3617 2019-05-07 16:07:07 +02:00
Ramon Novoa
a92f81272a Merge branch 'ent-3835-pandora-db-historical-fails-when-port-setted' into develop 2019-05-07 15:05:03 +02:00
Ramon Novoa
10fd9c4b57 Merge branch 'ent-3755-Vista-de-eventos-se-carga-dos-veces' into develop 2019-05-07 15:02:47 +02:00
Alejandro Fraguas
547348440f Merge branch '206-anadido-soporte-para-aix-en-plugin-de-inventario' into 'develop' 
Resolve "Añadido soporte para AIX en plugin de inventario"

See merge request artica/pandorafms!2294
 2019-05-07 14:57:09 +02:00
manuel
b2b4372c9d Added helps 
Former-commit-id: 0f3894ec81918c25e33bfb67463f4709e156c374
 2019-05-07 11:34:09 +02:00
Alejandro Fraguas
0a96cfd696 Merge branch 'ent-3819-Bug-en-vista-monitor-details-con-tags' into 'develop' 
Fixed bug in monitor detail view

See merge request artica/pandorafms!2360

Former-commit-id: fcbe351e4a71b0827fa7e4919a3b4ae8ffa956bb
 2019-05-07 10:17:37 +02:00