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

7364 Commits

Author SHA1 Message Date
Daniel Cebrian
be6c15fc58 #9624 change icon sflow 2023-03-14 10:46:50 +01:00
Daniel Cebrian
dff82df484 #10324 fixed deleted filter event in fav menu 2023-03-14 10:31:31 +01:00
Jose Gonzalez
e71014607a 10669 fix revision 2023-03-14 09:05:59 +01:00
Daniel Cebrian
e36bb1d065 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-14 08:36:12 +01:00
Jose Gonzalez
397c4bd720 Fix plugin icon 2023-03-14 08:35:05 +01:00
Jose Gonzalez
3ab0b1c4cb Minor fixes 2023-03-14 08:04:48 +01:00
Jose Gonzalez
f0a424a493 Module manager fix 2023-03-14 08:04:05 +01:00
Jose Gonzalez
ca39fa8560 #10669 Fix configure_user issue 2023-03-13 21:21:25 +01:00
Jose Gonzalez
79fbab3696 Tubercles removal 2023-03-13 21:17:55 +01:00
Daniel Cebrian
721d7eaff9 #10665 fixed error 500 in user edit view 2023-03-13 18:07:04 +01:00
Jose Gonzalez
fe20b4c49c Plugins view 2023-03-13 17:32:20 +01:00
Jose Gonzalez
b6251edb79 Minor fix 2023-03-13 17:31:43 +01:00
Daniel Cebrian
90f0c3771f #10324 fixed deleted element fav menu 2023-03-13 17:21:28 +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
bbec6a92a4 Minor fixes 2023-03-13 09:35:12 +01:00
Daniel Cebrian
596ade6d37 #10324 added system fav in tactical view group 2023-03-13 09:14:16 +01:00
Daniel Cebrian
dfa2ab818e Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 08:53:35 +01:00
Daniel Cebrian
ca78f069f6 #9624 added support sflow 2023-03-10 17:12:38 +01: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
alejandro.campos@artica.es
39a119d150 Merge remote-tracking branch 'origin/develop' into ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob 2023-03-10 13:29:20 +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
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
daniel
3be507ca7e fixed styles 2023-03-10 12:40:21 +01:00
Daniel Cebrian
841478a86c Merge branch 'develop' into 'ent-9073-nuevo-sistema-de-tips-de-bienvenida' 
# Conflicts:
#   pandora_console/pandoradb.sql
 2023-03-10 10:41:08 +00:00
Pablo Aragon
92e5c4efa0 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-10 08:40:48 +01:00
Pablo Aragon
ae6159c7a1 Events 2023-03-10 08:40:38 +01:00
Jose Gonzalez
edbc9d8f6b Icons review 2023-03-09 23:31:40 +01:00
daniel
9aa5d76963 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-09 20:00:32 +01:00
Jose Gonzalez
ac1db7820c Minor fixes 2023-03-09 17:41:29 +01:00
Jose Gonzalez
d4fa2831bf Inventory tab 2023-03-09 16:44:45 +01:00
Pablo Aragon
cbc05f7ea0 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-09 15:15:06 +01:00
Pablo Aragon
2a97b26cfe Admin tools 2023-03-09 15:14:47 +01:00
daniel
1a63f8070a fixed styles 2023-03-09 15:06:03 +01:00
Jonathan
72a3cb0e3f Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-09 14:15:23 +01:00
Jonathan
1e2657fed3 Chart generator bug solution 2023-03-09 14:15:18 +01:00
Diego Muñoz-Reja
c977188e75 Merge branch 'ent-9883-mejora-de-informes-de-inventario-de-monitorizacion' into 'develop' 
Ent 9883 mejora de informes de inventario de monitorizacion

See merge request artica/pandorafms!5490
 2023-03-09 11:28:48 +00:00
daniel
f2123efa16 fixed styles 2023-03-09 11:32:50 +01:00
alejandro.campos@artica.es
4c926f1e04 fixed entities 2023-03-09 09:07:04 +01:00
alejandro.campos@artica.es
15afa2d976 Merge remote-tracking branch 'origin/develop' into ent-10551-Al-crear-actualizar-CV-con-espacios-se-meten-entities-en-el-nombre 2023-03-09 08:49:27 +01:00
daniel
e21d9968e8 fixed styles 2023-03-08 19:25:25 +01:00
Pablo Aragon
bb1d9c323d Admin tools 2023-03-08 17:12:15 +01:00
Jose Gonzalez
c51c00f974 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 15:05:35 +01:00
Jose Gonzalez
f5daa72c6b Scheduled downtime 2023-03-08 15:04:07 +01:00
Jose Gonzalez
0373cd3514 Scheduled downtime 2023-03-08 15:02:12 +01:00
Jonathan
862e1c0ad3 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 13:45:29 +01:00