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

20961 Commits

Author SHA1 Message Date
Luis Calvo 14717a6c6d Fixed merge conflict 
Former-commit-id: bd98cc80ad87b840a60c2548667352f5c6041c55
 2019-05-13 15:15:14 +02:00
Luis Calvo 895588ebe0 Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings 
Former-commit-id: c5f4313d97cad17c9f653dc0e4bbc0d9e7e9f308
 2019-05-13 15:00:35 +02:00
Luis Calvo 27096276ec agent view user acces ehorus 
Former-commit-id: 66739ce807d5bd5f2e46ce9fd1aa0cc72afbb4bc
 2019-05-13 15:00:29 +02:00
Daniel Rodriguez ecacf2d3f5 Merge branch 'ent-3799-bug-en-configuracion-ehorus' into 'develop' 
Ent 3799 bug en configuracion ehorus

See merge request artica/pandorafms!2403

Former-commit-id: 183212d8ad2e9cab574800000ac71576d7ae75ae
 2019-05-13 14:54:25 +02:00
Daniel Rodriguez f281dda622 Merge branch 'ent-4013-7999-Bug-custom-graph-en-consola-visual' into 'develop' 
Fixed error window in visual console

See merge request artica/pandorafms!2412

Former-commit-id: 312950779bb4cd02938f1e825d86ab3c1fef01ff
 2019-05-13 14:52:17 +02:00
Alejandro Fraguas 20f77f5393 Merge branch 'ent-4004-Estilos-Discovery' into 'develop' 
Unify the styles of Discovery with Pandora - #4004

See merge request artica/pandorafms!2411

Former-commit-id: 463116b12ece33846a8d86514145e2d97e7eaec1
 2019-05-13 13:05:34 +02:00
Luis Calvo 3d66fca5d6 Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings 
Former-commit-id: df2707c912cccfa684dc82e5ad8a777819b2b9e8
 2019-05-13 10:08:37 +02:00
artica 40af2205b1 Auto-updated build strings. 
Former-commit-id: bde62e989e369e296a685f7d2050a92f4b8417e2
 2019-05-13 00:01:06 +02:00
artica 3fc5f183fd Auto-updated build strings. 
Former-commit-id: bcb6a01291e16430de319d27a04f21723e39a5c5
 2019-05-12 00:01:06 +02:00
artica 0008f57e35 Auto-updated build strings. 
Former-commit-id: 62f8df997289fe4c8e8e63eedbb8dcdb1a08da1f
 2019-05-11 00:01:09 +02:00
Luis Calvo c527435a0e eHorus user-login settings 
Former-commit-id: e62be3b137ef5583fbd29186a834a86b075e78fb
 2019-05-10 15:32:25 +02:00
marcos.alconada b51cdb93df arreglo con la vista del formulario 
Former-commit-id: 0d5b5c099ce2e096d8e3d8e1c0a6220baa27e0a9
 2019-05-10 15:00:21 +02:00
Alejandro Fraguas 0f3ff09b82 Merge branch 'ent-3894-Bug-Feature-labels-weigh-en-graficas' into 'develop' 
fixed error labels graphs and weight in chart

See merge request artica/pandorafms!2401

Former-commit-id: f70c0c55a7159d235ca30f1a2cd42d66205eaa7a
 2019-05-10 12:52:39 +02:00
marcos.alconada 793304b52d Se habilita el boton de ehorus 
Former-commit-id: aceee670b00ad4291b7f4e9e0a90f17dca3feed9
 2019-05-10 12:26:09 +02:00
Daniel Barbero Martin ab2bf737d5 Merge remote-tracking branch 'origin/develop' into ent-3894-Bug-Feature-labels-weigh-en-graficas 
Conflicts:
	pandora_console/include/functions.php


Former-commit-id: 6c1ef8bcb15b9969b25082851fa39c8241398b29
 2019-05-10 12:18:10 +02:00
Daniel Rodriguez 948c4eb7b4 Merge branch 'ent-3726-WUX_no_se_puede_aplicar_FF_Interval' into 'develop' 
fixed change status WUX

See merge request artica/pandorafms!2385

Former-commit-id: c203a7a321303a33843b8ab85a96b69cc041a8c5
 2019-05-10 11:44:08 +02:00
Tatiana Llorente a9834dc415 Merge branch 'develop' into 'ent-4004-Estilos-Discovery' 
Conflicts:
  pandora_console/godmode/wizards/HostDevices.class.php
Former-commit-id: de7b4b069e1c5f673b567fcb3271ec867d0fbae1
 2019-05-10 09:55:54 +02:00
Luis Calvo 44b14debdc Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings 
Former-commit-id: 781b73ee3896c138223d46d40abdb3a7100bcf2c
 2019-05-10 09:38:31 +02:00
artica 3119278b26 Auto-updated build strings. 
Former-commit-id: 1dc55561e83817f91b38b437d57e479fb13f3ac3
 2019-05-10 00:01:14 +02:00
Luis Calvo ecce1160e1 Added button to select ehorus conf type and box into user conf 2019-05-09 19:23:18 +02:00
Daniel Rodriguez 8027238dfd Merge branch 'ent-3925-eliminar-custom-response-deprecated' into 'develop' 
Ent 3925 eliminar custom response deprecated

See merge request artica/pandorafms!2390

Former-commit-id: aa92dfe86b9039f45db063cd1a711b26e8c36442
 2019-05-09 17:52:46 +02:00
marcos.alconada 72eb2babad se quita install.php 
Former-commit-id: 34ab35a67b924c6d0aab9f756a0c73bffd36c8cd
 2019-05-09 17:44:54 +02:00
Marcos Alconada 5126c651f7 Changed '' of query 2019-05-09 17:38:40 +02:00
Daniel Rodriguez 3e91207186 Merge branch 'ent-3617-Gráfica-de-módulos' into 'develop' 
Ent 3617 gráfica de módulos

See merge request artica/pandorafms!2407

Former-commit-id: ac545e4211f9e68e81482657c6e294dcac082a8e
 2019-05-09 17:03:03 +02:00
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
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
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
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
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