Jose Gonzalez
|
bab3248d57
|
Monitor view with not normal at start
|
2023-03-15 08:56:15 +01:00 |
Daniel Cebrian
|
e36bb1d065
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-14 08:36:12 +01:00 |
daniel
|
c96ac79726
|
fixed styles
|
2023-03-13 19:30:51 +01:00 |
Pablo Aragon
|
2215097100
|
Manage agent, modules
|
2023-03-13 17:39:58 +01:00 |
|
Daniel Cebrian
|
90f0c3771f
|
#10324 fixed deleted element fav menu
|
2023-03-13 17:21:28 +01:00 |
|
Jose Gonzalez
|
c2ba5cfdd3
|
Agent status
|
2023-03-13 16:21:14 +01:00 |
|
Jose Gonzalez
|
a7cfa310a3
|
Agents alias in header
|
2023-03-13 15:52:28 +01:00 |
|
Daniel Cebrian
|
bdeb2240f3
|
10324 refactor duplicity code
|
2023-03-13 13:01:48 +01:00 |
|
Daniel Cebrian
|
339d7e8bfe
|
#10324 fixed error 500
|
2023-03-13 12:57:09 +01:00 |
|
daniel
|
0643b4e0ba
|
fixed styles
|
2023-03-13 12:19:27 +01:00 |
|
Daniel Cebrian
|
dfa2ab818e
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-13 08:53:35 +01:00 |
|
Jose Gonzalez
|
d449179765
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-11 02:10:23 +01:00 |
|
Jose Gonzalez
|
39ace10629
|
Fix image issue with Networkmap
|
2023-03-11 02:08:37 +01:00 |
Calvo
|
e2297171cb
|
Process inventory modules with correct xml and empty data
|
2023-03-10 15:14:43 +01:00 |
|
daniel
|
8778fcea93
|
fixed styles
|
2023-03-10 14:49:38 +01:00 |
|
Pablo Aragon
|
427ecf96e4
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-10 13:03:35 +01:00 |
|
Pablo Aragon
|
ceed3c5d51
|
Alert details validation
|
2023-03-10 13:02:23 +01:00 |
|
daniel
|
3be507ca7e
|
fixed styles
|
2023-03-10 12:40:21 +01:00 |
|
daniel
|
6d0b0039c5
|
fixed styles
|
2023-03-09 19:25:14 +01:00 |
|
Jose Gonzalez
|
ac1db7820c
|
Minor fixes
|
2023-03-09 17:41:29 +01:00 |
|
daniel
|
63d83b3f97
|
fixed styles
|
2023-03-09 11:25:43 +01:00 |
|
Daniel Cebrian
|
3ec11f4c9d
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-08 12:55:53 +01:00 |
|
Jose Gonzalez
|
4af67db415
|
Export data view
|
2023-03-07 18:10:07 +01:00 |
|
Jose Gonzalez
|
f7aab35082
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-07 15:59:51 +01:00 |
|
Jose Gonzalez
|
226b80b7c7
|
Icon revision
|
2023-03-07 15:59:10 +01:00 |
Daniel Maya
|
6b9175ea0d
|
Merge branch 'develop' into ent-9662-second-round
|
2023-03-07 15:05:28 +01:00 |
|
Daniel Cebrian
|
fdc73be979
|
Merge branch 'develop' into ent-10347-vista-tactica-de-grupo
|
2023-03-07 13:19:52 +01:00 |
|
daniel
|
1db803b8f6
|
fixed styles
|
2023-03-07 12:59:34 +01:00 |
|
Jose Gonzalez
|
44fb762fdf
|
Minor fixes with graphs
|
2023-03-06 15:44:32 +01:00 |
|
daniel
|
08dca1a83c
|
fixed styles
|
2023-03-05 13:46:27 +01:00 |
|
daniel
|
95df525cb2
|
fixed styles
|
2023-03-03 14:16:06 +01:00 |
|
Daniel Cebrian
|
00b5d3f237
|
#1347 added links tactical view group
|
2023-03-03 13:24:33 +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 |
Alejandro Campos
|
f297f6fff9
|
Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas'
# Conflicts:
# pandora_console/extras/mr/62.sql
# pandora_console/pandoradb.sql
|
2023-03-02 16:53:42 +00:00 |
Diego Muñoz-Reja
|
873334fd97
|
Merge branch 'ent-9622-omnishell-en-la-vista-solapa-de-agente' into 'develop'
Ent 9622 omnishell en la vista solapa de agente
See merge request artica/pandorafms!5508
|
2023-03-02 14:52:45 +00:00 |
Matias Didier
|
c4e8ff49d5
|
Merge branch 'ent-10569-Error-500-a-la-hora-de-abrir-vista-de-algun-agente-en-fenix' into 'develop'
error fix
See merge request artica/pandorafms!5574
|
2023-03-02 09:15:37 +00:00 |
|
alejandro.campos@artica.es
|
fd13b376a5
|
Merge branch 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' of brutus.artica.es:artica/pandorafms into ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas
|
2023-03-01 16:10:30 +01:00 |
|
alejandro.campos@artica.es
|
296ec44ef4
|
minor fix
|
2023-03-01 16:10:18 +01:00 |
|
alejandro.campos@artica.es
|
36cfcc3c2f
|
error fix
|
2023-03-01 14:19:35 +01:00 |
|
daniel
|
774b32d7a0
|
fixed styles
|
2023-03-01 13:54:22 +01:00 |
|
daniel
|
a758528968
|
Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
pandora_console/extras/mr/62.sql
pandora_console/include/class/AuditLog.class.php
|
2023-03-01 07:56:32 +01:00 |
|
daniel
|
8ac9df14ab
|
fixed styles
|
2023-02-28 19:01:37 +01:00 |
Jimmy Olano
|
a8d0f79540
|
Merge branch 'ent-10257-guardia-14543-no-muestra-modulos-no-init-en-vista-monitor-detail' into 'develop' (^JJOS)
Fix empty module data list view
See merge request artica/pandorafms!5472
|
2023-02-28 17:35:56 +00:00 |
|
Alejandro Campos
|
f94c7e2a04
|
Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas'
# Conflicts:
# pandora_console/extras/mr/62.sql
|
2023-02-28 16:11:46 +00:00 |
|
alejandro.campos@artica.es
|
a1f172e713
|
several fixes
|
2023-02-28 17:06:31 +01:00 |
|
Jose Gonzalez
|
ce5ccbec5d
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-28 09:36:21 +01:00 |
|
daniel
|
f38adff73a
|
fixed styles
|
2023-02-27 18:05:51 +01:00 |
|
Jose Gonzalez
|
973444014a
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-27 16:37:17 +01:00 |
|
Jose Gonzalez
|
5df442e83e
|
Network maps improve
|
2023-02-27 16:37:00 +01:00 |
|
daniel
|
12212fff02
|
restyling
|
2023-02-27 13:41:44 +01:00 |
|
Daniel Cebrian
|
08fb4e3396
|
#10324 fixed delete element in favmenu
|
2023-02-27 10:07:35 +01:00 |
|
daniel
|
35241e0d38
|
restyling
|
2023-02-27 09:55:29 +01:00 |
|
daniel
|
7602ec1bd8
|
fixed styles
|
2023-02-24 14:28:07 +01:00 |
|
daniel
|
5477fdbb6c
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-24 13:45:14 +01:00 |
|
daniel
|
65ed10be1a
|
restyling
|
2023-02-24 13:43:34 +01:00 |
|
Jose Gonzalez
|
a6f1037c9a
|
Minor fixes or improvements
|
2023-02-24 13:37:47 +01:00 |
|
Daniel Cebrian
|
728991ad9a
|
#10324 delete fav menu when delete element
|
2023-02-24 13:36:13 +01:00 |
|
daniel
|
3575e199b0
|
restyling
|
2023-02-24 10:46:46 +01:00 |
|
daniel
|
b34515d03c
|
restyling
|
2023-02-23 17:57:48 +01:00 |
|
daniel
|
1be0fb94b0
|
restyling
|
2023-02-23 16:30:18 +01:00 |
|
daniel
|
fa81a4e744
|
restyling
|
2023-02-23 15:44:01 +01:00 |
|
Jose Gonzalez
|
f08fc6a8b7
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-23 14:31:59 +01:00 |
|
Jose Gonzalez
|
d7c70bd8a8
|
Tree view fixes
|
2023-02-23 14:30:31 +01:00 |
|
daniel
|
598a1b1456
|
restyling
|
2023-02-23 12:34:41 +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
|
c0dcc03388
|
#10324 added system fav in visual console and modules
|
2023-02-23 11:00:46 +01:00 |
|
daniel
|
e672ba141b
|
restyling
|
2023-02-23 11:00:38 +01:00 |
|
daniel
|
ff9ee7a4f0
|
restyling
|
2023-02-23 10:24:03 +01:00 |
|
Jose Gonzalez
|
6180a42413
|
More pandora_black fixes
|
2023-02-22 21:19:28 +01:00 |
|
daniel
|
e514a0efb5
|
fixed styles
|
2023-02-22 17:41:19 +01:00 |
|
Matias Didier
|
f371747619
|
Merge branch 'ent-9479-gestion-de-modulos-desde-metaconsola-sustitucion-del-wizard' into 'develop'
Ent 9479 gestion de modulos desde metaconsola sustitucion del wizard
See merge request artica/pandorafms!5509
|
2023-02-22 15:09:19 +00:00 |
|
daniel
|
8230ae616b
|
Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
pandora_console/godmode/users/user_list.php
pandora_console/operation/events/events.php
|
2023-02-22 12:35:34 +01:00 |
|
alejandro.campos@artica.es
|
b76a4b1a48
|
fix conflicts
|
2023-02-22 10:10:14 +01:00 |
Jonathan
|
934851ae4e
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-20 15:58:52 +01:00 |
|
Jonathan
|
fc68e6ead1
|
Monitor view meta fix status
|
2023-02-20 15:58:41 +01:00 |
|
Jose Gonzalez
|
6808fb0655
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-20 14:50:33 +01:00 |
|
Jose Gonzalez
|
8f21229246
|
Ticket 10467 Improve External Tools view
|
2023-02-20 14:50:17 +01:00 |
|
Jonathan
|
4bbf750944
|
Monitor view meta fix
|
2023-02-20 14:35:32 +01:00 |
|
Jose Gonzalez
|
da58e4b9e0
|
Ticket 10484 Fixed List Operating Systems
|
2023-02-20 13:02:24 +01:00 |
|
Jose Gonzalez
|
b0ee4a203a
|
Ticket 10470 Agent improvements bis
|
2023-02-17 14:26:41 +01:00 |
|
Jose Gonzalez
|
c1f8510563
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-17 14:21:49 +01:00 |
|
Jose Gonzalez
|
a1bf42c9f9
|
Ticket 10470 Agent improvements
|
2023-02-17 14:21:29 +01:00 |
|
Jose Gonzalez
|
8a5a25cd65
|
Ticket 10452 Status monitor view improve
|
2023-02-17 13:35:42 +01:00 |
|
Jonathan
|
e6eed5e471
|
fix visual module graph and monitor details more details
|
2023-02-17 11:54:48 +01:00 |
Daniel Rodriguez
|
10d275c2a5
|
Merge branch 'ent-10428-carga-por-defecto-en-vista-de-monitores' into 'develop'
Fix showing all modules on monitors view on firt load
See merge request artica/pandorafms!5541
|
2023-02-15 15:04:30 +00:00 |
|
Diego Muñoz-Reja
|
e34677e5f6
|
Merge branch 'ent-10195-offset-de-mapas' into 'develop'
Ent 10195 offset de mapas
See merge request artica/pandorafms!5539
|
2023-02-15 14:34:17 +00:00 |
|
Calvo
|
70291758c8
|
Fix showing all modules on monitors view on firt load
|
2023-02-15 14:25:43 +01:00 |
|
Daniel Maya
|
845a2d08c3
|
#10118 Changed id_group 2
|
2023-02-15 13:42:19 +01:00 |
|
Daniel Maya
|
cac9f67153
|
#10195 Fixed minimap drawing
|
2023-02-15 10:49:31 +01:00 |
|
Daniel Maya
|
856fade86c
|
#10118 Added spinner
|
2023-02-14 14:45:46 +01:00 |
|
Jose Gonzalez
|
be33b2f51a
|
Several visual fixes for fit with mockups
|
2023-02-14 14:06:51 +01:00 |
|
Daniel Maya
|
ccb0cda305
|
#10118 changed CIDR input
|
2023-02-14 12:16:38 +01:00 |
|
Daniel Maya
|
5b263981c4
|
#10118 Added group multiselector
|
2023-02-13 17:06:09 +01:00 |
|
Daniel Maya
|
b010965caa
|
#9662 Fixed tactical view
|
2023-02-13 14:44:32 +01:00 |
|
Daniel Maya
|
4cd0820f11
|
#10118 Changed radio button
|
2023-02-13 11:44:01 +01:00 |
|
Jose Gonzalez
|
d6eedf07aa
|
Merge
|
2023-02-13 10:03:09 +01:00 |
|
Jose Gonzalez
|
4d9c6ab33a
|
Minor fixes
|
2023-02-08 12:58:23 +01:00 |
|
Jose Gonzalez
|
f14d324490
|
Minor fixes and improves
|
2023-02-08 12:43:08 +01:00 |
|
Jose Gonzalez
|
3a741f8ed9
|
Update icons and improve tables
|
2023-02-07 16:22:52 +01:00 |
|
Pablo Aragon
|
5b538920f0
|
Merge branch 'ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms-2' into ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms
|
2023-02-07 11:22:20 +01:00 |
|
Matias Didier
|
1d9c3a5f29
|
Merge branch 'ent-10249-guardia-problemas-en-grupos-anidados-para-visualizar-modulos-criticos' into 'develop'
Ent 10249 guardia problemas en grupos anidados para visualizar modulos criticos
See merge request artica/pandorafms!5486
|
2023-02-07 09:57:37 +00:00 |
|
Jonathan
|
a2d7573d30
|
#9479 Create module and edit/delete on metaconsole
|
2023-02-06 16:44:14 +01:00 |
|
Pablo Aragon
|
6d85b912e2
|
9962-Omnishell in agent view
|
2023-02-06 16:34:40 +01:00 |
|
Jose Gonzalez
|
e3b2ec529a
|
Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-03 14:16:47 +01:00 |
|
Daniel Maya
|
5d3b21b36d
|
#10249 Fixed groups
|
2023-02-03 11:07:52 +01:00 |
|
Pablo Aragon
|
54e4da7aad
|
Merge branch 'develop' into ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms-2
|
2023-02-03 10:48:42 +01:00 |
|
Jose Gonzalez
|
2c8c1d4593
|
Minor fixes and improvements
|
2023-02-01 15:14:32 +01:00 |
|
alejandro.campos@artica.es
|
e4f5a9a61a
|
Merge remote-tracking branch 'origin/develop' into ent-9884-Carga-restauracion-de-filtros-en-la-vista-de-monitores
|
2023-02-01 09:36:42 +01:00 |
|
Matias Didier
|
08ca68a663
|
Merge branch 'ent-10274-Overview-de-alertas-no-muestra-correctamente-las-alertas' into 'develop'
fixed filter
See merge request artica/pandorafms!5480
|
2023-02-01 07:05:49 +00:00 |
|
Jose Gonzalez
|
0363a90e1f
|
Resolve merge issues
|
2023-01-31 17:35:44 +01:00 |
|
alejandro.campos@artica.es
|
7d7ee65c7b
|
fixed filter
|
2023-01-31 11:51:00 +01:00 |
|
Jonathan
|
45b67b1f7a
|
#9270 Icon for InOctets and OutOctets graph
|
2023-01-31 09:32:06 +01:00 |
|
Jonathan
|
bb95dadb4f
|
Merge branch 'develop' into ent-9270-dos-mejoras-en-el-interface-view
|
2023-01-31 09:26:27 +01:00 |
|
Jonathan
|
c75a49c6ec
|
#9270 InOctets and outOctets must be enabbled for graph
|
2023-01-30 17:01:06 +01:00 |
|
Calvo
|
7111fd66e2
|
Fix empty module data list view
|
2023-01-27 13:43:23 +01:00 |
|
alejandro.campos@artica.es
|
902a843765
|
implemented agents view filter management
|
2023-01-25 17:22:54 +01:00 |
|
Pablo Aragon
|
0ec58067ab
|
9220 Cast config['license_nms']
|
2023-01-24 14:45:42 +01:00 |
|
Pablo Aragon
|
d2c286fc4c
|
9220 Conflict resolved
|
2023-01-24 09:50:34 +01:00 |
|
Calvo
|
e1fd9577b6
|
Added tooltip monitors view
|
2023-01-20 08:02:58 +01:00 |
|
alejandro.campos@artica.es
|
67b7234e58
|
implement filter save and load feature in monitor view
|
2023-01-19 10:49:48 +01:00 |
|
Jonathan
|
532a90252c
|
#9270 upgrades interface view + show interface on agent view
|
2023-01-18 13:44:40 +01:00 |
|
Daniel Maya
|
04e039c515
|
resolved conflict
|
2023-01-18 11:31:26 +01:00 |
|
Daniel Maya
|
0f42a5fa88
|
#9783 Fixed networkmap 4
|
2023-01-18 11:29:06 +01:00 |
|
Daniel Rodriguez
|
a165eec2a1
|
Merge branch 'ent-8558-inventario-pasa-de-enterprise-open' into 'develop'
Move inventory to open
See merge request artica/pandorafms!5105
|
2023-01-16 13:43:19 +00:00 |
|
Jose Gonzalez
|
8c852fb3df
|
Agent improvements
|
2023-01-16 01:28:53 +01:00 |
|
Daniel Rodriguez
|
9569e77766
|
Merge branch 'ent-10052-nodo-ficticio-influye-en-el-estado-del-mapa-de-red' into 'develop'
Ent 10052 nodo ficticio influye en el estado del mapa de red
See merge request artica/pandorafms!5394
|
2023-01-13 09:48:49 +00:00 |
|
Calvo
|
ce224d67ba
|
Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open
|
2023-01-13 09:08:17 +01:00 |
|
Pablo Aragon
|
c503836634
|
Restrict access to collections with nms license
|
2023-01-12 12:28:40 +01:00 |
|
Jose Gonzalez
|
a9c4dd625c
|
Merge develop branch
|
2023-01-11 13:46:15 +01:00 |
|
Daniel Maya
|
0832d9613a
|
#10052 Fixed fictional color
|
2023-01-10 16:40:53 +01:00 |
|
Jose Gonzalez
|
33c9b50ddc
|
Polishing agent detail view
|
2023-01-10 14:57:40 +01:00 |
|
Jose Gonzalez
|
313240378e
|
Fix filter view for module table
|
2023-01-10 12:03:16 +01:00 |
|
Jose Gonzalez
|
60685cdccc
|
Table fixes
|
2023-01-10 10:18:37 +01:00 |
|
Daniel Cebrian
|
7b1ce9d517
|
#10082 changed label in monitoring view
|
2023-01-09 16:25:49 +01:00 |
|
Daniel Maya
|
b4d54fb729
|
#10119 Fixed alerts table
|
2023-01-05 13:31:40 +01:00 |
|
Jose Gonzalez
|
8421fb49ca
|
Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones
|
2023-01-04 15:54:16 +01:00 |
|
Jose Gonzalez
|
8728551c08
|
Agent details modules table upgraded
|
2023-01-04 15:46:32 +01:00 |
|
Jose Gonzalez
|
5f300a160e
|
Agent view improvement
|
2023-01-03 10:13:58 +01:00 |
|
Jose Gonzalez
|
03226b1f23
|
Polishing agent main view
|
2023-01-02 16:50:13 +01:00 |
|
Calvo
|
566344ef0e
|
Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open
|
2022-12-28 11:00:44 +01:00 |
Rafael Ameijeiras
|
19b74922a8
|
Merge branch 'ent-9587-busqueda-doble-en-vista-de-agentes' into 'develop'
Ent 9587 busqueda doble en vista de agentes
See merge request artica/pandorafms!5360
|
2022-12-28 09:56:34 +00:00 |
|
Rafael Ameijeiras
|
fa034e4ae2
|
Merge branch 'ent-9664-14349-modulos-pendingdelete-se-muestran-en-el-selector-de-modulos-en-paradas-planificadas' into 'develop'
Ent 9664 14349 modulos pendingdelete se muestran en el selector de modulos en paradas planificadas
See merge request artica/pandorafms!5359
|
2022-12-28 09:42:23 +00:00 |
|
Jonathan
|
3caaf3a2a5
|
#9587 agent view - filter alerts when filter on list of modules
|
2022-12-28 10:03:31 +01:00 |
|
Pablo Aragon
|
bbdc5b3e93
|
9664 Exclude pendingdelete modules from scheduled downtime
|
2022-12-27 15:22:39 +01:00 |
|
Jose Gonzalez
|
735cec1441
|
WIP: Agent status
|
2022-12-23 10:21:53 +01:00 |
|
Calvo
|
2ad8fac652
|
Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open
|
2022-12-22 11:35:25 +01:00 |
|
daniel
|
47c503bdab
|
Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3
|
2022-12-21 12:51:18 +01:00 |
|
Jose Gonzalez
|
ffa4ec756c
|
Agent Group icons adding
|
2022-12-20 17:22:35 +01:00 |
|
alejandro.campos@artica.es
|
73e8495f96
|
removed enterprise limitation
|
2022-12-20 15:43:05 +01:00 |
|
alejandro.campos@artica.es
|
47cb138d9b
|
path fix
|
2022-12-20 14:15:33 +01:00 |
|
Jose Gonzalez
|
b0997850f4
|
Fix server type icon definition
|
2022-12-19 16:38:47 +01:00 |
|
Calvo
|
63840b1d55
|
Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open
|
2022-12-19 11:31:02 +01:00 |
|
Daniel Barbero
|
b4d306b9b1
|
Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3
|
2022-12-19 09:38:21 +01:00 |
|
Daniel Barbero
|
1d01b8257d
|
WIP pandora_enterprise#9554
|
2022-12-16 14:28:04 +01:00 |
|
alejandro.campos@artica.es
|
8f3f8679d5
|
Merge remote-tracking branch 'origin/develop' into ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open
|
2022-12-16 11:29:00 +01:00 |
|
Daniel Barbero
|
62aea35d7b
|
fixed js render
|
2022-12-16 10:38:37 +01:00 |
|
alejandro.campos@artica.es
|
4ca220a3a7
|
Merge remote-tracking branch 'origin/develop' into ent-9323-14021-Modificar-el-display-de-valores-de-informe
|
2022-12-15 15:28:58 +01:00 |
|
Alejandro Campos
|
960d8be258
|
Merge branch 'develop' into 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open'
# Conflicts:
# pandora_console/extras/delete_files/delete_files.txt
|
2022-12-15 14:05:27 +00:00 |
|
jose.gonzalez@pandorafms.com
|
4fd0115d80
|
Adapt views
|
2022-12-15 12:42:35 +01:00 |
|
Daniel Barbero
|
01d14ae3b8
|
new chart chartjs pandora_enterprise#9554
|
2022-12-13 09:10:13 +01:00 |
|
Diego Muñoz-Reja
|
31919d4d2c
|
Merge branch 'ent-9801-bloqueo-de-boton-en-generacion-de-ficheros-pdf-csv-json-varias-secciones' into 'develop'
Prepare download control
See merge request artica/pandorafms!5276
|
2022-12-12 08:29:51 +00:00 |
|
Rafael Ameijeiras
|
f9bb893aae
|
Merge branch 'ent-8849-13468-Anadir-links-web-en-los-custom-fileds-de-agente' into 'develop'
implemented custom field
See merge request artica/pandorafms!5271
|
2022-12-12 08:20:08 +00:00 |
|
jose.gonzalez@pandorafms.com
|
445a8161cf
|
Merge
|
2022-12-05 09:44:35 +01:00 |
|
Calvo
|
718be360d5
|
Download wait message
|
2022-12-02 15:40:47 +01:00 |
|
jose.gonzalez@pandorafms.com
|
dccd950e9e
|
Changes
|
2022-11-30 10:14:42 +01:00 |
|
alejandro.campos@artica.es
|
d170771905
|
fixed filter
|
2022-11-24 16:18:58 +01:00 |
|
jose.gonzalez@pandorafms.com
|
251fddacd0
|
From merge
|
2022-11-23 13:26:54 +01:00 |
|
jose.gonzalez@pandorafms.com
|
a688182062
|
Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones
|
2022-11-22 17:47:02 +01:00 |
|
alejandro.campos@artica.es
|
767624b0c3
|
implemented link type custom field
|
2022-11-22 11:50:07 +01:00 |
|
Jimmy Olano
|
eaae19ab41
|
Merge branch 'ent-9683-bug-en-leyenda-de-graficas-snmp' into 'develop'
fix interfaces charts pandora_enterprise#9683
pandora_enterprise#9683
See merge request artica/pandorafms!5278
|
2022-11-22 00:32:10 +00:00 |
|
jose.gonzalez@pandorafms.com
|
7dce208df9
|
Update breadcrumbs for Agents and other minor fixes
|
2022-11-21 23:45:07 +01:00 |
|
jose.gonzalez@pandorafms.com
|
03157caefe
|
Redo agent edition-creation view
|
2022-11-15 16:02:40 +01:00 |
|
Jimmy Olano
|
6a36fd305b
|
Merge branch 'ent-9731-vista-de-alertas-en-agente-aplica-filtro-de-grupo-por-defecto' into 'develop'
Ent 9731 vista de alertas en agente aplica filtro de grupo por defecto
https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9731
See merge request artica/pandorafms!5238
|
2022-11-02 14:58:39 +00:00 |
|
Daniel Maya
|
d44760fd08
|
#9731 Fixed idAgent
|
2022-11-02 09:41:07 +01:00 |
|
jose.gonzalez@pandorafms.com
|
195611a3c1
|
Adapt views and refactor
|
2022-10-28 15:01:00 +02:00 |
|
Calvo
|
ccc27883f6
|
Fix XSS vulnerability
|
2022-10-28 10:52:52 +02:00 |
|
Daniel Barbero
|
6d19391c72
|
fix interfaces charts pandora_enterprise#9683
|
2022-10-27 16:12:17 +02:00 |
|
alejandro.campos@artica.es
|
8d611a8e7f
|
implemented float formatting and option in reports to change visualization format
|
2022-10-26 18:25:16 +02:00 |
|
jose.gonzalez@pandorafms.com
|
5e4bf4863c
|
Adapted views
|
2022-10-26 12:02:56 +02:00 |
|
jose.gonzalez@pandorafms.com
|
5aaa415ed9
|
Several fixes
|
2022-10-25 17:11:18 +02:00 |
|
jose.gonzalez@pandorafms.com
|
13b0c7d0c8
|
Fixed views
|
2022-10-25 13:13:52 +02:00 |
|
jose.gonzalez@pandorafms.com
|
00de0faac3
|
Adapted views
|
2022-10-24 19:55:22 +02:00 |
|
jose.gonzalez@pandorafms.com
|
4cf92cc995
|
Adapted views
|
2022-10-24 13:13:56 +02:00 |
|
jose.gonzalez@pandorafms.com
|
83de025bc9
|
Several adaptations
|
2022-10-21 13:47:41 +02:00 |
|
alejandro.campos@artica.es
|
17d7261173
|
implement cluster in open project
|
2022-10-20 13:17:26 +02:00 |
|
Jimmy Olano
|
aaedb39849
|
Merge branch 'ent-9392-no-funciona-insertar-agentes-en-paradas-planificadas' into 'develop'
Fix planned downtime issues
Ref: pandora_enterprise#9392
See merge request artica/pandorafms!5166
|
2022-10-19 11:00:04 +00:00 |
|
Daniel Barbero
|
1acb67ecad
|
fixed multi selector pandora_enterprise#8620
|
2022-10-18 13:40:09 +02:00 |
|
Diego Muñoz-Reja
|
4c74f1bee7
|
Merge branch 'ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo' into 'develop'
fixed response events pandora_enterprise#9423
See merge request artica/pandorafms!5141
|
2022-10-17 10:49:01 +00:00 |
|
Jimmy Olano
|
1a28c91992
|
Merge branch 'ent-9519-un-widget-tipo-agent-module-view-en-un-dashboard-falla-al-agregar-mas-modulos-del-mismo-agente' into 'develop'
fixed agent/module widget pandora_enterprise#9519
pandora_enterprise#9519
See merge request artica/pandorafms!5118
|
2022-10-13 15:26:14 +00:00 |
|
Daniel Maya
|
a674bdceb0
|
#9595 Fixed order
|
2022-10-03 10:16:00 +02:00 |
Calvo
|
b29f7eb160
|
Fix planned downtime issues
|
2022-09-30 14:54:16 +02:00 |
|
Daniel Rodriguez
|
637fae3e8d
|
Merge branch 'ent-8898-anida-mapas-de-red-no-actualizan-bien' into 'develop'
Ent 8898 anida mapas de red no actualizan bien
See merge request artica/pandorafms!5143
|
2022-09-29 12:36:37 +00:00 |
|
Daniel Rodriguez
|
c784e03883
|
Merge branch 'ent-9119-Metaconsola-Error-paginacion-vista-monitores' into 'develop'
Ready
See merge request artica/pandorafms!5084
|
2022-09-29 11:25:40 +00:00 |
|
José González
|
a4be805ba4
|
Fix
|
2022-09-29 00:24:31 +02:00 |
|
José González
|
f8efbc5fce
|
Fixed issue with module name
|
2022-09-28 16:29:18 +02:00 |
|
Daniel Barbero
|
755432b381
|
Merge remote-tracking branch 'origin/develop' into ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo
|
2022-09-28 08:52:43 +02:00 |
|
José González
|
1ae6267acc
|
Fix issue with agent_alias
|
2022-09-27 11:14:18 +02:00 |
|
Daniel Barbero
|
fbce8b7533
|
fixed response events pandora_enterprise#9423
|
2022-09-27 09:51:37 +02:00 |
|
Calvo
|
2a4176085f
|
Fix alerts meta datatables
|
2022-09-26 09:22:19 +02:00 |
|
José González
|
09c6c5a0f9
|
Fix
|
2022-09-23 12:54:51 +02:00 |
|
Daniel Barbero
|
229436b972
|
fixed agent/module widget pandora_enterprise#9519
|
2022-09-19 14:40:31 +02:00 |
|
Calvo
|
bc5f1d0dce
|
Fix meta alert datatable order
|
2022-09-19 14:02:50 +02:00 |
|
Calvo
|
56c5f324b0
|
Fix alerts metaconsole datatable order
|
2022-09-15 18:01:16 +02:00 |
|
Calvo
|
da0dad0148
|
WIP:Move inventory to open
|
2022-09-14 18:12:39 +02:00 |
|
José González
|
68654804b4
|
Fixed minor issue
|
2022-09-14 17:18:39 +02:00 |
|
José González
|
0daeb906f1
|
WIP
|
2022-09-06 14:58:38 +02:00 |
|
Daniel Maya
|
d3612439fb
|
#8898 conflict resolved
|
2022-08-29 14:06:15 +02:00 |
|
Daniel Maya
|
16554cfc7a
|
#8898 networkmap
|
2022-08-29 09:39:47 +02:00 |
|
Daniel Maya
|
182bb2d2c4
|
8898 Refresh time
|
2022-08-23 11:17:48 +02:00 |
|
Daniel Maya
|
b58b0d6c51
|
#9348 fixed update relations
|
2022-08-17 12:52:02 +02:00 |
|
Daniel Barbero
|
9b3d7ba763
|
fixed 500 php7.2 pandora_enterprise#9387
|
2022-08-11 14:05:01 +02:00 |
|
Daniel Barbero
|
de922dd0b2
|
fixed 500 php7.2 pandora_enterprise#9387
|
2022-08-11 13:52:34 +02:00 |
|
Daniel Maya
|
08da6de1da
|
#8898 Added options icon
|
2022-08-11 09:36:08 +02:00 |
|
Calvo
|
642c60428c
|
Merge remote-tracking branch 'origin/develop' into ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola
|
2022-07-19 09:40:56 +02:00 |
|
Calvo
|
34333f9f88
|
Alerts list datatable
|
2022-07-15 12:15:37 +02:00 |
|
Daniel Maya
|
9d259a4097
|
#9029 Added starmap 3
|
2022-07-12 16:18:17 +02:00 |
|
Daniel Maya
|
a71c26b4a7
|
#9029 Added starmap
|
2022-07-05 17:44:52 +02:00 |
|
Jimmy Olano
|
c074cd81bf
|
Merge branch 'ent-8302-Añadir-opción-de-mostrar-solo-grupos-con-datos-en-Group-view' into 'develop'
Ent 8302 añadir opción de mostrar solo grupos con datos en group view
https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8302
See merge request artica/pandorafms!4949
|
2022-07-01 10:47:27 +00:00 |
|
Diego Muñoz-Reja
|
ef48206e7f
|
Merge branch 'ent-8763-g-sanchez-anadir-filtro-de-grupos-al-widget-de-vista-tactica' into 'develop'
Ent 8763 g sanchez anadir filtro de grupos al widget de vista tactica
See merge request artica/pandorafms!4937
|
2022-06-30 12:54:40 +00:00 |
|
Jimmy Olano
|
f07ed9e4e9
|
Merge branch 'ent-9125-Bug-a-la-hora-de-crear-gráficas-personalizadas-desde-el-agente' into 'develop'
Ent 9125 bug a la hora de crear gráficas personalizadas desde el agente
https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9125
See merge request artica/pandorafms!4946
|
2022-06-29 22:25:00 +00:00 |
|
Daniel Maya
|
547962c83a
|
Merge branch 'develop' into ent-8763-g-sanchez-anadir-filtro-de-grupos-al-widget-de-vista-tactica
|
2022-06-29 17:27:25 +02:00 |
|
Daniel Barbero Martin
|
58f5f4e9f1
|
refactor events meta pandora_enterprise#9086
|
2022-06-23 12:47:49 +02:00 |
|
Calvo
|
5ce0ebb72a
|
Fix agent view satellite name visual
|
2022-06-17 10:09:37 +02:00 |
Ramon Novoa
|
48b20b255b
|
Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente
|
2022-06-09 12:05:24 +02:00 |
|
Daniel Maya
|
3e15ed2726
|
#8302 Added show_empty_groups
|
2022-06-08 15:17:03 +02:00 |
|
Calvo
|
5297123d17
|
Console changes for 8950
|
2022-06-08 13:10:01 +02:00 |
|
Daniel Rodriguez
|
a40efcfee5
|
Merge branch 'ent-9037-controles-pegados-en-agente-detail-view' into 'develop'
Ent 9037 controles pegados en agente detail view
See merge request artica/pandorafms!4936
|
2022-06-08 09:11:54 +00:00 |
|
Daniel Rodriguez
|
a2c1b38a3f
|
Merge branch 'ent-9011-Fallo-permisos-en-paradas-planificadas' into 'develop'
fixed permissions in selectors
See merge request artica/pandorafms!4931
|
2022-06-08 09:10:51 +00:00 |
|
Daniel Maya
|
6a8140b36c
|
#9125 Fixed chart type
|
2022-06-08 10:59:46 +02:00 |
|
Daniel Rodriguez
|
fc18c1a168
|
Merge branch 'ent-9035-Si-no-hay-inventario,-no-deberia-mostrar-la-solapa-de-inventario' into 'develop'
Hide inventory view if agent dont have inventory modules
See merge request artica/pandorafms!4916
|
2022-06-07 11:52:37 +00:00 |
|
Daniel Maya
|
d6fc15f0bf
|
#8763 Added filter groups
|
2022-06-06 11:14:09 +02:00 |
edu.corral
|
9d7b047e72
|
9037 fixed agent view controls
|
2022-06-03 14:15:51 +02:00 |
|
Daniel Maya
|
6c48717627
|
#9038 filter remake
|
2022-06-01 15:07:51 +02:00 |
|
alejandro.campos@artica.es
|
8b57e1dfb4
|
fixed permissions in selectors
|
2022-06-01 14:00:33 +02:00 |
|
José González
|
353e8773f8
|
Hide inventory view if agent dont have inventory modules
|
2022-05-26 08:13:30 +02:00 |
|
Daniel Barbero Martin
|
a77699b251
|
fixed update legend hover chart pandora_enterprise#8895
|
2022-05-12 09:10:39 +02:00 |
|
Daniel Rodriguez
|
7168f1d848
|
Merge branch 'ent-8735-vista-de-interfaces-referencia-mal-los-agentes' into 'develop'
Ent 8735 vista de interfaces referencia mal los agentes
See merge request artica/pandorafms!4800
|
2022-05-11 06:20:02 +00:00 |
Daniel Maya
|
3dd96d6e91
|
#8903 Fixed padding
|
2022-04-28 14:58:33 +02:00 |
|
Daniel Maya
|
165f3ff598
|
#8735 Fixed interface view
|
2022-04-05 13:00:15 +02:00 |
|
alejandro.campos@artica.es
|
84ca3c040c
|
fix query
|
2022-03-25 11:04:14 +01:00 |
|
Calvo
|
6067f356e9
|
Command snapshot monospaced font
|
2022-03-15 09:21:34 +01:00 |
|
Daniel Rodriguez
|
a67b6647f7
|
Merge branch 'ent-2152-Operaciones-masivas-de-grupos-secundarios' into 'develop'
bulk operation edit agents add secundary groups pandora_enterprise#2152
See merge request artica/pandorafms!4677
|
2022-03-11 08:51:33 +00:00 |
|
Daniel Barbero Martin
|
0d6570ea24
|
fixed error massive operation agents #2152
|
2022-03-09 15:12:26 +01:00 |
|
José González
|
604633dd35
|
Fixed issues with interfaces view and limited to show only agents with ifaces
|
2022-02-22 12:37:01 +01:00 |
fbsanchez
|
4d912fbd34
|
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
|
2022-02-11 09:55:34 +01:00 |
José González
|
fc4b702db0
|
Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs'
# Conflicts:
# pandora_console/godmode/alerts/configure_alert_template.php
|
2022-02-08 11:35:01 +00:00 |
|
fbsanchez
|
48ca83aa76
|
errata fix
|
2022-02-04 13:33:46 +01:00 |
|
fbsanchez
|
e1776d7994
|
removed collation from filtering
|
2022-02-04 13:26:03 +01:00 |
|
fbsanchez
|
a298b25a38
|
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
|
2022-02-03 17:55:34 +01:00 |
|
Daniel Barbero Martin
|
f342a218ba
|
fix link pandora_enterprise#8518
|
2022-02-02 13:51:04 +01:00 |
|
fbsanchez
|
17be6f3ca5
|
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
|
2022-02-02 11:36:14 +01:00 |
|
Daniel Rodriguez
|
110052a21f
|
Merge branch 'ent-8428-12919-visualizacion-agentes-en-operaciones-masivas-de-modulos' into 'develop'
Ent 8428 12919 visualizacion agentes en operaciones masivas de modulos
See merge request artica/pandorafms!4666
|
2022-02-02 09:37:15 +00:00 |
|
fbsanchez
|
5b06942caf
|
DANGER COMMIT, uses schema collation instead forced one
|
2022-02-01 15:18:45 +01:00 |
|
Jose Gonzalez
|
40efaa157d
|
Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs
|
2022-02-01 13:42:30 +01:00 |
|
Jose Gonzalez
|
d81e6571ec
|
New audit logs
|
2022-02-01 13:39:18 +01:00 |
|
alejandro.campos@artica.es
|
2b6a9f0277
|
show agent and module name tip
|
2022-01-31 15:43:56 +01:00 |
|
alejandro.campos@artica.es
|
d210390a3d
|
truncate texts in module massive operations
|
2022-01-27 17:30:20 +01:00 |
|
fbsanchez
|
1207463f16
|
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
Conflicts:
pandora_console/include/class/HTML.class.php
|
2022-01-25 14:16:47 +01:00 |
vgilc
|
4b85e93490
|
Merge branch 'ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma' into 'develop'
Ent 8222 nueva grafica desde la vista de modulos histograma
See merge request artica/pandorafms!4637
|
2022-01-25 10:28:18 +00:00 |
|
vgilc
|
b547278930
|
Merge branch 'ent-7988-no-se-puede-cambiar-la-skin-de-pandora-en-entorno-meta-nodo-sincronizados' into 'develop'
Ent 7988 no se puede cambiar la skin de pandora en entorno meta nodo sincronizados
See merge request artica/pandorafms!4633
|
2022-01-25 10:27:25 +00:00 |
|
vgilc
|
fa0e3c4abb
|
Merge branch 'ent-8208-bug-filtros-en-vista-de-alertas' into 'develop'
Fix monitoring alert detail filter for defautl actions
See merge request artica/pandorafms!4558
|
2022-01-25 10:24:42 +00:00 |
|
fbsanchez
|
35184c4eb6
|
ws php8
|
2022-01-21 17:39:11 +01:00 |
|
Jose Gonzalez
|
3252832cc7
|
WIP: Check audit logs
|
2022-01-20 10:55:23 +01:00 |
|
Daniel Barbero Martin
|
6be6b1a95d
|
add new macros #3763
|
2022-01-19 12:18:23 +01:00 |
|
Calvo
|
891c88f458
|
Fix meta alert action filter counter
|
2022-01-18 15:34:56 +01:00 |
|
Daniel Barbero Martin
|
a0a74cf7bb
|
add new chart histogram
|
2022-01-18 13:01:49 +01:00 |
|
Daniel Maya
|
b2fe6780ac
|
Fixed links in networkmaps
|
2022-01-18 11:39:37 +01:00 |
|
Daniel Barbero Martin
|
4f46da6633
|
Merge remote-tracking branch 'origin/develop' into ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma
Conflicts:
pandora_console/include/styles/pandora.css
|
2022-01-18 10:17:19 +01:00 |
|
Daniel Maya
|
e8d3d93f7f
|
Fixed pandora_black in metaconsole
|
2022-01-17 10:22:30 +01:00 |
|
Calvo
|
8c86dbbc50
|
Fix meta alerts list action filter
|
2022-01-17 09:17:39 +01:00 |
|
fbsanchez
|
fee3f4ab96
|
php8 review + mdpf update
|
2022-01-12 14:22:16 +01:00 |
|
Calvo
|
f9dceb9e10
|
Fix not init color
|
2021-12-28 12:38:22 +01:00 |
|
Calvo
|
daf0b4e6e9
|
Fix alert view with default actions node and meta
|
2021-12-27 19:01:53 +01:00 |
|
Daniel Rodriguez
|
0ed9406796
|
Merge branch 'ent-8171-Filtro-Server-type-limitado-en-vista-Monitores-metaconsola' into 'develop'
Ent 8171 filtro server type limitado en vista monitores metaconsola
See merge request artica/pandorafms!4574
|
2021-12-27 17:09:29 +00:00 |
|
Daniel Rodriguez
|
eb3d36489c
|
Merge branch 'ent-8270-Fallos-al-borrar-relaciones-en-mapas-de-red' into 'develop'
Ent 8270 fallos al borrar relaciones en mapas de red
See merge request artica/pandorafms!4566
|
2021-12-27 16:17:09 +00:00 |
|
Daniel Barbero Martin
|
f705cc0fba
|
wip chart histogram list modules #8222
|
2021-12-14 13:21:34 +01:00 |
|
fbsanchez
|
f852df2f1c
|
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
pandora_console/extras/mr/51.sql
|
2021-12-14 11:03:04 +01:00 |
|
Daniel Maya
|
57cd3d7309
|
#8171 Fixed server type in metaconsole
|
2021-12-07 16:21:20 +01:00 |
|
Daniel Maya
|
fb80350f99
|
#8270 Fixed delete links
|
2021-12-02 13:46:29 +01:00 |
|
fbsanchez
|
cad0c6cea6
|
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
pandora_console/extras/mr/51.sql
|
2021-12-02 10:43:30 +01:00 |
|
Daniel Barbero Martin
|
a02c8a7988
|
wip reports alert actions
|
2021-12-01 15:15:45 +01:00 |
|
Daniel Barbero Martin
|
40d801a947
|
Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta
|
2021-11-30 14:16:19 +01:00 |
|
Daniel Rodriguez
|
198959f6cb
|
Merge branch 'ent-7995-unificar-criterios-de-busqueda-que-no-sean-case-sensitive' into 'develop'
Unify search criteria case insensitive
See merge request artica/pandorafms!4496
|
2021-11-29 11:08:00 +00:00 |
|
fbsanchez
|
5197d08aa3
|
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
pandora_console/install.php
|
2021-11-29 09:54:55 +01:00 |
|
Daniel Barbero Martin
|
960c2de6c3
|
wip reports alert actions
|
2021-11-26 14:06:10 +01:00 |
|
Daniel Barbero Martin
|
cb0039d7a7
|
wip reports alert actions
|
2021-11-26 13:52:15 +01:00 |
|
Jose Gonzalez
|
98f519958c
|
Fix merge
|
2021-11-23 12:25:58 +01:00 |
|
Daniel Rodriguez
|
3e5b34325b
|
Merge branch 'ent-8169-No-funciona-recursión-de-grupos-en-vista-de-Monitores-de-Metaconsola' into 'develop'
Ent 8169 no funciona recursión de grupos en vista de monitores de metaconsola
See merge request artica/pandorafms!4513
|
2021-11-16 09:12:40 +00:00 |
|
Daniel Rodriguez
|
d094987eda
|
Merge branch 'ent-8063-recursion-y-filtro-en-operaciones-masivas-de-modulos' into 'develop'
Fix recursion and filter on modules massive operations
See merge request artica/pandorafms!4477
|
2021-11-15 11:29:33 +00:00 |
|
Daniel Rodriguez
|
e16a398c1a
|
Merge branch 'ent-7900-trazas-en-estado-agente-y-pandora-alert' into 'develop'
Deleted js traces
See merge request artica/pandorafms!4354
|
2021-11-15 11:13:50 +00:00 |
|
Daniel Rodriguez
|
650607067e
|
Merge branch 'ent-7688-conteo-monitores-vista-tactica' into 'develop'
Include modules not init in total monitors count on tactical view
See merge request artica/pandorafms!4309
|
2021-11-15 11:00:07 +00:00 |
|
Daniel Rodriguez
|
ddb156564d
|
Merge branch 'ent-7962-bug-visual-monitor-detail' into 'develop'
Fixed tip position and code style
Closes pandora_enterprise#7962
See merge request artica/pandorafms!4488
|
2021-11-15 10:10:53 +00:00 |
|
José González
|
bdc4d0a8b1
|
Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"
This reverts merge request !4302
|
2021-11-04 16:28:15 +01:00 |
|
Jose Gonzalez
|
c0abe5edb9
|
Fix merge
|
2021-11-04 16:00:05 +01:00 |
|
Daniel Maya
|
031e0a2cd7
|
#8169 Fixed group recursion with standar user
|
2021-11-02 11:08:15 +01:00 |
|
Calvo
|
f1f984614f
|
Unify search criteria case insensitive
|
2021-10-22 12:02:31 +02:00 |
|
Jose Gonzalez
|
070c920e0e
|
Fixed tip position and code style
|
2021-10-20 13:01:13 +02:00 |
|
Calvo
|
7daf138ef5
|
Fix recursion and filter on modules massive operations
|
2021-10-18 15:47:22 +02:00 |
Jose Gonzalez
|
4331438765
|
Removed some cheerful words in the project
|
2021-10-08 11:13:28 +02:00 |
|
fbsanchez
|
dae8a9ba14
|
Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red
|
2021-10-06 14:50:13 +02:00 |
|
Daniel Rodriguez
|
3ab921acbb
|
Merge branch 'ent-7950-errores-en-log-viewer' into 'develop'
Ent 7950 errores en log viewer
See merge request artica/pandorafms!4383
|
2021-10-05 09:29:24 +00:00 |
|
Jose Gonzalez
|
5eb66e5c6e
|
Fixed issue with node actions
|
2021-10-01 14:05:41 +02:00 |
|
fbsanchez
|
d322d23203
|
WIP NCM
|
2021-09-30 19:10:45 +02:00 |
|
Jose Gonzalez
|
8696d21a42
|
Fixed any minor bugs
|
2021-09-29 17:03:13 +02:00 |
|
Luis
|
849ce30da5
|
Update pandora_networkmap.view.php
|
2021-09-28 08:50:00 +00:00 |
|
Calvo
|
90ac62c0cc
|
Fix recursion on networkmap nodes
|
2021-09-27 16:14:07 +02:00 |
|
Jose Gonzalez
|
de1bf03976
|
Clean logs
|
2021-09-23 17:19:47 +02:00 |
|
Jose Gonzalez
|
5b40a4f700
|
Merge remote-tracking branch 'origin' into ent-7514-pasar-networkmaps-a-open
|
2021-09-23 08:50:50 +02:00 |
|
Daniel Maya
|
61fb2e102b
|
#7950 Fixed last_contact 3
|
2021-09-22 16:39:34 +02:00 |
|
Daniel Rodriguez
|
126030261b
|
Merge branch 'ent-7969-Etiquetas-HTML-en-módulos-de-wizard-Consolas-Visuales' into 'develop'
Ent 7969 etiquetas html en módulos de wizard consolas visuales
See merge request artica/pandorafms!4394
|
2021-09-22 09:01:17 +00:00 |
|
Jose Gonzalez
|
3af47c0e5f
|
Open network maps
|
2021-09-17 10:45:01 +02:00 |
|
Daniel Maya
|
240caa3ad1
|
#7969 Fixed span with truncate
|
2021-09-08 12:14:03 +02:00 |
|
Daniel Maya
|
24670da399
|
#7950 Fixed last_contact 2
|
2021-09-07 14:47:54 +02:00 |
|
Jose Gonzalez
|
bb743cb87f
|
Fixed forget metaconsole alerts
|
2021-09-06 14:08:24 +02:00 |
|
Daniel Maya
|
5bf70f876c
|
#7950 Fixed last_contact
|
2021-09-02 16:12:46 +02:00 |
|
Daniel Rodriguez
|
8397f778b3
|
Merge branch 'ent-6885-11172-añadir-opcion-de-nor-en-monitor-detail' into 'develop'
add not option in monitor detail filter
See merge request artica/pandorafms!4112
|
2021-09-01 08:54:49 +00:00 |
marcos
|
80f4e25b92
|
change first option value when not_condition its enabled
|
2021-08-30 11:19:53 +02:00 |
|
Daniel Rodriguez
|
a89faed47c
|
Merge branch 'ent-7823-interfaces-view-no-calcula-bien-last-data' into 'develop'
Fixed issue with last_data obtain
Closes pandora_enterprise#7823
See merge request artica/pandorafms!4338
|
2021-08-27 10:46:39 +00:00 |
|
marcos
|
2ed657c166
|
updates
|
2021-08-26 12:42:16 +02:00 |
|
marcos
|
24a66f0173
|
updates
|
2021-08-24 13:30:50 +02:00 |
|
marcos
|
4d270a3559
|
set first option select2 all to none if not condition is enabled
|
2021-08-23 09:52:42 +02:00 |
|
marcos
|
61409b72b4
|
Merge remote-tracking branch 'origin/develop' into ent-6885-11172-añadir-opcion-de-nor-en-monitor-detail
|
2021-08-23 08:52:17 +02:00 |
|
Daniel Maya
|
9488ce873b
|
#7887 Fixed xss in massive modules
|
2021-08-19 12:57:16 +02:00 |
|
Calvo
|
fcbd69c603
|
Deleted js traces
|
2021-08-12 14:16:25 +02:00 |
|
fbsanchez
|
034e921e35
|
Upgraded jquery to 3.6.0, without npm
|
2021-08-12 09:30:43 +02:00 |
|
Daniel Rodriguez
|
2224709814
|
Merge branch 'ent-7543-11772-command-snapshot-view-fondo-blanco-en-tema-oscuro' into 'develop'
se command sanpshot black theme
See merge request artica/pandorafms!4232
|
2021-08-06 12:57:05 +00:00 |
|
Daniel Rodriguez
|
2963d67225
|
Merge branch 'ent-7767-secondary-groups-no-se-anaden-agente' into 'develop'
Improve code for get secondary groups
Closes pandora_enterprise#7767
See merge request artica/pandorafms!4259
|
2021-08-02 07:18:02 +00:00 |
|
José González
|
b23aafdf03
|
Fixed issue with last_data obtain
|
2021-07-30 12:35:08 +02:00 |
|
Calvo
|
a8c0ba8e78
|
Include modules not init in total monitors count on tactical view
|
2021-07-19 13:20:00 +02:00 |
|
José González
|
a9075463ac
|
Missed change
|
2021-07-02 13:48:59 +02:00 |
|
fbsanchez
|
760522aeff
|
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
|
2021-06-28 11:03:09 +02:00 |
|
marcos
|
26acac191f
|
ad not condition on monitor detail
|
2021-06-25 09:37:26 +02:00 |
|
fbsanchez
|
36e455e5c5
|
Fixes for agent_module widget
|
2021-06-23 18:00:54 +02:00 |
|
marcos
|
fafcef7e85
|
se command sanpshot black theme
|
2021-06-23 17:35:16 +02:00 |
|
fbsanchez
|
76fbf75572
|
Fix for filtering common modules
|
2021-06-23 14:31:42 +02:00 |
|
fbsanchez
|
be09c1c64d
|
Some changes, multibox fixes for metaconsole
|
2021-06-23 14:24:16 +02:00 |
|
fbsanchez
|
9fb7074082
|
minor fix
|
2021-06-22 19:44:41 +02:00 |
|
fbsanchez
|
390bf14761
|
cover for bulk service operations in mc/node
|
2021-06-22 15:32:15 +02:00 |
|
fbsanchez
|
fc0b605cee
|
Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios
|
2021-06-21 12:13:46 +02:00 |
|
fbsanchez
|
1f34cf8596
|
Massive operation over service elements
|
2021-06-18 15:36:52 +02:00 |
|
marcos
|
56b6418716
|
add not condition filter
|
2021-06-17 15:04:21 +02:00 |
|
marcos
|
dff7220be9
|
add not condition filter
|
2021-06-17 14:59:43 +02:00 |
|
marcos
|
0cfb7c994f
|
fixed merge conflict
|
2021-06-14 11:02:57 +02:00 |
|
marcos
|
ee4a3dc450
|
fixed merge conflict
|
2021-06-14 10:52:50 +02:00 |
|
marcos
|
5162864b28
|
fixed merge conflict
|
2021-06-14 09:03:17 +02:00 |
|
marcos
|
0ab343e672
|
merge conflict
|
2021-06-14 08:26:33 +02:00 |
|
fbsanchez
|
ae34209f52
|
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
|
2021-06-10 21:45:50 +02:00 |
|
Marcos Alconada
|
665efa4fb7
|
Ent 7519 cambio de fuentes en la consola a nivel global
|
2021-06-10 08:19:11 +00:00 |
|
Daniel Barbero Martin
|
a9864f7d87
|
Wip command center, clean functions db
|
2021-06-10 08:45:50 +02:00 |
|
Daniel Rodriguez
|
4b819360ff
|
Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'"
This reverts merge request !4132
|
2021-06-09 18:09:43 +02:00 |