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

22589 Commits

Author SHA1 Message Date
Alejandro Fraguas 13b3099553 Merge branch 'ent-4775-Error-masivas-de-agente-sin-cambios' into 'develop' 
added condition in agent massive edition

See merge request artica/pandorafms!2791
 2019-10-08 13:11:55 +02:00
Daniel Rodriguez bc2e40d0a3 Merge branch '4748-API-call-set-planned_downtimes_created' into 'develop' 
Added control for same-day and different hours planned downtimes

See merge request artica/pandorafms!2788
 2019-10-08 11:37:10 +02:00
Tatiana Llorente d2dc6ba9c1 Merge remote-tracking branch 'origin/develop' into ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos 
Conflicts:
	pandora_console/operation/events/events.php
 2019-10-08 09:14:08 +02:00
Tatiana Llorente 8a85edac93 Merge remote-tracking branch 'origin/develop' into ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos 2019-10-08 08:59:39 +02:00
artica 2a76b06870 Auto-updated build strings. 2019-10-08 00:01:11 +02:00
Daniel Rodriguez bd7ee945f7 Merge branch 'ent-4454-No-aparece-el-icono-con-color-de-warning-en-el-Service-Tree-View' into 'develop' 
Fixed bad image for warning status - #4454

See merge request artica/pandorafms!2629
 2019-10-07 19:21:53 +02:00
Daniel Rodriguez e6724752ff Merge branch 'ent-4661-leyenda-de-las-graficas-en-classic-mode' into 'develop' 
Fixed Error

See merge request artica/pandorafms!2767
 2019-10-07 19:21:28 +02:00
Daniel Rodriguez 588d2f60ef Merge branch 'ent-4678-No-funciona-macro-moduledata-modulename-cuando-el-tipo-de-modulo-es-string-y-no-generic-data-string' into 'develop' 
Ent 4678 no funciona macro moduledata modulename cuando el tipo de modulo es string y no generic data string

See merge request artica/pandorafms!2781
 2019-10-07 19:20:08 +02:00
alejandro-campos 646f2607ab added condition in agent massive edition 2019-10-07 19:02:19 +02:00
fbsanchez 8b771f6a35 Minor fix 2019-10-07 17:35:20 +02:00
Daniel Rodriguez d198cc3297 Merge branch 'ent-4567-Habilitar-borrado-masivo-de-traps-con-permisos-AW' into 'develop' 
Changed permissions to delete traps to IM - #4567

See merge request artica/pandorafms!2690
 2019-10-07 17:08:32 +02:00
fbsanchez 2ac4ae3a18 Minor fix 2019-10-07 17:08:09 +02:00
fbsanchez 7ecaf11d07 Locate instead search before create new Discovered agent 2019-10-07 16:38:58 +02:00
Daniel Rodriguez dc01b3e22e Merge branch 'ent-4679-notificacion-supervisor-server-no-actualizado' into 'develop' 
Added notify when Console and Server have version mismatch

See merge request artica/pandorafms!2770
 2019-10-07 15:59:16 +02:00
Luis Calvo 37c0f340dc Fixed macro _policy_ in alerts 2019-10-07 15:09:46 +02:00
Daniel Rodriguez 375fac7f3d Merge branch 'ent-4681-8764-Fallo-en-Vodat-a-la-hora-de-editar-módulos-de-politica' into 'develop' 
Fixed modules_get_relations

See merge request artica/pandorafms!2751
 2019-10-07 14:01:24 +02:00
Daniel Rodriguez debbbdc4e5 Merge branch 'ent-4726-truncado-eventos-texto-muy-largo' into 'develop' 
Improved truncate system and solved issue

See merge request artica/pandorafms!2774
 2019-10-07 13:49:57 +02:00
Jose Gonzalez 7ac12e45ef Solved visual issue 2019-10-07 13:33:18 +02:00
Tatiana Llorente 3b85842fb2 Hidden Graph Container section from open version - #4069 2019-10-07 12:44:00 +02:00
Jose Gonzalez 2b2f8417a7 Added control for same-day and different hours planned downtimes 2019-10-07 12:40:59 +02:00
marcos.alconada a7b66e6365 revert changes 2019-10-07 12:07:31 +02:00
marcos.alconada 8c0c392197 revert chanegd 2019-10-07 11:39:06 +02:00
marcos.alconada 80e6d70b31 revert style 2019-10-07 11:29:42 +02:00
marcos.alconada a3241bbb64 fixed error 2019-10-07 11:23:30 +02:00
marcos.alconada c166256a87 fixed error 2019-10-07 11:22:16 +02:00
marcos.alconada 4c04b8f628 fixed error 2019-10-07 11:21:16 +02:00
marcos.alconada a9e8b1113e add default comments when change owner or status on events 2019-10-07 11:15:25 +02:00
Daniel Rodriguez cb6b48aa3f Merge branch 'ent-4671-No-se-visualiza-informe-al-cambiar-de-fuente' into 'develop' 
Added files smallfonts and unicode into ttfonts directory

