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
fbsanchez bb2faca479 ma 2019-10-21 12:18:42 +02:00
fbsanchez 1cf77cc8f1 WSProxy ACL check 2019-10-18 18:55:29 +02:00
fbsanchez e24024d2f4 WS gotty extension - global 2019-10-17 15:31:17 +02:00
fbsanchez 4cceb38762 1st RC WebSocketProxy 2019-10-15 22:16:54 +02:00
fbsanchez 06f8f920b8 wip WS redirection 2019-10-15 17:20:23 +02:00
fbsanchez 3a9e5fa477 wip: gotty redirection experiment p2 2019-10-14 19:33:00 +02:00
fbsanchez 86170b3ad8 experiments 2019-10-14 07:59:29 +02:00
Daniel Rodriguez e4775a3e6d Merge branch 'ent-4607-8644-informe-histograma-no-funciona-bien' into 'develop' 
Fixed bug in histogram graph report

See merge request artica/pandorafms!2803
 2019-10-11 13:06:27 +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
Daniel Rodriguez c1853523f5 Merge branch 'ent-4545-Bug-creacion-infrome-con-graficas-MAX-Value-fallo-tabla' into 'develop' 
Ent 4545 bug creacion infrome con graficas max value fallo tabla

See merge request artica/pandorafms!2719
 2019-10-11 12:30:36 +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
manuel a69cfb63f1 Fixed bug in histogram graph report 2019-10-11 09:04:13 +02:00
artica 9a165dc9d8 Auto-updated build strings. 2019-10-11 00:01:08 +02:00
Alejandro Fraguas 41b84ccd81 Merge branch 'pulido/discovery-duplicados-alhambra' into 'develop' 
Locate instead search before create new Discovered agent

See merge request artica/pandorafms!2790
 2019-10-10 18:51:23 +02:00
fbsanchez fb4f4b4046 minor error cleanup 2019-10-10 17:31:57 +02:00
fbsanchez 97f246ae60 discovery os detection 2019-10-10 17:28:02 +02:00
fbsanchez f1ec7d2339 minor fix in str comparison 2019-10-10 17:23:19 +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
Daniel Rodriguez ea9fd23b89 Merge branch 'ent-4760-error-pandora_smpp-pl' into 'develop' 
Allowed several destination numbers in a single script call

See merge request artica/pandorafms!2801
 2019-10-10 16:43:20 +02:00
Kike 0433718612 Allowed several destination numbers in a single script call 2019-10-10 14:07:22 +02:00
artica edb3c806ce Auto-updated build strings. 2019-10-10 00:01:08 +02:00
fbsanchez cc58cd6515 get_agent_name_from_addr => get_agent_from_addr 2019-10-09 18:09:09 +02:00
Daniel Rodriguez f995588484 Merge branch 'ent-4639-Pantalla-en-negro-en-lugar-de-error-403' into 'develop' 
Ent 4639 pantalla en negro en lugar de error 403

See merge request artica/pandorafms!2761
 2019-10-09 17:28:01 +02:00
Alejandro Fraguas 8303ff7663 Merge branch 'ent-4686-acl-discovery' into 'develop' 
discovery ACL

See merge request artica/pandorafms!2747
 2019-10-09 15:45:02 +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 dd772f95d6 Merge branch 'ent-4756-conexion-servidor-nodo-a-metaconsola' into 'develop' 
encryption key prepared before being used

See merge request artica/pandorafms!2785
 2019-10-08 18:20:18 +02:00
Daniel Rodriguez 45b90d43e5 Merge branch 'ent-4744-is_numeric-no-admite-numeros-en-notacion-cientifica' into 'develop' 
is_numeric review, with fallback to looks_like_number

See merge request artica/pandorafms!2778
 2019-10-08 15:56:36 +02:00
Daniel Rodriguez 2eca6c7df3 Merge branch 'ent-4717-nombre-de-extensiones-erroneo-en-menu-php' into 'develop' 
Deleted unnecessary "if" statement

See merge request artica/pandorafms!2759
 2019-10-08 15:32:55 +02:00
Daniel Rodriguez 0b14cb64b6 Merge branch 'ent-4293-bug-keepcounter-policies' into 'develop' 
Fixed module update bug

See merge request artica/pandorafms!2769
 2019-10-08 14:30:49 +02:00
Luis Calvo 941362776e Fixed keepcounters ckbox bug 2019-10-08 14:06:30 +02:00
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
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
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
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
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