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

22489 Commits

Author SHA1 Message Date
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
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
Alejandro Fraguas a40592b041 Merge branch 'ent-4626-Checks-de-Custom-Graphs-desplazados' into 'develop' 
Fixed bug in list graphs view

See merge request artica/pandorafms!2711
 2019-10-03 10:37:49 +02:00
artica 21d363b21e Auto-updated build strings. 2019-10-03 00:01:09 +02:00
Tatiana Llorente 5a2ca8e65f Added all string types - #4678 2019-10-02 17:37:14 +02:00
fbsanchez 8bb1e4ed2d is_numeric review, with fallback to looks_like_number 2019-10-02 11:33:43 +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
Luis Calvo 1eb0b27da3 Fixed module update bug 2019-09-27 16:09:11 +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
Daniel Rodriguez 03b34d9af8 Merge branch 'ent-4461-Problema-logo-integria' into 'develop' 
fixed integria logo redirection in integria setup

See merge request artica/pandorafms!2768
 2019-09-27 09:20:26 +02:00
alejandro-campos 5e0b7fc2b7 fixed integria logo redirection in integria setup 2019-09-27 09:07:09 +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
daniel e7fefd5fae Merge branch 'ramita-qa-daniel-mrs' into 'develop' 
fixed minor error

See merge request artica/pandorafms!2763
 2019-09-26 16:50:17 +02:00
Daniel Barbero Martin 2ee725b204 fixed minor error 2019-09-26 16:43:31 +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 2ec562fcc0 changed help in setup integria 2019-09-26 13:36:14 +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
Tatiana Llorente a15350b7cb deleted calls to a function that does not exist logoff_db() - #4639 2019-09-26 12:36:08 +02:00
Luis 84611c7d29 Merge branch 'develop' into 'ent-4669-fallo-escritura-notificacion-serialize-precision' 
# Conflicts:
#   pandora_console/include/class/ConsoleSupervisor.php
 2019-09-26 11:44:56 +02:00
alejandro-campos 0fdf3874d4 Add ACL in integria ticket dashboard 2019-09-26 11:05:27 +02:00
alejandro-campos 93b176269c remove acl check in integria ticket dashboard 2019-09-26 10:38:12 +02:00
Luis Calvo 8284dfc44f Removed item agent/modules from templates 2019-09-26 10:32:36 +02:00