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

33205 Commits

Author SHA1 Message Date
Jose Gonzalez 3ebfee9ccb Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 16:21:35 +01:00
Jose Gonzalez c2ba5cfdd3 Agent status 2023-03-13 16:21:14 +01:00
Pablo Aragon 51ab985784 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 16:14:02 +01:00
Pablo Aragon 6450100f23 Manage agent, setup view 2023-03-13 16:13:49 +01:00
Jose Gonzalez a7cfa310a3 Agents alias in header 2023-03-13 15:52:28 +01:00
Jose Gonzalez 1c85038ffa Discovery progress bars 2023-03-13 15:44:55 +01:00
Jose Gonzalez 3ae465c1fe Fix header help icons 2023-03-13 14:33:42 +01:00
Jose Gonzalez 0624f16ce9 Minor fix 2023-03-13 14:23:54 +01:00
Jonathan a0bffb79bd Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 14:21:17 +01:00
Jonathan 10c0d95f34 Reports PDFS changes 2023-03-13 14:21:10 +01:00
Jose Gonzalez 1b4136d91e Minor fix 2023-03-13 14:10:20 +01:00
Jose Gonzalez 45ba4cdd15 Netflow 2023-03-13 14:03:00 +01:00
Jose Gonzalez 7bedd86e25 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 13:26:03 +01:00
Jose Gonzalez 5466cb5995 Netflow live view 2023-03-13 13:25:42 +01:00
Rafael Ameijeiras 6545c72d85 Merge branch 'ent-10485-fix-inconsistency-between-lag-calculation-on-server-and-cosole' into 'develop' 
Ent 10485 fix inconsistency between lag calculation on server and cosole

See merge request artica/pandorafms!5577
 2023-03-13 12:22:06 +00:00
Daniel Cebrian bdeb2240f3 10324 refactor duplicity code 2023-03-13 13:01:48 +01:00
Calvo 8bdc528dc4 Merge remote-tracking branch 'origin/develop' into ent-10485-fix-inconsistency-between-lag-calculation-on-server-and-cosole 2023-03-13 12:58:14 +01:00
Daniel Cebrian 339d7e8bfe #10324 fixed error 500 2023-03-13 12:57:09 +01:00
daniel 0643b4e0ba fixed styles 2023-03-13 12:19:27 +01:00
Pablo Aragon 0203e5eba9 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 12:03:43 +01:00
Pablo Aragon 2cd09d7618 Datatable message info 2023-03-13 12:03:33 +01:00
Jose Gonzalez 590e7a3978 Netflow improvements 2023-03-13 11:25:43 +01:00
daniel c3250a39b0 Merge branch 'ent-9680-widget-para-mostrar-modulos-por-estados' into 'develop' 
Ent 9680 widget para mostrar modulos por estados

See merge request artica/pandorafms!5511
 2023-03-13 09:48:12 +00:00
daniel 503a1b2c22 Merge remote-tracking branch 'origin/develop' into ent-9680-widget-para-mostrar-modulos-por-estados 
Conflicts:
	pandora_console/include/lib/Dashboard/Widget.php
 2023-03-13 10:43:38 +01:00
daniel 8e2338442d Merge branch 'ent-9895-mensaje-de-error-con-ldap-login-poco-explicativo' into 'develop' 
Ent 9895 mensaje de error con ldap login poco explicativo

See merge request artica/pandorafms!5433
 2023-03-13 09:39:29 +00:00
Jonathan 80076434b3 SNMP visual fix staticts 2023-03-13 10:29:03 +01:00
Jose Gonzalez bbec6a92a4 Minor fixes 2023-03-13 09:35:12 +01:00
daniel cf7e5b7ad9 Merge remote-tracking branch 'origin/develop' into ent-9895-mensaje-de-error-con-ldap-login-poco-explicativo 2023-03-13 09:34:11 +01:00
daniel ed30645c20 Merge branch 'ent-9859-nuevos-widgets-para-mostrar-datos-en-dashboard-avg-sum-max-min' into 'develop' 
Ent 9859 nuevos widgets para mostrar datos en dashboard avg sum max min

See merge request artica/pandorafms!5528
 2023-03-13 08:26:05 +00:00
daniel 80c81daafa Merge remote-tracking branch 'origin/develop' into ent-985t push 
9-nuevos-widgets-para-mostrar-datos-en-dashboard-avg-sum-max-min

Conflicts:
	pandora_console/operation/agentes/estado_agente.php
 2023-03-13 09:23:53 +01:00
Daniel Cebrian 596ade6d37 #10324 added system fav in tactical view group 2023-03-13 09:14:16 +01:00
Daniel Cebrian 3c614c7c46 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 09:01:59 +01:00
Daniel Cebrian dfa2ab818e Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 08:53:35 +01:00
daniel 60f8c9bc95 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-13 07:55:43 +01:00
artica 87e165ff80 Auto-updated build strings. 2023-03-13 01:00:18 +01:00
artica ef04e54058 Auto-updated build strings. 2023-03-12 01:00:40 +01:00
Jose Gonzalez d449179765 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-11 02:10:23 +01:00
Jose Gonzalez f553019a40 Minor fixes 2023-03-11 02:10:16 +01:00
Jose Gonzalez 39ace10629 Fix image issue with Networkmap 2023-03-11 02:08:37 +01:00
artica a4d1d2c9b2 Auto-updated build strings. 2023-03-11 01:00:20 +01:00
daniel 3c7592dffe Merge branch 'ent-9662-second-round' into 'develop' 
Ent 9662 second round

See merge request artica/pandorafms!5592
 2023-03-10 13:52:58 +00:00
daniel dcfaaea016 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-10 14:50:31 +01:00
daniel 8778fcea93 fixed styles 2023-03-10 14:49:38 +01:00
Pablo Aragon 427ecf96e4 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-10 13:03:35 +01:00
Pablo Aragon ceed3c5d51 Alert details validation 2023-03-10 13:02:23 +01:00
Matias Didier 7d6452554f Merge branch 'ent-10551-Al-crear-actualizar-CV-con-espacios-se-meten-entities-en-el-nombre' into 'develop' 
fixed entities

See merge request artica/pandorafms!5578
 2023-03-10 11:54:46 +00:00
Jose Gonzalez f875fe674e Fix main_menu_icons 2023-03-10 12:52:18 +01:00
Jose Gonzalez a065833117 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-10 12:48:50 +01:00
Jose Gonzalez bb6bf85537 Minor visual fixes 2023-03-10 12:48:31 +01:00
Jose Gonzalez dc216ff788 Tree view black 2023-03-10 12:47:44 +01:00