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

18435 Commits

Author SHA1 Message Date
daniel 0a1bee92a5 fixed slicebar to php7 2018-10-19 10:49:13 +02:00
daniel b736746e1c php version upgrade 2018-10-19 10:04:26 +02:00
daniel 9492d11cc8 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 2018-10-18 12:51:32 +02:00
vgilc d23e47dd9d Merge branch '2737-Optimización-de-tags-dev-2' into 'develop' 
Fixed tags filter on Tree tags

See merge request artica/pandorafms!1862
 2018-10-18 09:53:03 +02:00
artica 0c39e321e4 Auto-updated build strings. 2018-10-18 00:01:24 +02:00
fermin831 2d2c465ff6 Removed unwanted traces 2018-10-17 15:43:26 +02:00
fermin831 14afe2ff88 Added message 'Please, select an agent first' 2018-10-17 12:35:11 +02:00
fermin831 060e46868d Fixed tags filter on bulk operation (select module first) 2018-10-17 11:57:22 +02:00
danielmaya 9ee64b4894 Fixed report agent/module 2018-10-17 08:44:51 +02:00
artica fd53704dc0 Auto-updated build strings. 2018-10-17 00:01:34 +02:00
daniel f824650642 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 2018-10-16 15:42:17 +02:00
daniel 3c62388f0e fixed errors php and slicebars change version php7 2018-10-16 15:32:31 +02:00
fermin831 0ca34c744d Fixed tags filter on Tree tags 2018-10-16 13:29:00 +02:00
vgilc 2f61ba70df Merge branch 'ent-2740-servicios-favoritos' into 'develop' 
Ent 2740 servicios favoritos

See merge request artica/pandorafms!1781
 2018-10-16 11:45:38 +02:00
fermin831 aff2879340 Merge remote-tracking branch 'origin/develop' into ent-2740-servicios-favoritos 
Conflicts:
	pandora_console/extras/mr/21.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb_data.sql
 2018-10-16 11:35:14 +02:00
vgilc 14419759b0 Merge branch 'ent-2631-i6106-error-al-editar-modulos-con-tag-con-perfil-de-usuario-determinado' into 'develop' 
Fixed modules tags acl with to tagged modules with an user without tags

See merge request artica/pandorafms!1860
 2018-10-16 09:01:13 +02:00
vgilc 3664099fca Merge branch '2897-Fallo-al-hacer-update-en-Visual-Consoles-dev' into 'develop' 
Fixed lost id_agent in visual console

See merge request artica/pandorafms!1858
 2018-10-16 09:00:48 +02:00
artica 9675c6ce52 Auto-updated build strings. 2018-10-16 00:01:27 +02:00
fermin831 dd4e1c9994 Fixed modules tags acl with to tagged modules with an user without tags 2018-10-15 16:50:23 +02:00
danielmaya 392d4e7aad Fixed lost id_agent in visual console 2018-10-15 15:05:47 +02:00
daniel d84427b014 fixed errors php 2018-10-15 10:32:24 +02:00
daniel d28bc79b79 upgrade php 2018-10-15 09:05:04 +02:00
daniel c3bcb84293 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 2018-10-15 08:58:55 +02:00
vgilc f3c8b14b32 Merge branch '2457-Formulario-de-creacion-repetido' into 'develop' 
added check to prevent alert creation form from being printed in alert cluster for step 5

See merge request artica/pandorafms!1854
 2018-10-15 00:06:41 +02:00
vgilc 743c8a747e Merge branch 'ent-2819-i6537-se-descuadran-etiquetas-en-link-publico-cons-visuales' into 'develop' 
Fixed margin in public visual consoles

See merge request artica/pandorafms!1855
 2018-10-15 00:04:34 +02:00
artica 35e1234b3c Auto-updated build strings. 2018-10-15 00:01:24 +02:00
artica 44be4aea57 Auto-updated build strings. 2018-10-14 00:01:23 +02:00
artica b0e56cd506 Auto-updated build strings. 2018-10-13 00:01:24 +02:00
artica 179f3f0526 Auto-updated build strings. 2018-10-12 00:01:28 +02:00
alejandro-campos aa33522670 added check to prevent alert creation form from being printed in alert cluster for step 5 2018-10-11 15:22:36 +02:00
fermin831 e5a2284b8b Fixed margin in public visual consoles 2018-10-11 14:51:52 +02:00
daniel 16be9488c8 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/include/functions_graph.php
 2018-10-11 13:06:17 +02:00
daniel 1f56054f6c fixed changes php7 2018-10-11 12:57:48 +02:00
vgilc c8121d7df3 Merge branch '2791-ACL-enterprise-view-dashboard-permite-al-usuario-hacer-busquedas-por-nombre-de-agente-exponiendo-datos-confidenciales-dev' into 'develop' 
Added head search in acl enterprise

See merge request artica/pandorafms!1801
 2018-10-11 12:16:25 +02:00
vgilc edadc60957 Merge branch '2737-Optimización-de-tags-dev' into 'develop' 
2737 optimización de tags dev

See merge request artica/pandorafms!1815
 2018-10-11 12:14:10 +02:00
vgilc ae5858c428 Merge branch '2457-Formulario-de-creacion-repetido' into 'develop' 
added check whto skip alert creation table printing in cluster alert  only when step is 5

See merge request artica/pandorafms!1851
 2018-10-11 08:06:44 +02:00
artica d087665d1e Auto-updated build strings. 2018-10-11 00:01:56 +02:00
fermin831 2693bbe209 Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev 
Conflicts:
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/operation/agentes/ver_agente.php
 2018-10-10 19:39:27 +02:00
fermin831 18ad7a2ce9 [Tags performance] Fixed not init filter 2018-10-10 19:14:24 +02:00
alejandro-campos 7fcbc6ece9 added check whto skip alert creation table printing in cluster alert only when step is 5 2018-10-10 18:54:46 +02:00
danielmaya 4ac4f46daf Fixed html_print_autocomplete_modules 2018-10-10 18:02:10 +02:00
fermin831 496f99e42f [Tags performance] Fixed tags counters in tags view 2018-10-10 17:43:02 +02:00
fermin831 de10de03f7 [Tags performance] Fixed edit and delete massive delete and edit modules in bulk selecting modules first 2018-10-10 17:42:33 +02:00
danielmaya 8339eecacc Merge branch '2737-Optimización-de-tags-dev' of https://192.168.50.5:8081/artica/pandorafms into 2737-Optimización-de-tags-dev 2018-10-10 16:57:15 +02:00
danielmaya 4558c909ef Changed source filter in event list 2018-10-10 16:57:04 +02:00
vgilc 363fc920d7 Merge branch '2760-sincronizacion-automatica-meta-a-nodos' into 'develop' 
Modified query to match MR requirements

See merge request artica/pandorafms!1850
 2018-10-10 15:04:15 +02:00
fbsanchez 299868cfd5 meta_db* added to tmetaconsole_setup 2018-10-10 14:35:09 +02:00
fbsanchez 42caddeadd Modified query to match MR requirements 2018-10-10 14:32:43 +02:00
vgilc ba419ad246 Merge branch '2881-Añadir-campo-de-estado-de-agente-en-la-llamada-API-get_all_agents-fix' into 'develop' 
Fix returnData - #2881

See merge request artica/pandorafms!1849
 2018-10-10 09:10:27 +02:00
artica 1694fccd83 Auto-updated build strings. 2018-10-10 00:01:47 +02:00