Daniel Maya
|
e311c81f84
|
#8642 Fixed meta
|
2023-03-24 14:11:08 +01:00 |
daniel
|
abf9fcf200
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-24 14:05:30 +01:00 |
|
daniel
|
25ea15fe0f
|
fixed styles
|
2023-03-24 14:04:38 +01:00 |
Matias Didier
|
f931a86f22
|
Merge branch 'ent-10792-en-version-open-la-vista-tactica-de-grupo-devuelve-error-500-al-solicitar-grupo-all' into 'develop'
Ent 10792 en version open la vista tactica de grupo devuelve error 500 al solicitar grupo all
See merge request artica/pandorafms!5624
|
2023-03-24 12:15:01 +00:00 |
Daniel Cebrian
|
60f237b66e
|
#10441 added version file in pandora flot
|
2023-03-24 12:53:48 +01:00 |
|
Daniel Cebrian
|
e463024eb6
|
#10441 added version file in css in events
|
2023-03-24 12:34:53 +01:00 |
Pablo Aragon
|
be1fb9298b
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-24 12:29:09 +01:00 |
|
Pablo Aragon
|
95edb47d01
|
10408
|
2023-03-24 12:29:03 +01:00 |
|
Daniel Cebrian
|
075d0a1c4f
|
#10441 added version file in css
|
2023-03-24 12:06:40 +01:00 |
Jimmy Olano
|
eb833f2ad8
|
Merge branch 'ent-10747-version-open-error-500-en-vista-principal-de-un-agente' into 'develop', JJOS.
Ent 10747 version open error 500 en vista principal de un agente
See merge request artica/pandorafms!5616
|
2023-03-24 10:14:01 +00:00 |
Calvo
|
c4ef22164b
|
Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow
|
2023-03-24 10:38:44 +01:00 |
|
Matias Didier
|
5529c33f0c
|
Merge branch 'ent-10650-bugs-funcionales-en-consolas-visuales' into 'develop'
Ent 10650 bugs funcionales en consolas visuales
See merge request artica/pandorafms!5601
|
2023-03-24 09:11:26 +00:00 |
Rafael Ameijeiras
|
f14be9c523
|
Merge branch 'ent-10311-14988-comentarios-de-eventos-se-muestran-en-evento-no-relacionado' into 'develop'
Ent 10311 14988 comentarios de eventos se muestran en evento no relacionado
See merge request artica/pandorafms!5582
|
2023-03-24 09:03:37 +00:00 |
|
Daniel Cebrian
|
da742bc15e
|
#10441 added version file in js
|
2023-03-24 09:13:22 +01:00 |
|
Rafael Ameijeiras
|
a30ba4cf27
|
Merge branch 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' into 'develop'
Ent 9624 meter soporte a sflow en nuestro gestor de flujos
See merge request artica/pandorafms!5587
|
2023-03-24 07:25:52 +00:00 |
artica
|
8a14ec6725
|
Auto-updated build strings.
|
2023-03-24 01:00:23 +01:00 |
|
Calvo
|
62d4fd717b
|
Added ssl connect error logging to tentacle
|
2023-03-23 19:04:43 +01:00 |
|
daniel
|
be343e3c08
|
Merge branch 'ent-9662-second-round' into 'develop'
Ent 9662 second round
See merge request artica/pandorafms!5622
|
2023-03-23 16:51:25 +00:00 |
|
daniel
|
96d03ca31c
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-23 17:47:58 +01:00 |
|
Pablo Aragon
|
0fa79e44f1
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-23 17:44:16 +01:00 |
|
daniel
|
bac1a7bf65
|
fixed styles
|
2023-03-23 17:44:06 +01:00 |
|
Pablo Aragon
|
122f45fcaa
|
Metasetup
|
2023-03-23 17:44:04 +01:00 |
|
Daniel Cebrian
|
31fd4a616c
|
#10793 fixed pagination filter
|
2023-03-23 16:36:06 +01:00 |
|
Daniel Cebrian
|
d3408442d3
|
#10793 fixed collation in sql
|
2023-03-23 16:25:08 +01:00 |
|
Daniel Cebrian
|
044bd0e54d
|
#10793 changed collation tables tips
|
2023-03-23 15:57:32 +01:00 |
|
Daniel Cebrian
|
69b573e266
|
#10441 added version in import files js and css
|
2023-03-23 14:43:13 +01:00 |
|
daniel
|
56e4770b93
|
fixed styles
|
2023-03-23 14:20:54 +01:00 |
|
Rafael Ameijeiras
|
766664470d
|
Merge branch 'ent-9893-nuevo-sistema-de-ha' into 'develop'
Ent 9893 nuevo sistema de ha
See merge request artica/pandorafms!5563
|
2023-03-23 12:58:53 +00:00 |
Daniel Rodriguez
|
b09d65dd91
|
Merge branch 'ent-10010-mejorar-filtrado-logs-en-informe-de-logs' into 'develop'
Ent 10010 mejorar filtrado logs en informe de logs
See merge request artica/pandorafms!5602
|
2023-03-23 11:46:49 +00:00 |
|
daniel
|
95834b2de7
|
fixed styles
|
2023-03-23 12:41:39 +01:00 |
|
Daniel Cebrian
|
2683f9e6dc
|
#10792 fixed error 500 in agent status list
|
2023-03-23 12:39:55 +01:00 |
Ramon Novoa
|
96a9063196
|
Fix a typo.
|
2023-03-23 12:27:19 +01:00 |
|
Daniel Maya
|
52231615f6
|
Merge branch 'develop' into ent-8642-nuevo-widget-heatmap
|
2023-03-23 11:51:54 +01:00 |
|
Pablo Aragon
|
1ac37dd538
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-23 11:51:32 +01:00 |
|
Pablo Aragon
|
f32c886167
|
10712-login
|
2023-03-23 11:51:21 +01:00 |
|
Ramon Novoa
|
5b3c5850b0
|
Set a default value for ha_hosts_file in pandora_db.
|
2023-03-23 11:17:00 +01:00 |
|
Daniel Maya
|
94c843dac2
|
#9662 Fixed gis map menu
|
2023-03-23 10:41:08 +01:00 |
|
Daniel Cebrian
|
a60f9be920
|
#9624 changed default binary path daemon for sflow
|
2023-03-23 09:53:34 +01:00 |
|
Pablo Aragon
|
e2820d1ad7
|
9680-Fix widget
|
2023-03-23 09:18:39 +01:00 |
|
daniel
|
0959f1a537
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-23 07:44:17 +01:00 |
|
artica
|
cbbddd1ac6
|
Auto-updated build strings.
|
2023-03-23 01:00:18 +01:00 |
|
Pablo Aragon
|
1316968295
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-22 20:00:48 +01:00 |
|
Pablo Aragon
|
bd48dba65f
|
10715-Fix width tree view graph
|
2023-03-22 20:00:42 +01:00 |
|
daniel
|
cf0ef462b9
|
Merge branch 'ent-9662-second-round' into 'develop'
Ent 9662 second round
See merge request artica/pandorafms!5621
|
2023-03-22 18:15:58 +00:00 |
|
daniel
|
72c95a6274
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-22 19:12:16 +01:00 |
|
Pablo Aragon
|
d6bf16f536
|
10712-Login
|
2023-03-22 18:57:36 +01:00 |
|
Rafael Ameijeiras
|
4535fb85a3
|
Merge branch 'ent-10568-14584-Comentarios-no-mostrados-en-eventos' into 'develop'
fixes in event comments
See merge request artica/pandorafms!5591
|
2023-03-22 17:05:54 +00:00 |
|
Pablo Aragon
|
8b163cd100
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-22 16:42:15 +01:00 |
|
Pablo Aragon
|
b0b2778c4a
|
10760-Setup
|
2023-03-22 16:42:03 +01:00 |
|
Calvo
|
6c8337de8c
|
Merge branch 'ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow' of brutus.artica.es:artica/pandorafms into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow
|
2023-03-22 14:27:25 +01:00 |