See merge request artica/pandorafms!2748
 2019-10-07 11:15:11 +02:00
Jose Gonzalez 662e86c1c2 Improved solution 2019-10-07 10:31:59 +02:00
Jose Gonzalez 7bdd2a02e5 Added a string with information of the caller of pandora_server. Modified too an issue with security level messages 2019-10-07 10:02:21 +02:00
artica 745971dfa6 Auto-updated build strings. 2019-10-07 00:01:06 +02:00
artica 936ce0ee26 Auto-updated build strings. 2019-10-06 00:01:06 +02:00
artica d0dead58f0 Auto-updated build strings. 2019-10-05 00:01:09 +02:00
fbsanchez 647ce5706e encryption key prepared before being used 2019-10-04 14:53:07 +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
Daniel Rodriguez bfe32a5aed Merge branch 'ent-4699-Revision-completa-de-informes-Wizard-en-Meta' into 'develop' 
Fixed bug in meta serialize data

See merge request artica/pandorafms!2773
 2019-10-04 14:04:17 +02:00
Daniel Rodriguez 658d71568a Merge branch 'ent-1945-eliminar-informes-tipo-itil' into 'develop' 
the itil type is removed in the report types

See merge request artica/pandorafms!2757
 2019-10-04 13:55:54 +02:00
Daniel Rodriguez 915edd455d Merge branch 'ent-4098-historical_data-report-no-definido-para-metaconsola' into 'develop' 
Fixed historical_data report in metaconsole

See merge request artica/pandorafms!2722
 2019-10-04 13:53:29 +02:00
artica cc239e5e68 Auto-updated build strings. 2019-10-04 00:01:09 +02:00
marcos.alconada 2938435988 fixed minor error 2019-10-03 17:46:26 +02:00
Daniel Rodriguez 6802b32d93 Merge branch 'ent-4578-No-se-registran-los-nombres-de-los-items-text-en-reports' into 'develop' 
Fixed visual bug in item names from report template

See merge request artica/pandorafms!2707
 2019-10-03 17:35:03 +02:00
Daniel Rodriguez 5f463e51b8 Merge branch '4689-mostrar-instrucciones-en-la-vista-de-eventos' into 'develop' 
Fixed issue with instructions in events view

See merge request artica/pandorafms!2752
 2019-10-03 16:59:03 +02:00
Daniel Rodriguez b2157f4b32 Merge branch 'ent-4051-tree-view-module-groups-duplica-modulos' into 'develop' 
add condition in query

See merge request artica/pandorafms!2710
 2019-10-03 16:41:15 +02:00
Kike b25c9ca793 Merge remote-tracking branch 'origin/develop' into 4689-mostrar-instrucciones-en-la-vista-de-eventos 
Conflicts:
	pandora_console/include/functions_events.php
 2019-10-03 15:59:15 +02:00
Daniel Rodriguez 4f81ffbf62 Merge branch 'ent-4583-hint-mal-construido-en-editar-usuario-home-screen' into 'develop' 
chaged hint from home screen

See merge request artica/pandorafms!2704
 2019-10-03 14:53:37 +02:00
Daniel Rodriguez eba64ce0e7 Merge branch 'ent-4669-fallo-escritura-notificacion-serialize-precision' into 'develop' 
Fixed notifiation text  misprint

See merge request artica/pandorafms!2737
 2019-10-03 14:35:32 +02:00
marcos.alconada ec86380ee7 changed hint from home screen edit user 2019-10-03 14:27:10 +02:00
marcos.alconada 6f14aa3d2a Merge remote-tracking branch 'origin/develop' into ent-4583-hint-mal-construido-en-editar-usuario-home-screen 2019-10-03 14:17:23 +02:00
Alejandro Fraguas e42932ad19 Merge branch 'ent-4543-Bug-en-Graficas-Personalizadas-con-Average-series-Visual' into 'develop' 
fixed summatory series custom graph

See merge request artica/pandorafms!2754
 2019-10-03 13:38:18 +02:00
Alejandro Fraguas e174f8dda9 Merge branch 'ent-4544-bug-custom-graph-csv-export' into 'develop' 
Fixed CSV custom graphs export

See merge request artica/pandorafms!2694
 2019-10-03 12:59:30 +02:00