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

11569 Commits

Author SHA1 Message Date
manuel f139fb0d2c Merge branch 'develop' into ent-4618-8580-4526-Bug-en-los-CSV-report 2019-10-11 11:39:41 +02:00
Alejandro Fraguas 7fc31d127d Merge branch 'ent-4662-bug-creacion-agente-API-visualizacion-Metaconsola' into 'develop' 
Ent 4662 bug creacion agente api visualizacion metaconsola

See merge request artica/pandorafms!2764
 2019-10-11 11:25:16 +02:00
artica 9a165dc9d8 Auto-updated build strings. 2019-10-11 00:01:08 +02:00
Daniel Rodriguez f8dc0596ba Merge branch 'ent-4653-item-agent-modules-blank-on-template' into 'develop' 
Removed item agent/modules from templates

See merge request artica/pandorafms!2760
 2019-10-10 17:00:28 +02:00
artica edb3c806ce Auto-updated build strings. 2019-10-10 00:01:08 +02:00
fbsanchez d09c071684 discovery ACL 2019-10-09 15:45:02 +02:00
artica be2148ff26 Auto-updated build strings. 2019-10-09 00:01:09 +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
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 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
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
Jose Gonzalez 2b2f8417a7 Added control for same-day and different hours planned downtimes 2019-10-07 12:40:59 +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
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
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
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
artica 21d363b21e Auto-updated build strings. 2019-10-03 00:01:09 +02:00
artica 8e204605e5 Auto-updated build strings. 2019-10-02 00:01:07 +02:00
manuel 454750aefe Fixed bugs in metaconsole reports 2019-10-01 12:46:09 +02:00
Jose Gonzalez f55b2ce80f Improved truncate system and solved issue 2019-10-01 11:22:25 +02:00
artica c600f74ee2 Auto-updated build strings. 2019-10-01 00:01:06 +02:00
Jose Gonzalez 5294e2f627 Now the supervisor control all servers and not only one 2019-09-30 15:40:40 +02:00
manuel d566da6fb1 Fixed bug in meta serialize data 2019-09-30 15:33:44 +02:00
Jose Gonzalez d878958502 Added notify when Console and Server have version mismatch 2019-09-30 12:48:46 +02:00
artica b072bb5314 Auto-updated build strings. 2019-09-30 00:01:06 +02:00
artica 7ae5a8e5be Auto-updated build strings. 2019-09-29 00:01:06 +02:00
artica 15752c10ef Auto-updated build strings. 2019-09-28 00:01:08 +02:00
Kike dfea704154 Show instructions on mouse over 2019-09-27 14:48:45 +02:00
marcos.alconada 4c93ca3d60 fixed minor error 2019-09-27 12:07:40 +02:00
artica dc3dd1cffa Auto-updated build strings. 2019-09-27 00:01:09 +02:00
marcos.alconada cc18d5d1ed Fixed Error 2019-09-26 17:51:26 +02:00
Jose Gonzalez 5fdf65c440 Modified the mode of creation of agents with API 2019-09-26 17:33:51 +02:00
artica 574d9b13d6 Updated version and build strings. 2019-09-26 16:32:58 +02:00
Daniel Rodriguez c9cfbf0bf2 Merge branch 'ent-4461-Configuracion-integracion-integria' into 'develop' 
Ent 4461 configuracion integracion integria

See merge request artica/pandorafms!2732
 2019-09-26 14:34:50 +02:00
alejandro-campos 96622933fc added new section in integria setup to configure different options for event responses and alert created tickets 2019-09-26 13:22:10 +02:00
Luis Calvo 8284dfc44f Removed item agent/modules from templates 2019-09-26 10:32:36 +02:00
alejandro-campos ad01cd0303 Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-26 09:48:13 +02:00
alejandro-campos 91f90d07d6 minor fixes in integria integration 2019-09-26 09:44:58 +02:00