tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-14 22:38:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
35,333 Commits 34 Branches 30 Tags
Commit Graph

1463 Commits

Author SHA1 Message Date
Daniel Maya
0e4d423825 Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-13 15:17:18 +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
daniel
0643b4e0ba fixed styles 2023-03-13 12:19:27 +01:00
Jonathan
80076434b3 SNMP visual fix staticts 2023-03-13 10:29:03 +01:00
daniel
dcfaaea016 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-10 14:50:31 +01:00
daniel
3be507ca7e fixed styles 2023-03-10 12:40:21 +01:00
Daniel Maya
030a37a5da Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-10 12:19:00 +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
Jose Gonzalez
3f884d9aff Tree View fixed 2023-03-10 11:09:36 +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
daniel
312efeaa1e Merge branch 'ent-10281-descuadre-vista-snmp-console' into 'develop' 
Ent 10281 descuadre vista snmp console

See merge request artica/pandorafms!5526
 2023-03-09 18:59:36 +00:00
Rafael Ameijeiras
bcc1775b1b Merge branch 'ent-10350-GISS-Pierden-acceso-a-Metaconsola-mientras-dura-la-ejecucion-de-pandoradb' into 'develop' 
handling synchronizer instantiation when metaconsole is merging

See merge request artica/pandorafms!5580
 2023-03-09 15:28:20 +00: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
Rafael Ameijeiras
6ecb49bbda Merge branch 'ent-10548-No-se-puede-acceder-a-las-colecciones-del-satalite' into 'develop' 
fixed license check

See merge request artica/pandorafms!5585
 2023-03-09 08:05:51 +00:00
Jonathan
69cc3bbd22 #10281 snmp browser details view 2023-03-09 08:37:58 +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
Pablo Aragon
87e82c0410 10457-Audit log, save/load filters 2023-03-08 15:30:48 +01:00
Daniel Cebrian
11250bd59b Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-08 13:00:18 +01:00
Daniel Cebrian
abf8792ec9 #9073 fixed error error for multiple io_safe_input 2023-03-08 09:13:04 +01:00
Daniel Cebrian
27005158ba #9073 resolve conflics and bugs 2023-03-07 17:57:09 +01:00
Jose Gonzalez
5925cb0b2c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 17:50:57 +01:00
Jose Gonzalez
2dbc2e801f Minor icon fixes 2023-03-07 17:24:36 +01:00
alejandro.campos@artica.es
7e5dee5418 fixed license check 2023-03-07 16:27:14 +01:00
Pablo Aragon
3ecbf1e4fa Alerts 2023-03-07 16:17:01 +01:00
Pablo Aragon
d529e6f384 Alerts 2023-03-07 15:59:36 +01:00
Daniel Cebrian
a4634717d8 Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-07 13:49:39 +01:00
Jose Gonzalez
28a003706b Action messages in modals 2023-03-07 12:50:09 +01:00
daniel
c3a297e096 fixed styles 2023-03-07 12:18:51 +01:00
Jose Gonzalez
8f2a2f12c6 Templates view 2023-03-07 11:48:14 +01:00
Jose Gonzalez
70cf44cb8f Module Templates 2023-03-07 11:15:58 +01:00
Jose Gonzalez
e860dea8ca Manage agent groups 2023-03-07 09:41:24 +01:00
Jose Gonzalez
d9913818cb Private Enterprise Numbers minor fixes 2023-03-06 23:47:05 +01:00
daniel
70d2223a46 fixed styles 2023-03-06 17:51:49 +01:00
alejandro.campos@artica.es
f47e2dda8c handling synchronizer instantiation when metaconsole is merging 2023-03-06 17:27:21 +01:00
daniel
5ba9e0e9aa fixed styles 2023-03-06 16:21:10 +01:00
Jose Gonzalez
e33a9bc3e4 Services TreeView 2023-03-06 13:32:21 +01:00
Daniel Cebrian
6a54b814f3 #9073 added arrow images and fixed format php 2023-03-06 13:07:39 +01:00
Jose Gonzalez
3c1c14576e Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-06 11:34:10 +01:00
Jose Gonzalez
e4f63206eb Network maps minor fixes 2023-03-06 11:33:42 +01:00
Jose Gonzalez
6a35eb9950 Network map minor fixes 2023-03-06 11:12:59 +01:00
Jose Gonzalez
c48ec28743 Minor fixes 2023-03-06 10:35:34 +01:00
Pablo Aragon
f77f635b8d div>ul>li styles 2023-03-06 10:09:21 +01:00
daniel
f6e063b981 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/include/class/SnmpConsole.class.php
 2023-03-06 08:09:29 +01:00
Jimmy Olano
6b55c65330 Merge branch 'ent-10092-14739-peticion-de-filtro-en-widget-tree-view' into 'develop', JJOS. 
Ent 10092 14739 peticion de filtro en widget tree view

See merge request artica/pandorafms!5532
 2023-03-05 22:56:35 +00:00
daniel
08dca1a83c fixed styles 2023-03-05 13:46:27 +01:00
Jimmy Olano
aea0aa3fb9 Merge branch 'ent-10282-desactivar-la-edicion-de-traps-en-la-version-open' into 'develop', JJOS. 
Draft: Ent 10282 desactivar la edicion de traps en la version open

See merge request artica/pandorafms!5483
 2023-03-03 14:00:40 +00:00
daniel
5d7738a05e Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/operation/events/events.php
 2023-03-03 08:20:44 +01:00