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

345 Commits

Author SHA1 Message Date
Daniel Barbero Martin ed0688f853 fixed macros reports 2019-07-10 18:20:43 +02:00
Daniel Rodriguez 96fbca35a4 Merge branch 'ent-4194-Revision-de-CSS-alternativos' into 'develop' 
Created black theme - #4194

See merge request artica/pandorafms!2564
 2019-07-10 11:47:21 +02:00
Daniel Rodriguez e43469954a Merge branch 'ent-4109-Bug-en-utilizacion-de-macro-en-report-a-traves-de-plantillas' into 'develop' 
fix item name macros when using report templates

See merge request artica/pandorafms!2570
 2019-07-08 17:13:13 +02:00
Tatiana Llorente 0cccafc7be Heartbeat gifs with black background - #4194 2019-07-08 10:37:34 +02:00
marcos.alconada 2ad44fcf90 final merge 3360 ticket 2019-07-03 17:07:31 +02:00
alejandro-campos 51d7104de7 fix item name macros when using report templates 2019-07-02 18:09:52 +02:00
fbsanchez c3ebe88178 style review 2019-06-18 17:40:31 +02:00
Alejandro Gallardo Escobar 3332e41f41 Added an option to use the metaconsole table when fetching the agents 
Former-commit-id: d21627018f662d27f5612bf69bddfd8d298437ca
 2019-04-22 15:02:15 +02:00
fbsanchez 783417cab5 rollback agent_get_agents 
Former-commit-id: 95627afdb87777d0703fe57a82f7a3e0ec82b286
 2019-03-28 12:20:15 +01:00
fbsanchez face622e9e reset-map fixed 
Former-commit-id: b89cf24a88f5e190cae0d2e55a55a8d988d94458
 2019-03-22 18:27:12 +01:00
fbsanchez 95c61024f7 Cleanup Networkmaps 
Former-commit-id: 68893c73092e80bf4a67a0aa82c51ec242aab01f
 2019-03-13 11:38:03 +01:00
fermin831 e19e7d3484 Modified agents_create_agent to permit create agents with name as alias 
Former-commit-id: 9d3524e2dc02beb92d819cd877b9b44f64154fd5
 2019-02-26 17:30:21 +01: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
Daniel Rodriguez b38dc64ad8 Merge branch '3134-Tardanza_a_la_hora_de_aplicar_cambios_masivamente' into 'develop' 
fixed errors in massive operation edit modules

See merge request artica/pandorafms!2101

Former-commit-id: 5c3a995d57b344ec860679b07b3624aec73cf4b8
 2019-01-15 12:35:11 +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
daniel ac228a7fad fixed error in massive operation 
Former-commit-id: 691f3557d44c686645cfa634eab3630d060def33
 2018-12-28 12:14:17 +01:00
manuel.montes d9749aad03 Fixed bug in agent detail filter 2018-12-04 09:17:34 +01:00
vgilc 71a4a6bf77 Merge branch '2869-Filtro-de-estado-not-normal-incorrecto-en-vista-de-agent-detail' into 'develop' 
Fixed bug in agent status filter

See merge request artica/pandorafms!1829
 2018-11-30 13:21:48 +01:00
fermin831 8a00fe5a30 Fixed query on function agents_get_group_agents 2018-11-20 10:58:58 +01:00
daniel 2eb47c1251 fixed errors in custom fields view 2018-11-16 15:00:09 +01:00
daniel e21fde537a fixed css errors custom field view and new features 2018-11-15 19:16:49 +01:00
daniel 4dbcecb951 WIP custom fields view 2018-11-13 15:46:44 +01:00
daniel afaa6ad2ba Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-12 09:07:56 +01:00
daniel bb15c39ef5 WIP Custom view fields 2018-11-08 15:03:40 +01:00
fermin831 059ca855f9 Added cache to agents_get_alias 2018-11-08 13:03:04 +01:00
daniel 218bf81fa1 Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-07 13:30:19 +01:00
daniel 3f78f15499 WIP View custom fields data 2018-11-07 13:28:00 +01:00
danielmaya 3ffd976365 resolved conflicts in ver_agente 2018-11-07 12:31:54 +01:00
daniel b71d396c84 WIP custom fields view 2018-11-05 09:35:17 +01:00
daniel e2fabb6167 WIP custom fields view 2018-11-02 13:37:30 +01:00
daniel b5045d522e WIP custom fields view 2018-10-31 18:02:36 +01:00
daniel f78e86b925 view cusatom field 2018-10-25 17:08:56 +02:00
vgilc 4b317b573b Merge branch '2708-API-metaconsola-function-get_agent-no-devuelve-nada' into 'develop' 
Added code for function api_get_agent_alias for the API of the metaconsole - #2708

See merge request artica/pandorafms!1816
 2018-10-25 12:11:16 +02:00
danielmaya bbde9c70b6 conflict resolved 2018-10-25 11:13:57 +02:00
vgilc b7f9149c20 Merge branch '2920-No-funciona-el-wizard-para-crear-agentes-desde-la-metaconsola' into 'develop' 
Changed function that creates a new agent from metaconsole to set field name…

See merge request artica/pandorafms!1873
 2018-10-19 11:30:47 +02:00
alejandro-campos 3fd588353b Changed function that creates a new agent from metaconsole to set field name with a hash and fixed bug when setting alias in database 2018-10-19 10:43:43 +02:00
fermin831 060e46868d Fixed tags filter on bulk operation (select module first) 2018-10-17 11:57:22 +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 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
manuel.montes 159d7466cd Merge branch 'develop' into 2869-Filtro-de-estado-not-normal-incorrecto-en-vista-de-agent-detail 
Conflicts:
	pandora_console/include/functions_agents.php
 2018-10-09 17:01:08 +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
Fermin d2b8939804 [Tags performance] Fixed select_modules_for_agent_group function (failed with several secondary groups). 2018-10-08 12:33:40 +02:00
Fermin a72b9b0515 [Tags performance] Fixed agents_get_modules to ajax calls 2018-10-05 13:32:14 +02:00
manuel.montes 07e476a740 Fixed bug in agent status filter 2018-10-04 16:35:37 +02:00
fermin831 a33cae9e8f [Tags performance] Check functions_agents agents_get_modules 2018-10-03 16:33:56 +02:00
fermin831 0ca13b8e98 Removed unused code 2018-10-03 15:04:45 +02:00