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

21049 Commits

Author SHA1 Message Date
Daniel Rodriguez 15446453fb Merge branch 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta' into 'develop' 
Ent 3771 nueva tipo de macro password en comandos acciones de alerta

See merge request artica/pandorafms!2397

Former-commit-id: bd4887079f93ed26eef66f5b5047dcc07caf56a6
 2019-05-14 10:53:44 +02:00
Daniel Rodriguez 865796ed5e Merge branch 'visual-console-phase-2' into 'develop' 
Visual console phase 2

See merge request artica/pandorafms!2404

Former-commit-id: af616c2346655fcf1f5732c00c0ef2f053126d86
 2019-05-14 10:21:14 +02:00
Marcos Alconada cf45be2c60 Merge branch 'develop' into 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' 
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql

Former-commit-id: b3872691ef8ef136cd921c5eb4365be2b32daf46
 2019-05-14 10:03:37 +02:00
marcos.alconada 9501187ebc Se cambian las consultas sql sin la imagen en la consulta 
Former-commit-id: fcfc9e05c4107f5b85b1a8f6140155fafe316c8e
 2019-05-14 10:01:30 +02:00
marcos.alconada bad2a330fd Se muestra en la pantalla mediante html la imganen 
Former-commit-id: ddd86fc0b4768ed5c3750c304fded70de3389864
 2019-05-14 09:48:41 +02:00
marcos.alconada 5fe4a240be se añade imagen y se quita de bbdd 
Former-commit-id: 4d9174e95ffb6f5a35aa194177363c27dcd2c4a1
 2019-05-14 09:47:45 +02:00
artica b7ebb44c48 Auto-updated build strings. 
Former-commit-id: 8ec4c48ebf34ee5d60ddb8b0b1579c47874e936f
 2019-05-14 00:01:09 +02:00
fbsanchez 5f87b13e13 WIP: updatemanager interaction 
Former-commit-id: 5983c8a2f885dc696fb5bdf779e3e56783687667
 2019-05-13 19:34:10 +02:00
Alejandro Fraguas 81f7cf699b Merge branch 'ent-3768-no-funciona-selector-de-nodo-event-group-report-meta' into 'develop' 
Ternary condition is added

See merge request artica/pandorafms!2311

Former-commit-id: c7e9365d322c9f2bf7b52a58c4e6f077f3e68288
 2019-05-13 18:36:34 +02:00
fbsanchez 6ca07c0914 Merge remote-tracking branch 'origin/develop' into 1668-update-manager 
Former-commit-id: 33d676ea02d3dfbb3f8c3c23aa8466192516eafb
 2019-05-13 17:58:35 +02:00
fbsanchez ced1b32915 Configuration, Registration and newsletter wizards 
Former-commit-id: bbd367a10fd01c229c848b15572c4b1d6ccb75cf
 2019-05-13 17:55:41 +02:00
Daniel Maya 539f416cc4 Merge 
Former-commit-id: ab93502ce1140ff37c513f2c574b4ca22f552ee9
 2019-05-13 17:30:35 +02:00
Alejandro Campos 9347fc17aa Merge branch 'develop' into 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta' 
# Conflicts:
#   pandora_console/extras/mr/28.sql

Former-commit-id: f9ff15a815fa9a15f1d326174ac40acbdd4110dd
 2019-05-13 17:10:06 +02:00
Daniel Rodriguez a38ef3e729 Merge branch 'ent-3858-Alert-template-Condition-Type-Not-normal' into 'develop' 
Added condition type not normal in alert templates

See merge request artica/pandorafms!2376

Former-commit-id: bfd561123a0eb57cfb4c99a0c12f3c665a661765
 2019-05-13 16:51:34 +02:00
Tatiana Llorente b6e8578d1d Fixed a minor sintax error - #3611 
Former-commit-id: 75ba583e8d060887c80eb32fd648157d2c4428bd
 2019-05-13 15:54:06 +02:00
Tatiana Llorente e6fa42ddca Fixed a minor bug in remote config - #3611 
Former-commit-id: 02a786832c8b02a7f5962cf9021cb5a2fe525bcc
 2019-05-13 15:02:13 +02:00
Tatiana Llorente e9082c5d8a Fixed a minor bug in remote config - #3611 
Former-commit-id: 905739bc36ce640de743f4d6cf62031263c698eb
 2019-05-13 14:55:15 +02:00
Ramon Novoa f48dd94c65 Check not_normal alerts when evaluating unknown modules. 
Former-commit-id: 80f58d4ebfaf5179312a19eae8ea09a4a8d0bff5
 2019-05-13 13:44:08 +02:00
Tatiana Llorente 5f2bd0bc8d Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente 
Conflicts:
	pandora_console/include/styles/pandora.css


Former-commit-id: f04b28c642afe7fe1251ae966b3964c321b34c29
 2019-05-13 13:17: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
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
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
marcos.alconada ac60e296c1 Add new message to News board 
Former-commit-id: ad9170857d95fa2c211d09a5f59f6012739177c5
 2019-05-10 11:17:46 +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
manuel 12c9952e4a Merge branch 'develop' into ent-3858-Alert-template-Condition-Type-Not-normal 
Conflicts:
pandora_console/extras/mr/28.sql


Former-commit-id: 841526b8d92b3f5ea7e642a36829b1bc33c62c8a
 2019-05-10 09:11:17 +02:00
artica 3119278b26 Auto-updated build strings. 
Former-commit-id: 1dc55561e83817f91b38b437d57e479fb13f3ac3
 2019-05-10 00:01:14 +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
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