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

567 Commits

Author SHA1 Message Date
Daniel Rodriguez 7bfd29da6f Merge branch 'ent-5183-error-con-logo-de-so-en-informes-pdf-meta' into 'develop' 
Fixed bug in pdf metaconsole os icon

See merge request artica/pandorafms!2987
 2020-01-07 09:45:56 +01:00
manuel 9e0168cd6c Fixed bug in metaconsole alerts view 2019-12-27 10:24:48 +01:00
Alejandro Fraguas 46f02a6c53 Merge branch 'ent-4935-CSV-eventos-tooltip' into 'develop' 
Added tooltip to CSV datatable button

See merge request artica/pandorafms!2881
 2019-12-26 12:27:55 +01:00
manuel 58beb51401 Fixed bug in pdf metaconsole os icon 2019-12-23 10:53:33 +01:00
Daniel Rodriguez 24838cad0f Merge branch 'ent-4233-Modificación-en-la-función-genérica-de-render-de-fecha-hora' into 'develop' 
Added compact mode to show timestamp - #4233

See merge request artica/pandorafms!2688
 2019-12-16 11:48:09 +01:00
Tatiana Llorente b38c396837 Change date in hover in compact mode 2019-12-13 13:40:19 +01:00
fbsanchez 1b57b279fb minor changes 2019-11-25 13:03:55 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
Luis 41e818334e Ent 4954 urls documentacion soporte al fallar base datos 2019-11-21 11:14:50 +01:00
Alejandro Fraguas 7e8f22b1de Merge branch 'ent-4936-Comillas-dobles-en-comentarios-de-eventos-no-funcionan' into 'develop' 
Ent 4936 comillas dobles en comentarios de eventos no funcionan

See merge request artica/pandorafms!2869
 2019-11-15 13:20:13 +01:00
Alejandro Fraguas 0199c6312a Merge branch 'ent-4752-Herramientas-de-diagnostico' into 'develop' 
refactoriced diagnostics pandoraFMS

See merge request artica/pandorafms!2809
 2019-11-14 11:49:23 +01:00
Daniel Rodriguez f844c660af Merge branch 'ent-4766-feedback-de-ayudas' into 'develop' 
add feedback

See merge request artica/pandorafms!2813
 2019-11-13 13:43:08 +01:00
Daniel Barbero Martin 7103317bc2 Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico 
Conflicts:
	pandora_console/general/header.php
	pandora_console/include/styles/pandora.css
 2019-11-13 12:12:17 +01:00
Luis Calvo f9215af803 Added tooltip to CSV datatable button 2019-11-12 17:33:58 +01:00
Daniel Barbero Martin fa6bc254a1 Fixed errors 2019-11-12 16:22:58 +01:00
fbsanchez 763ec6772c Help feedback style improved 2019-11-07 17:26:32 +01:00
Tatiana Llorente 54c6f3965d Fixed bug with doubles quotes in comments of events 2019-11-07 15:25:19 +01:00
Tatiana Llorente 05e424a24e Merge remote-tracking branch 'origin/develop' into ent-4623-Exportar-a-CSV-los-eventos-separador-erroneo 
Conflicts:
	pandora_console/include/functions_ui.php
 2019-11-05 17:25:56 +01:00
Tatiana Llorente 87c5d0025b Merge remote-tracking branch 'origin/develop' into ent-4623-Exportar-a-CSV-los-eventos-separador-erroneo 2019-11-05 17:24:10 +01:00
Luis b707ebd4a4 Added docs and support urls in console. Fixed bugs 2019-11-05 17:09:29 +01:00
Daniel Rodriguez 0e628a365d Merge branch 'ent-4625-Cambiar-titulo-a-archivo-CSV-de-la-vista-de-eventos' into 'develop' 
Ent 4625 cambiar titulo a archivo csv de la vista de eventos

See merge request artica/pandorafms!2783
 2019-11-05 16:57:23 +01:00
Marcos Alconada 613e5741fb Merge branch 'develop' into 'ent-4766-feedback-de-ayudas' 
# Conflicts:
#   pandora_console/include/functions_ui.php
 2019-10-29 17:00:39 +01:00
