miguel angel rasteu
|
5060398661
|
#11206 Fix conflict
|
2023-10-13 09:00:03 +02:00 |
|
Alejandro Campos
|
0f381b0db7
|
Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada'
# Conflicts:
# pandora_console/extras/mr/66.sql
|
2023-10-03 13:11:09 +00:00 |
|
Rafael Ameijeiras
|
439d5b54aa
|
Merge branch 'ent-11961-16159-activar-show-all-events-24h-por-defecto-en-vista-de-ultimos-eventos-de-agente' into 'develop'
Agents show events 24h switch checked default
See merge request artica/pandorafms!6405
|
2023-10-02 07:08:52 +00:00 |
|
Daniel Rodriguez
|
05cd8142bf
|
Merge branch 'ent-11471-integracion-pandora-integria' into 'develop'
wip integration integriaIMS pandora_enterprise#11471
Closes pandora_enterprise#11471
See merge request artica/pandorafms!6131
|
2023-09-28 10:05:15 +00:00 |
|
Calvo
|
0b4ee35780
|
Fix query agent events
|
2023-09-27 11:01:21 +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
|
f46626e120
|
refactor cluster view pandora_enterprise#12032
|
2023-09-21 10:21:45 +02:00 |
|
alejandro.campos@artica.es
|
ae74caf7b1
|
Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada
|
2023-09-20 15:52:56 +02:00 |
|
alejandro.campos@artica.es
|
6f8212ed40
|
Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada
|
2023-09-20 15:46:47 +02:00 |
|
Daniel Cebrian
|
73d179e52f
|
#12001 added autoselect module in inventory
|
2023-09-20 12:14:55 +02:00 |
|
Daniel Rodriguez
|
6ecd8ca899
|
Merge branch 'ent-10065-post-filtros-de-eventos-privados' into 'develop'
Draft: Ent 10065 post filtros de eventos privados
See merge request artica/pandorafms!6318
|
2023-09-18 07:55:18 +00:00 |
|
Rafael Ameijeiras
|
b568085841
|
Merge branch 'ent-12035-la-edicion-de-alertas-no-deberia-ser-posible-en-la-vista-de-agentes' into 'develop'
not show edition buttons of alert detail pandora_enterprise#12035
See merge request artica/pandorafms!6444
|
2023-09-18 07:22:13 +00:00 |
|
daniel
|
af968b5e13
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-09-14 08:08:05 +02:00 |
|
daniel
|
802f0bf83b
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-09-12 12:37:31 +02:00 |
|
daniel
|
16f1d80919
|
not show edition buttons of alert detail pandora_enterprise#12035
|
2023-09-12 12:30:52 +02:00 |
|
miguel angel rasteu
|
55fa824792
|
#12037 Fix size of agent text and event text
|
2023-09-11 11:41:30 +02:00 |
|
Jorge Rincon
|
764d5908bb
|
Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados
|
2023-09-11 10:58:37 +02:00 |
|
Rafael Ameijeiras
|
0c6aaa6723
|
Merge branch 'ent-11993-user-notifications-esta-roto' into 'develop'
Ent 11993 user notifications esta roto
See merge request artica/pandorafms!6412
|
2023-09-11 07:15:38 +00:00 |
|
daniel
|
ce0468b37e
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/include/functions_menu.php
|
2023-09-08 13:11:52 +02:00 |
|
alejandro.campos@artica.es
|
318fa38721
|
Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada
|
2023-09-07 17:44:51 +02:00 |
|
alejandro.campos@artica.es
|
f8911bcf9c
|
implemented os version management
|
2023-09-06 17:00:16 +02:00 |
|
Matias Didier
|
96c722b816
|
Merge branch 'ent-9814-nuego-item-graficas-de-capacity-planning-en-dashboard' into 'develop'
Ent 9814 nuego item graficas de capacity planning en dashboard
See merge request artica/pandorafms!6382
|
2023-09-06 06:56:59 +00:00 |
|
daniel
|
fce86cb2ac
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-09-06 07:50:27 +02:00 |
|
miguel angel rasteu
|
4911d84c76
|
#11993 Fix configration users notification
|
2023-09-05 11:52:16 +02:00 |
|
Calvo
|
a8a201cf19
|
Agents show events 24h switch checked default
|
2023-09-04 16:47:01 +02:00 |
|
Jonathan
|
1e22d473e6
|
#9814 projection graphs - module view & dashboard
|
2023-08-31 13:42:52 +02:00 |
|
Jonathan
|
84bb4780ca
|
#10639 new datepicker style and save filter
|
2023-08-29 12:17:41 +02:00 |
|
Jorge Rincon
|
797b24af86
|
#10065 Added switch to filter create/edit modal.
|
2023-08-28 13:54:35 +02:00 |
|
miguel angel rasteu
|
0194fbaa59
|
#11206 Fix custom field view
|
2023-08-22 11:16:17 +02:00 |
|
daniel
|
5a61f074d7
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-08-22 09:22:11 +02:00 |
|
miguel angel rasteu
|
817c3223be
|
#11206 Fix custom field view
|
2023-08-21 15:11:13 +02:00 |
|
miguel angel rasteu
|
a251046452
|
#11206 Fix conflict
|
2023-08-21 08:36:42 +02:00 |
|
Daniel Cebrian
|
fa04db27a7
|
Merge branch 'develop' into ent-10870-15385-limpiar-eventos-desde-la-vista-detallada-de-evento
|
2023-08-18 10:40:29 +02:00 |
|
Jorge Rincon
|
3e4178c490
|
Merge branch develop into ent-10065-post-filtros-de-eventos-privados
|
2023-08-18 09:19:57 +02:00 |
|
daniel
|
133eef456a
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-08-14 08:14:34 +02:00 |
|
Jonathan
|
fb4ac30b57
|
#10598 show error on create web and check
|
2023-08-09 13:20:43 +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 |
|
Jorge Rincon
|
3429e0d190
|
#10065 Added the option to create-edit a private event filter.
|
2023-08-07 14:43:50 +02:00 |
|
Rafael Ameijeiras
|
75b311ad97
|
Merge branch 'ent-11768-texto-del-modal-de-save-filter-se-muestra-mal' into 'develop'
Ent 11768 texto del modal de save filter se muestra mal
See merge request artica/pandorafms!6287
|
2023-07-31 13:10:53 +00:00 |
|
Rafael Ameijeiras
|
68b2fbd616
|
Merge branch 'ent-11467-bug-en-vista-tree-view' into 'develop'
Ent 11467 bug en vista tree view
See merge request artica/pandorafms!6276
|
2023-07-31 10:12:33 +00:00 |
|
Daniel Maya
|
ad24712eed
|
resolved conflict 2
|
2023-07-31 09:48:42 +02:00 |
|
Daniel Maya
|
858a6230b3
|
resolved conflict
|
2023-07-31 09:02:58 +02:00 |
|
alejandro.campos@artica.es
|
6114787764
|
Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id
|
2023-07-27 13:32:26 +02:00 |
|
Jorge Rincon
|
03feeebbdf
|
#11768 Fixed the style of the checkbox in the modal save filter
|
2023-07-27 11:09:24 +02:00 |
|
miguel angel rasteu
|
2b20b7f8ee
|
#11386 Fix modal
|
2023-07-27 10:47:51 +02:00 |
|
Daniel Cebrian
|
2c9f7e026e
|
Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery
|
2023-07-26 15:58:26 +02:00 |
|
Rafael Ameijeiras
|
1f52a2d466
|
Merge branch 'ent-11031-en-visor-de-auditoria-los-filtros-personalizados-tienen-tres-detalles-que-vale-la-pena' into 'develop'
Ent 11031 en visor de auditoria los filtros personalizados tienen tres detalles que vale la pena
See merge request artica/pandorafms!6235
|
2023-07-25 07:54:36 +00:00 |
|
Jorge Rincon
|
19c600fb9b
|
#11467 fixed error message and advanced info section from tree view
|
2023-07-24 14:54:38 +02:00 |
|
miguel angel rasteu
|
5084c0490b
|
#11386 Fix changes in soun event dialog
|
2023-07-21 13:32:12 +02:00 |
|
daniel
|
1f1b85561c
|
Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id
|
2023-07-19 11:39:06 +02:00 |
|