daniel
|
c610063244
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-29 08:33:02 +02:00 |
Jonathan
|
a760bbfbc2
|
MIB Uploader fix delete icon
|
2023-03-29 08:22:35 +02:00 |
Jimmy Olano
|
5044c23ef3
|
Merge branch 'ent-9529-14208-definir-timezone-por-defecto-para-nuevos-usuarios' into 'develop', JJOS.
Draft: Ent 9529 14208 definir timezone por defecto para nuevos usuarios
See merge request artica/pandorafms!5492
|
2023-03-29 02:28:47 +00:00 |
artica
|
5113117a39
|
Auto-updated build strings.
|
2023-03-29 01:00:25 +02:00 |
Diego Muñoz-Reja
|
35a1c2332d
|
Merge branch 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' into 'develop'
implemented consoles management
See merge request artica/pandorafms!5558
|
2023-03-28 15:33:37 +00:00 |
|
daniel
|
86e492f275
|
fixed styles
|
2023-03-28 17:26:14 +02:00 |
Daniel Maya
|
eac71560cb
|
#10819 Fixed policy alert img
|
2023-03-28 17:22:25 +02:00 |
Pablo Aragon
|
dab2a29b6b
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-28 17:07:19 +02:00 |
|
Pablo Aragon
|
ce014e4c6b
|
Datatables. Treeview graph meta
|
2023-03-28 17:07:06 +02:00 |
Alejandro Campos
|
e909686ddc
|
Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob'
# Conflicts:
# pandora_console/extras/mr/62.sql
|
2023-03-28 14:09:33 +00:00 |
|
daniel
|
0df3ad3ff3
|
fixed styles
|
2023-03-28 13:44:24 +02:00 |
|
Pablo Aragon
|
c7cd688b4b
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-28 12:39:32 +02:00 |
|
Pablo Aragon
|
5969928003
|
10408-Fix action column & 10398-Events pure mode
|
2023-03-28 12:39:02 +02:00 |
|
Jonathan
|
7a3e894bb0
|
Menu fix follow reports
|
2023-03-28 11:06:03 +02:00 |
|
Daniel Maya
|
490e547202
|
#10699 Fixed central node
|
2023-03-28 11:03:59 +02:00 |
|
Daniel Maya
|
712da9070f
|
#10699 Fixed maps
|
2023-03-28 10:45:41 +02:00 |
|
Jonathan
|
87946161f3
|
Solution conflict
|
2023-03-28 09:30:18 +02:00 |
|
Jonathan
|
81be0da7fd
|
Module manager editor relations visual change
|
2023-03-28 09:17:47 +02:00 |
|
daniel
|
3d815d56c8
|
fixed styles
|
2023-03-28 08:45:40 +02:00 |
|
daniel
|
4e01838238
|
fixed styles
|
2023-03-28 08:43:46 +02:00 |
|
artica
|
061c9f8750
|
Auto-updated build strings.
|
2023-03-28 01:00:16 +02:00 |
|
daniel
|
ebffb004e9
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-27 21:22:06 +02:00 |
|
Pablo Aragon
|
98f812b757
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-27 17:03:45 +02:00 |
|
Pablo Aragon
|
55ff0e0597
|
wux and wmi
|
2023-03-27 17:03:38 +02:00 |
|
Jonathan
|
52076a56c2
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-27 16:26:28 +02:00 |
|
Jonathan
|
e06fc2f115
|
Collection visual fix
|
2023-03-27 16:26:12 +02:00 |
|
daniel
|
48a254c4b2
|
fixed styles
|
2023-03-27 14:34:05 +02:00 |
|
Jonathan
|
ea6aa8629b
|
Module check force
|
2023-03-27 14:07:36 +02:00 |
|
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 |
|
Pablo Aragon
|
904b526b30
|
Change pass login. Graph tree view width
|
2023-03-22 11:23:07 +01:00 |
|
daniel
|
5eaa4a10bb
|
fixed styles
|
2023-03-22 11:13:56 +01:00 |
|
Rafael Ameijeiras
|
87421e772d
|
Merge branch 'develop' into 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos'
# Conflicts:
# pandora_console/install.php
|
2023-03-22 08:23:07 +00:00 |
|
artica
|
6e8eb9800f
|
Auto-updated build strings.
|
2023-03-22 01:00:23 +01:00 |
|
daniel
|
64e5ceaea0
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-21 18:43:39 +01:00 |
|
daniel
|
732000f7bd
|
fixed styles
|
2023-03-21 18:42:31 +01:00 |
|
Pablo Aragon
|
583ec8209c
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-21 18:12:11 +01:00 |
|
Pablo Aragon
|
99b845db3f
|
progress bar
|
2023-03-21 18:12:02 +01:00 |
|
Jonathan
|
e2615b9593
|
Visual changes header
|
2023-03-21 17:02:03 +01:00 |
|
Daniel Cebrian
|
fe70d7d44b
|
#10650 added image maintenance mode
|
2023-03-21 16:26:05 +01:00 |
|
Daniel Cebrian
|
a21e43a452
|
#10764 ignore selected action in fav menu
|
2023-03-21 15:40:46 +01:00 |
|
Jonathan
|
93f5b62bd2
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-21 14:23:15 +01:00 |
|
Jonathan
|
a960644975
|
Omnishell fix view
|
2023-03-21 14:23:12 +01:00 |
|
daniel
|
64fc4bcd46
|
fixed styles
|
2023-03-21 14:06:28 +01:00 |
|
Pablo Aragon
|
1f7183c701
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-21 13:31:18 +01:00 |
|
Pablo Aragon
|
e8744b5d12
|
10712-New login
|
2023-03-21 13:31:11 +01:00 |
|
Jonathan
|
af00950dc5
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-21 12:07:25 +01:00 |
|
Jonathan
|
72778eb97c
|
Wizzard template fix
|
2023-03-21 12:07:10 +01:00 |
|
Daniel Cebrian
|
388c6c3a2f
|
fixed color in counter refresh in node
|
2023-03-21 11:07:44 +01:00 |
|
Daniel Cebrian
|
2db4ec6a2b
|
fixed color in counter refresh
|
2023-03-21 10:53:23 +01:00 |
|
Rafael Ameijeiras
|
361ecf4019
|
Merge branch 'ent-10411-15079-error-event-replication-en-vista-de-comentarios' into 'develop'
Fix events comment tags acl
See merge request artica/pandorafms!5544
|
2023-03-21 09:00:45 +00:00 |
|
Daniel Cebrian
|
9dea38f440
|
Merge branch 'develop' into ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos
|
2023-03-21 09:38:56 +01:00 |
|
artica
|
01e152a6e3
|
Auto-updated build strings.
|
2023-03-21 08:01:57 +01:00 |
|
artica
|
dc86557f19
|
Auto-updated build strings.
|
2023-03-21 08:01:57 +01:00 |
|
artica
|
fff8b78cb4
|
Auto-updated build strings.
|
2023-03-21 08:01:57 +01:00 |
|
artica
|
b9e546cbd6
|
Auto-updated build strings.
|
2023-03-21 08:01:57 +01:00 |
|
artica
|
f896eceb47
|
Auto-updated build strings.
|
2023-03-21 01:00:19 +01:00 |
|
artica
|
37940a2565
|
Auto-updated build strings.
|
2023-03-20 01:00:08 +01:00 |
|
artica
|
e64d9e2b7b
|
Auto-updated build strings.
|
2023-03-19 01:00:12 +01:00 |
|
artica
|
426f756d16
|
Auto-updated build strings.
|
2023-03-18 01:00:23 +01:00 |
|
daniel
|
594d34931c
|
fixed styles
|
2023-03-17 13:20:58 +01:00 |
|
Daniel Cebrian
|
b81b7ce7af
|
#fixed in fav menu when change name the original name
|
2023-03-17 12:25:43 +01:00 |
|
Pablo Aragon
|
b922b50688
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-17 11:34:00 +01:00 |
|
Pablo Aragon
|
6b140445c3
|
10712-New login
|
2023-03-17 11:33:50 +01:00 |
Calvo
|
284e20fc8a
|
Unified default netflow interval and deleted from console setup
|
2023-03-17 10:58:58 +01:00 |
|
daniel
|
f83acb99f0
|
fixed create user and add profile
|
2023-03-17 10:09:11 +01:00 |
|
Daniel Cebrian
|
bb794d603b
|
fixed button create tips and icon remove
|
2023-03-17 09:13:00 +01:00 |
Jose Gonzalez
|
0bbf8d0344
|
New dot icon
|
2023-03-17 08:58:25 +01:00 |
|
Jonathan
|
c219ad91c7
|
Visual minor fix
|
2023-03-17 08:53:58 +01:00 |
|
Calvo
|
13f52c18bc
|
Merge remote-tracking branch 'origin/develop' into ent-10411-15079-error-event-replication-en-vista-de-comentarios
|
2023-03-17 08:44:59 +01:00 |
|
artica
|
6b14fc0205
|
Auto-updated build strings.
|
2023-03-17 01:00:38 +01:00 |
|
daniel
|
3f09fd16a7
|
fixed styles
|
2023-03-16 18:51:54 +01:00 |
|
Jose Gonzalez
|
bbb1855d81
|
External Tools
|
2023-03-16 17:38:51 +01:00 |
|
Daniel Cebrian
|
f8f65bf5a1
|
fixed icon size
|
2023-03-16 17:26:48 +01:00 |
|
Daniel Cebrian
|
20b177d121
|
changed in welcome tips forms
|
2023-03-16 17:23:48 +01:00 |
|
daniel
|
a22b5479d9
|
fixed styles
|
2023-03-16 16:48:03 +01:00 |
|
Jonathan
|
921e949947
|
cluster visual fix link
|
2023-03-16 16:06:03 +01:00 |
|
Jonathan
|
ad5078fcc0
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-16 13:31:22 +01:00 |
|
Jonathan
|
f417772642
|
TipsWindow blacktheme
|
2023-03-16 13:31:16 +01:00 |
|
Pablo Aragon
|
de93dd1c6e
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-16 12:57:59 +01:00 |
|
Pablo Aragon
|
260caca63a
|
10021, 10224, 10652, 10414
|
2023-03-16 12:57:48 +01:00 |
|
Jose Gonzalez
|
3782fdaaf6
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-16 12:50:39 +01:00 |
|
Jose Gonzalez
|
7bd8f0cc0d
|
Minor visual fix
|
2023-03-16 12:50:31 +01:00 |
|
Jonathan
|
fa06b4e8a3
|
datepicker fix logviewer
|
2023-03-16 12:22:14 +01:00 |
|
Daniel Maya
|
1eae8a5a4d
|
#9893 fixed images
|
2023-03-16 12:04:18 +01:00 |
|
Jonathan
|
45a055573a
|
Log viewer datepicker fixed
|
2023-03-16 11:59:38 +01:00 |
|
Jonathan
|
02ef024905
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-16 10:42:46 +01:00 |
|
Jonathan
|
3aba51d0ed
|
Borders and colors PDFS
|
2023-03-16 10:42:39 +01:00 |
|
Daniel Maya
|
1d4aeef893
|
Merge branch 'develop' into ent-9893-nuevo-sistema-de-ha
|
2023-03-16 10:10:16 +01:00 |
|
Jose Gonzalez
|
e474ec0915
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-16 09:43:38 +01:00 |
|
Jose Gonzalez
|
9ac04fba28
|
Netflow fix
|
2023-03-16 09:42:59 +01:00 |
|
artica
|
2767d24f60
|
Auto-updated build strings.
|
2023-03-16 01:00:18 +01:00 |
|
daniel
|
39f342a982
|
fixed styles
|
2023-03-15 21:17:50 +01:00 |
|
Jose Gonzalez
|
d2a807636e
|
General Setup view
|
2023-03-15 17:43:35 +01:00 |
|
Jose Gonzalez
|
e9526bf886
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-15 16:37:33 +01:00 |
|
Jonathan
|
9a21c40780
|
Background white PDFS
|
2023-03-15 16:35:49 +01:00 |
|
Jose Gonzalez
|
84fe5695d8
|
Visual styles Setup view
|
2023-03-15 16:34:18 +01:00 |
|
Jonathan
|
ac3816709c
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-15 16:06:47 +01:00 |
|
Jonathan
|
30538265e8
|
Cluster wizzard visual fix
|
2023-03-15 16:06:42 +01:00 |
|
Pablo Aragon
|
797f43ff3c
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-15 15:58:34 +01:00 |
|
Pablo Aragon
|
bed1e34fd2
|
Dashboards widgets
|
2023-03-15 15:58:28 +01:00 |
|
Jonathan
|
19b295060b
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-15 13:53:34 +01:00 |