daniel
|
5bd689500c
|
move extension translate_string and file_repo pandora_enterprise#12333
|
2023-11-28 11:06:39 +01:00 |
|
daniel
|
3f3e8e42bc
|
move extension translate_string and file_repo pandora_enterprise#12333
|
2023-11-28 08:13:00 +01:00 |
Rafael Ameijeiras
|
707f85ed7f
|
Merge branch 'ent-11511-cambiar-el-apartado-de-tools-a-seccion-management' into 'develop'
Ent 11511 cambiar el apartado de tools a seccion management
See merge request artica/pandorafms!6403
|
2023-11-27 14:36:38 +00:00 |
miguel angel rasteu
|
5060398661
|
#11206 Fix conflict
|
2023-10-13 09:00:03 +02:00 |
|
daniel
|
91393c9e39
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/include/styles/pandora.css
|
2023-09-25 17:06:08 +02:00 |
Daniel Cebrian
|
133c1676c0
|
Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas
|
2023-09-07 15:28:55 +02:00 |
|
miguel angel rasteu
|
bf4ef92610
|
#11511 Move tools from operation to management
|
2023-09-04 13:44:44 +02:00 |
|
daniel
|
1a1087e311
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/extras/mr/66.sql
|
2023-09-04 08:16:48 +02:00 |
|
miguel angel rasteu
|
2c62de02f7
|
Fix conflict
|
2023-08-31 12:49:48 +02:00 |
|
Daniel Cebrian
|
1fa0bc0ab1
|
#11965 new section security in menu
|
2023-08-29 15:09:41 +02:00 |
|
miguel angel rasteu
|
a251046452
|
#11206 Fix conflict
|
2023-08-21 08:36:42 +02:00 |
Pablo Aragon
|
28b8eeca61
|
11423-Graph analytics (WIP)
|
2023-08-10 09:13:48 +02:00 |
|
daniel
|
7f82273dc4
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/extras/mr/65.sql
|
2023-08-09 08:59:01 +02:00 |
|
miguel angel rasteu
|
fddc709aee
|
#11219 Fix transaltes
|
2023-08-02 14:48:02 +02:00 |
Daniel Maya
|
858a6230b3
|
resolved conflict
|
2023-07-31 09:02:58 +02:00 |
|
miguel angel rasteu
|
a1965de2ea
|
#11386 Fix sound alert modal
|
2023-07-24 12:25:06 +02:00 |
|
daniel
|
1bf7f1e36e
|
ITSM pandora_enterprise#11471
|
2023-07-21 14:23:42 +02:00 |
|
daniel
|
9a72d0740c
|
ITSM fixed pandora_enterprise#11471
|
2023-07-18 15:13:08 +02:00 |
|
miguel angel rasteu
|
e3496a44b6
|
#11206 Add custom field view in nodes
|
2023-07-11 16:52:39 +02:00 |
|
daniel
|
524bb7fdbb
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-07-11 08:26:20 +02:00 |
|
Daniel Cebrian
|
d993674c12
|
Merge branch 'develop' into ent-11567-ventana-about
|
2023-07-06 11:30:45 +02:00 |
|
Miguel Angel Rasteu
|
82f6c6c0da
|
Merge branch 'develop' into 'ent-10563-mejoras-personalizacion-interfaz'
# Conflicts:
# pandora_console/godmode/agentes/module_manager.php
|
2023-07-03 07:45:32 +00:00 |
Gorka Sanchez
|
28f99d2c27
|
Merge branch 'ent-10741-15263-cuadro-de-busqueda-de-modulos-en-agente-limitado-a-5-caracteres' into 'develop'
Ent 10741 15263 cuadro de busqueda de modulos en agente limitado a 5 caracteres
See merge request artica/pandorafms!5713
|
2023-06-30 11:39:50 +00:00 |
|
miguel angel rasteu
|
ac92b5979c
|
#10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality
|
2023-06-30 08:35:37 +02:00 |
|
daniel
|
6e3eddff08
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-06-27 08:23:46 +02:00 |
|
Daniel Cebrian
|
01d48c7ba4
|
#11567 new about window in operation
|
2023-06-19 15:09:30 +02:00 |
|
daniel
|
e82c1e6881
|
wip integration integriaIMS pandora_enterprise#11471
|
2023-06-16 13:47:25 +02:00 |
|
miguel angel rasteu
|
db62a91cb6
|
#11476 Fix https url
|
2023-06-08 13:19:01 +02:00 |
|
miguel angel rasteu
|
1f8752ee63
|
#11476 Fix pandora url
|
2023-06-08 13:10:16 +02:00 |
|
miguel angel rasteu
|
64204b6ff7
|
#11476 Fix ascci art
|
2023-06-08 12:42:10 +02:00 |
|
miguel angel rasteu
|
933f69f2ab
|
#11476 Change copyright header
|
2023-06-08 11:53:13 +02:00 |
|
Daniel Cebrian
|
2a7eb1e069
|
#11280 fixed acoustic console name
|
2023-05-30 17:17:34 +02:00 |
|
Daniel Cebrian
|
e1f995744b
|
#10998 fixed acl edit my user
|
2023-04-25 10:57:21 +02:00 |
|
miguel angel rasteu
|
c26db22fa5
|
#10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality
|
2023-04-13 11:07:09 +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 |
|
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 |
|
Daniel Maya
|
94c843dac2
|
#9662 Fixed gis map menu
|
2023-03-23 10:41:08 +01:00 |
|
Daniel Cebrian
|
a21e43a452
|
#10764 ignore selected action in fav menu
|
2023-03-21 15:40:46 +01: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 |
|
Daniel Cebrian
|
ca78f069f6
|
#9624 added support sflow
|
2023-03-10 17:12:38 +01:00 |
|
Daniel Cebrian
|
3ec11f4c9d
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-08 12:55:53 +01: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 |
Jonathan
|
fdab2cff8e
|
Merge branch 'develop' into ent-9819-crear-tip-en-consola-sonora-de-eventos
|
2023-03-02 08:26:53 +01:00 |
|
Daniel Cebrian
|
e76d8606dc
|
#10324 added star in menu
|
2023-02-27 09:45:15 +01:00 |
|
Daniel Cebrian
|
d6645ee283
|
#10324 added fav menu in network map and visual console
|
2023-02-23 11:37:23 +01:00 |
|
Daniel Cebrian
|
0990fe672e
|
#10324 added system fav menu in agent and events
|
2023-02-23 09:48:13 +01:00 |
|
Daniel Maya
|
a615d2d98f
|
#9662 minor fixed
|
2023-02-20 17:08:36 +01:00 |
|
Daniel Maya
|
c6e32e278b
|
#9662 fixed favourites
|
2023-02-20 16:41:54 +01:00 |
|
Daniel Maya
|
f5044e5673
|
#9662 Added new user edit link and changed label
|
2023-02-13 13:16:51 +01:00 |
Jose Gonzalez
|
d45a631ea5
|
Final merge with new menu
|
2023-02-13 10:37:37 +01:00 |