Daniel Barbero Martin de22fb70e3 Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico 2019-10-23 19:51:49 +02:00
Daniel Barbero e37af1598a continue feedback diagnostics 2019-10-21 18:11:04 +02:00
Daniel Barbero Martin 4e56f6751a Continue work diagnostics 2019-10-17 15:17:28 +02:00
Tatiana Llorente adf3b08537 Add text (inv) in the help of the thresholds for inverse intervals - #1880 2019-10-17 11:50:50 +02:00
Daniel Rodriguez 5f0dffb816 Merge branch 'ent-4559-desajuste-en-custom-fields' into 'develop' 
Ent 4559 desajuste en custom fields

See merge request artica/pandorafms!2684
 2019-10-16 11:38:38 +02:00
marcos a31e66a9bd add feedback 2019-10-15 12:16:50 +02:00
Alejandro Fraguas 78610b127c Merge branch 'ent-4682-Comentarios-en-eventos-no-se-ven-en-metaconsola' into 'develop' 
Ent 4682 comentarios en eventos no se ven en metaconsola

See merge request artica/pandorafms!2775
 2019-10-15 11:42:00 +02:00
Marcos Alconada 89843fcc3b Update functions_ui 2019-10-15 11:13:40 +02:00
Daniel Rodriguez adaead5f8f Merge branch 'ent-4763-paginacion-datatables' into 'develop' 
datatables hide when only 1 page

See merge request artica/pandorafms!2784
 2019-10-11 12:46:22 +02:00
fbsanchez a4cff9770f Collaborative session @manuel.montes pagination fix in datatables (hide when only 1 page) 2019-10-04 14:17:14 +02:00
Tatiana Llorente 305d74878c Changed title of csv in events - #4625 2019-10-04 11:51:30 +02:00
Marcos Alconada f1d20d56e7 Update functions_ui.php 2019-10-01 16:26:22 +02:00
marcos.alconada a44e1feeb4 fixed error comments events 2019-10-01 16:24:02 +02:00
Jose Gonzalez f55b2ce80f Improved truncate system and solved issue 2019-10-01 11:22:25 +02:00
Tatiana Llorente 89253f4111 Added option for custom delimiter in export csv for datatables - #4623 2019-09-13 10:27:14 +02:00
fbsanchez 9868462d43 Merge remote-tracking branch 'origin/develop' into ent-4190-mejoras-para-el-menu-de-gestionar-ha 2019-09-02 09:57:45 +02:00
Tatiana Llorente 8fd1f3c99e Added compact mode to show timestamp - #4233 2019-08-29 10:07:50 +02:00
Luis Calvo e71bb2a791 Long custom fields urls and text truncated 2019-08-27 16:01:18 +02:00
Luis Calvo 2dc084da8a Merge remote-tracking branch 'origin/develop' into ent-4132-custom-fields-url 2019-08-27 09:11:45 +02:00
Luis Calvo e2e7eeee92 Merge remote-tracking branch 'origin/develop' into ent-4132-custom-fields-url 2019-08-27 09:10:37 +02:00
Alejandro Fraguas fadccf0ff3 Merge branch 'ent-4509-AADCM-MCM-8206-Bug-en-consola-visual-link-a-consola-visual-publica' into 'develop' 
Fixed bug in public visual console view

See merge request artica/pandorafms!2672
 2019-08-26 13:12:31 +02:00
Daniel Barbero Martin 31da17db03 fixed event view metaconsole 2019-08-22 14:27:45 +02:00
manuel e439e7349f Fixed bug in public visual console view 2019-08-21 09:22:13 +02:00
fbsanchez adbb48ab87 pandora HA review 2019-08-10 02:13:01 +02:00
Tatiana Llorente 7826ba79e6 Remove disabled modules to create service element - #4458 2019-08-07 14:23:10 +02:00
fbsanchez 1e73105fc9 minor fix adding slash if not found 2019-07-31 10:59:51 +02:00
Luis Calvo f6f96523a0 Added html enconde 2019-07-29 16:57:39 +02:00
fbsanchez 17dc0b82ac Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-17 17:19:58 +02:00