tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-09-02 23:58:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,536 Commits 34 Branches 30 Tags
Commit Graph

2012 Commits

Author SHA1 Message Date
Ramon Novoa
574e537ff1 Decode entities in the eHorus password. 
Ref pandora_enterprise#3073.
 2018-11-14 12:16:59 +01:00
daniel
ac671d041c Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-13 15:47:07 +01:00
fermin831
a201262737 Fixed php errors on radial networkmap 2018-11-12 16:29:31 +01:00
daniel
1c1df4b5f7 fixed errors css jqueryui 2018-11-07 17:09:42 +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
samucarc
3d99ef48aa Fixed ACLs in monitoring View and agent detail 2018-11-05 13:05:34 +01:00
danielmaya
3c78e387df Fixed nodes count in pandora_networkmap 2018-11-02 11:32:07 +01:00
fbsanchez
39b6164526 snapshot viewer fix 2018-10-30 18:20:10 +01:00
vgilc
b1bf1d7b4b Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop' 
2326 unificar vistas ux y wux en un mismo portal

See merge request artica/pandorafms!1917
 2018-10-30 16:20:26 +01:00
fbsanchez
a58bde2118 fixed UX historical snapshot viewer 2018-10-30 16:12:48 +01:00
vgilc
e03f56f0d7 Merge branch '2429-Resaltar-elementos-al-pasar-por-encima-o-marcar' into 'develop' 
2429 resaltar elementos al pasar por encima o marcar

See merge request artica/pandorafms!1762
 2018-10-29 09:17:54 +01:00
vgilc
17286414c7 Merge branch '2619_Group_View' into 'develop' 
Added warning and normal status agents in group view

See merge request artica/pandorafms!1799
 2018-10-29 09:16:33 +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
daniel
0b0bad8a73 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/graphs/fgraph.php
 2018-10-25 17:43:28 +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
vgilc
4c4c874553 Merge branch '2630-Exportación-Gráficas-relacionado-con-CSV' into 'develop' 
Fixed bug in csv export graph

See merge request artica/pandorafms!1814
 2018-10-25 12:57:24 +02:00
vgilc
82f6e3cb95 Merge branch '2786-Errores-en-mapas-de-red-dev' into 'develop' 
Fixed group and set_center

See merge request artica/pandorafms!1880
 2018-10-25 11:43:38 +02:00
danielmaya
bbde9c70b6 conflict resolved 2018-10-25 11:13:57 +02:00
vgilc
582db8d3b5 Merge branch '2618_Bug_Acceso_agentes_en_vista_de_grupo' into 'develop' 
Fixed enterprise ACLs in Agents View

See merge request artica/pandorafms!1853
 2018-10-25 10:40:12 +02:00
vgilc
2b6e8473dc Merge branch 'ent-2908-lentitud-vista-tactica-cuando-hay-millones-de-eventos' into 'develop' 
Improve performance on tactical view with a lot of events

See merge request artica/pandorafms!1857
 2018-10-25 10:32:11 +02:00
fbsanchez
50aa314191 WUX-UX integration 2018-10-24 19:31:39 +02:00
danielmaya
87abf1dc02 added event time filter in tactical view 2018-10-24 16:36:44 +02:00
danielmaya
f10a661cd6 Fixed group and set_center 2018-10-23 12:36:20 +02:00
daniel
ffc7734ebc delete flash_charts and library pchart 2018-10-19 11:31:06 +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
41d104ae2c Improve performance on tactical view with a lot of events 2018-10-15 12:23:51 +02:00
fermin831
c74e4a3d6a Fixed agent filter on agents/module view to see secondary groups 2018-10-11 15:45:11 +02:00
samucarc
015dcdb032 Fixed enterprise ACLs in Agents View 2018-10-11 13:07:59 +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
danielmaya
4ac4f46daf Fixed html_print_autocomplete_modules 2018-10-10 18:02:10 +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
Fermin
1e4c570541 [Tags performance] check agents_get_modules in networkmap and removed unused code 2018-10-05 10:44:24 +02:00
danielmaya
5fd76bf8cb 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-05 09:42:09 +02:00
danielmaya
e8621e54e5 Updated tags optimization 2018-10-05 09:40:08 +02:00
Fermin
1278f03fd9 [Tags performance] agents_get_modules misc checks 2018-10-04 19:08:01 +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
danielmaya
14caf7bc07 Added new search input for the module name 2018-10-02 11:12:10 +02:00
fermin831
28b879f058 [Tags performance] Added TODOS to revise agents_get_modules 2018-10-02 09:48:29 +02:00
fermin831
9a47d5325e [Tags performance] Events improvements 2018-10-01 17:03:37 +02:00
fermin831
debf8db577 [Tags performance] Added some TODOs 2018-09-28 12:39:23 +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
712103c308 Fixed bug in csv export graph 2018-09-27 17:35:52 +02:00