Diego Muñoz-Reja
|
6bdecc43e7
|
Merge branch 'ent-8642-nuevo-widget-heatmap' into 'develop'
Ent 8642 nuevo widget heatmap
See merge request artica/pandorafms!5557
|
2023-03-27 10:43:48 +00:00 |
|
Jonathan
|
3057e67d1f
|
Merge conflict solution
|
2023-03-27 12:11:53 +02:00 |
|
daniel
|
af5f65a66d
|
fixed styles
|
2023-03-27 11:14:58 +02:00 |
|
Jonathan
|
665976e011
|
Bulks masive visual action buttons
|
2023-03-27 11:10:51 +02:00 |
|
Matias Didier
|
2daea0e5c4
|
Merge branch 'ent-10764-favoritos-y-nuevos-menus' into 'develop'
Ent 10764 favoritos y nuevos menus
See merge request artica/pandorafms!5618
|
2023-03-27 09:01:48 +00:00 |
|
artica
|
78bc8e4f50
|
Updated version and build strings.
|
2023-03-27 09:41:48 +02:00 |
|
Jonathan
|
0ae7630714
|
Gis map fix view
|
2023-03-27 08:44:45 +02:00 |
|
Jonathan
|
f8aefa6e34
|
Merge conflict solution
|
2023-03-27 08:31:00 +02:00 |
|
artica
|
75af4a2ca9
|
Auto-updated build strings.
|
2023-03-27 01:00:39 +02:00 |
|
artica
|
9528f59af9
|
Auto-updated build strings.
|
2023-03-26 01:00:17 +01:00 |
|
artica
|
bcf3f1ba1f
|
Auto-updated build strings.
|
2023-03-25 01:00:19 +01:00 |
|
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 Cebrian
|
60f237b66e
|
#10441 added version file in pandora flot
|
2023-03-24 12:53:48 +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 |
|
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 |
|
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 |
|
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
|
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
|
95834b2de7
|
fixed styles
|
2023-03-23 12:41:39 +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 |
|
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
|
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 |
|
Jonathan
|
c52ca613b2
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-22 14:22:08 +01:00 |
|
Jonathan
|
a063c7a0ac
|
Fix header and menu
|
2023-03-22 14:21:56 +01:00 |
|
daniel
|
e82de5d6aa
|
fixed styles
|
2023-03-22 14:08:03 +01:00 |
|
Pablo Aragon
|
41a20a90fa
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-22 11:23:14 +01:00 |
|