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

281 Commits

Author SHA1 Message Date
Luis Calvo 6fdd88ab65 Fixed errors on eHorus user level conf 2019-05-28 17:19:13 +02:00
Luis Calvo 5966367f8f eHorus user level login conf added in user editor 2019-05-28 13:14:42 +02:00
Luis Calvo 588d19102f Resolve merge conflict 2019-05-27 18:30:24 +02:00
Luis Calvo ce34adb9d8 Fixed errors and corrected style 
Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a
 2019-05-13 17:28:23 +02:00
Luis Calvo 27096276ec agent view user acces ehorus 
Former-commit-id: 66739ce807d5bd5f2e46ce9fd1aa0cc72afbb4bc
 2019-05-13 15:00:29 +02:00
Daniel Barbero Martin ac41e9255f helpers 
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
 2019-04-24 13:53:18 +02:00
daniel d9e0f2ea42 Merge remote-tracking branch 'origin/develop' into 3088-Se_carga_filtro_en_vista_de_eventos_cuando_no_hay_filtro_activo 
Former-commit-id: f0ab3426fdf23bbceed7c2cd991b37c33ec3ae2e
 2019-02-21 13:26:12 +01:00
daniel dc4d5b1bd7 fixed error in widget 
Former-commit-id: 3b0d2e8641d35f7c339aa4229f0a7108216704e0
 2019-02-21 13:21:05 +01:00
manuel 00cba4cbc9 Fixed bug in filtered modules by tag 
Former-commit-id: 098d3c88a9a30fb1c38074e741f093ff40fd5d02
 2019-02-19 13:05:31 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
fbsanchez 0686982055 Fixed agents_get_group_agents while trying to get agent list from target group 
Former-commit-id: 8a005e1574760688f5823cc854a287774c8c828b
 2018-12-28 13:09:37 +01:00
danielmaya b155b06ae9 Fixed issue with secondary group 
Former-commit-id: 879f30eec17cc27446c86dcc34bb4d774f0632dc
 2018-12-07 11:20:15 +01:00
danielmaya 62ad6b9a35 Added check of tags in report wizard 2018-11-22 10:39:48 +01:00
danielmaya 3ffd976365 resolved conflicts in ver_agente 2018-11-07 12:31:54 +01:00
vgilc 1973a5fe54 Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop' 
WUX-UX integration

See merge request artica/pandorafms!1890
 2018-10-26 14:42:23 +02:00
vgilc f2356a3a9b Merge branch 'ent-2608-mas-problemas-de-vistas-de-grupos-secundarios' into 'develop' 
Ent 2608 mas problemas de vistas de grupos secundarios

See merge request artica/pandorafms!1856
 2018-10-25 12:59:51 +02:00
danielmaya bbde9c70b6 conflict resolved 2018-10-25 11:13:57 +02:00
fbsanchez 50aa314191 WUX-UX integration 2018-10-24 19:31:39 +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
fermin831 c74e4a3d6a Fixed agent filter on agents/module view to see secondary groups 2018-10-11 15:45:11 +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
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
fermin831 28f9e152e7 [Tags performance] Fixed tags filter and removed unwanted code 2018-10-09 10:56:02 +02:00
samucarc 61a82337c3 Fixed error in agents bulk operations 2018-10-08 17:57:05 +02:00
Fermin 099f01a4ba [Tags performance] Fixed select modules from Agent/Module dashboard widget 2018-10-08 13:45:30 +02:00
fermin831 7ffeaaf50b [Tags performance] fermin revision 1 2018-10-03 11:13:52 +02:00
danielmaya 958930931e Fixed filter group in agents/modules view 2018-10-03 10:42:59 +02:00
fermin831 28b879f058 [Tags performance] Added TODOS to revise agents_get_modules 2018-10-02 09:48:29 +02:00
vgilc 2dac09435a Merge branch '2040-Tags-en-operaciones-masivas' into 'develop' 
fixed bug on bulk delete and bulk update module operation

See merge request artica/pandorafms!1613
 2018-09-28 11:05:34 +02:00
manuel.montes 0621b5a3ac Fixed in Custom graphs 2018-07-18 13:33:53 +02:00
alejandro-campos 213a59d26e fixed bug on bulk delete and bulk update module operation 2018-07-16 18:14:18 +02:00
vgilc a69550f79e Merge branch 'fix-warnings-with-php72' into 'develop' 
Fixed warnings and some icons are not shown correctly with php7.2.

See merge request artica/pandorafms!1490
 2018-06-05 10:26:40 +02:00
danielmaya 04f117523b Fixed sources in log report 2018-05-31 17:33:51 +02:00
Junichi Satoh cb10d6d4a4 Fixed warnings and some icons are not shown correctly with php7.2. 2018-05-22 20:18:49 +09:00
fermin831 60f7a0ab79 Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios 
Conflicts:
	pandora_console/include/class/Tree.class.php
 2018-04-10 09:29:14 +02:00
fermin831 c96b883614 [Secondary groups] Fixed agent view to include secondary agents 2018-03-26 12:52:37 +02:00
enriquecd 632845c9b3 Adapt search bar to cluster id_os 100 - #1866 2018-03-22 11:04:19 +01:00
enriquecd 9a4ea41942 Add search bar to cluster agent aggregator - #1866 2018-03-07 16:18:35 +01:00
vgilc 88d000379a Merge branch 'fix-modules_selection_mode_changes_not_update_module_list' into 'develop' 
Make change of "modules selection mode" in scheduled downtime editor updates module list

See merge request artica/pandorafms!1334
 2018-03-05 09:15:30 +01:00
daniel 78bb12f015 fixed errors select all agent where module common 2018-03-02 12:55:03 +01:00
KIKUCHI Koichiro a63a107f10 Cast $idAgents to array to prevent PHP warning 2018-03-02 17:33:19 +09:00
danielmaya 43ce57d5ed Fixed status filter in bulk operation (modules) 2018-02-20 10:03:23 +01:00
daniel d2bc062766 fixed errors extensions agent-modules and recursion groups 2018-01-05 10:29:46 +01:00
Arturo Gonzalez eb39d25c4b Added field to get string modules 2017-11-10 15:03:52 +01:00
vgilc 6ddf744163 Merge branch '1511-visual-console-elements-not-sorted-in-creation-dev' into 'develop' 
Added changes to sort json in ajax return

See merge request artica/pandorafms!1001
 2017-11-03 10:46:17 +01:00
fermin831 c849df1c21 Added enterprise_hook to a UX function on the Open part 2017-11-02 10:31:01 +01:00
Arturo Gonzalez 50e7e5fc17 Added changes to sort json in ajax return 2017-10-31 16:39:58 +01:00
vgilc 89f5af3b52 Merge branch '1282-Errores-en-selectores-de-agentes-y-módulos-dev' into 'develop' 
Fixed ordering and repetition modules

See merge request artica/pandorafms!820
 2017-10-26 12:29:00 +02:00