Commit Graph

210 Commits

Author SHA1 Message Date
Jorge Rincon 6fdff0600f #11182 change the default Support expires date 2023-05-12 12:55:39 +02:00
Diego Muñoz-Reja 2a03861168 Merge branch 'ent-10653-14875-no-se-pueden-crear-eliminar-informes-con-acl-solo-custom-report' into 'develop'
Ent 10653 14875 no se pueden crear eliminar informes con acl solo custom report

See merge request artica/pandorafms!5650
2023-04-18 12:22:53 +00:00
Rafael Ameijeiras cc2709c42c Merge branch 'ent-10699-errores-en-los-mapas-varios' into 'develop'
Ent 10699 errores en los mapas varios

See merge request artica/pandorafms!5632
2023-04-05 06:47:31 +00:00
Pablo Aragon f798149502 10653-ACL reporting 2023-04-03 14:09:37 +02:00
Jonathan 8b04d5981d Agent view follow menu change 2023-03-30 14:17:33 +02:00
Jonathan 7a3e894bb0 Menu fix follow reports 2023-03-28 11:06:03 +02:00
Daniel Maya 712da9070f #10699 Fixed maps 2023-03-28 10:45:41 +02:00
daniel ebffb004e9 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-27 21:22:06 +02:00
Jonathan e06fc2f115 Collection visual fix 2023-03-27 16:26:12 +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
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
Daniel Maya 94c843dac2 #9662 Fixed gis map menu 2023-03-23 10:41:08 +01:00
Jonathan a063c7a0ac Fix header and menu 2023-03-22 14:21:56 +01:00
Jonathan e2615b9593 Visual changes header 2023-03-21 17:02:03 +01:00
Daniel Cebrian a21e43a452 #10764 ignore selected action in fav menu 2023-03-21 15:40:46 +01:00
daniel 0643b4e0ba fixed styles 2023-03-13 12:19:27 +01:00
Pablo Aragon b18a689225 About meta and observer input password 2023-03-03 12:40:58 +01:00
Daniel Maya 586b6e5883 #9662 fixed menu 2023-02-27 09:39:34 +01: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
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
Jose Gonzalez 69f08cc027 Ticket 10460 Improve menu buttons 2023-02-17 14:44:26 +01:00
Daniel Maya 98f82b4ce8 #9662 Fixed discovery menu 2023-02-13 14:32:02 +01:00
Daniel Maya 7d6ace0f98 #9662 Added icon about 2023-02-13 12:43:30 +01:00
Jose Gonzalez d45a631ea5 Final merge with new menu 2023-02-13 10:37:37 +01:00
Jose Gonzalez 98736c1ab4 Merge 2023-02-13 10:24:07 +01:00
Daniel Maya 44bee67f36 #9663 menu redesing 6 2023-02-13 09:31:33 +01:00
Daniel Maya be3c7bca6c resolved conflict 2023-02-10 11:55:45 +01:00
Daniel Maya 08f0f3403a #9663 menu redesing 5 2023-02-10 11:48:32 +01:00
Daniel Maya 758f906616 #9663 menu redesing 4 2023-02-07 15:22:51 +01:00
Daniel Cebrian a39fe577b5 #10296 added date in popup about 2023-02-07 10:21:45 +01:00
Daniel Maya 1437c5a0e7 #9663 menu redesing 3 2023-02-02 13:28:48 +01:00
Daniel Cebrian 89985bca2b #10212 added custom report tabs in acl 2023-01-30 17:00:57 +01:00
Daniel Cebrian b7c368ea6d #10212 added option manage custom report in acl setup 2023-01-30 16:24:21 +01:00
Pablo Aragon 8d7671f35f 10222 Fix image About and black css About 2023-01-24 12:34:04 +01: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 ab54a26815 9868 Remove footer and create About section 2022-12-29 16:21:36 +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 Maya ac910412a3 #9663 WIP menu redesing 2022-11-24 09:36:18 +01:00
jose.gonzalez@pandorafms.com f2ebd96cc8 WIP: Created new way to do the menus 2022-10-20 09:43:02 +02:00
Calvo da0dad0148 WIP:Move inventory to open 2022-09-14 18:12:39 +02:00
Daniel Maya 13831b28ee #9444 fixed sound event in acl enterprise 2022-09-07 11:27:07 +02:00
José González 1be4948e2d Changed strings and improve code 2022-06-03 12:26:15 +02:00
fbsanchez 7ebd6a5f74 php8 warnings cleanup 2022-01-11 12:08:41 +01:00
Calvo d7f590bacb Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-11-24 13:42:48 +01:00
Daniel Rodriguez 688ec5f7f9 Merge branch 'ent-8144-no-se-muestra-completo-el-nombre-de-dashboard-consola-visual-favorito-en-el-menu' into 'develop'
Ent 8144 no se muestra completo el nombre de dashboard consola visual favorito en el menu

See merge request artica/pandorafms!4505
2021-11-22 15:54:05 +00:00
Calvo 06fe1552bf Enterprise ACL step 2: Add options fix merge 2021-11-17 17:31:43 +01:00
Calvo 9d3c691ad1 Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-11-15 18:33:35 +01:00
Calvo b6e34a2697 erge remote-tracking branch 'origin/develop' into ent-7839-revision-acl-enterprise-parte-2-introduccion-opciones 2021-11-15 18:14:18 +01:00
Daniel Rodriguez eb9e73ecb0 Merge branch 'ent-7838-revision-acl-enterprise-parte-1-eliminacion-opciones' into 'develop'
Deleted and reubicated acl options

See merge request artica/pandorafms!4340
2021-11-15 11:24:50 +00:00
Calvo 5a341c1067 Remove sections from ACL enterprise setup 2021-11-11 17:29:16 +01:00
Calvo 1e51197afb Fix menu favourite GIS maps. services and dashboards large title 2021-10-27 19:39:18 +02:00
Calvo 2ca6f52598 Revision ACL part 3 2021-09-02 15:43:20 +02:00
Calvo 3204fdb71f Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-09-01 11:06:20 +02:00
Jose Gonzalez 20c0d87165 Fix issue with initial visual problems 2021-08-19 08:18:06 +02:00
Calvo 34c3b00426 WIP: Revision ACL part 3 2021-08-13 15:57:01 +02:00
Calvo 9d04933ca2 Added missing sec related to GET params to ACL enterprise 2021-08-06 10:29:38 +02:00
Calvo 9b736d0c48 Deleted and reubicated acl options 2021-07-30 13:49:22 +02:00
José González 00d4f0c57d Clean code and fix issue with lateral main menu 2021-06-16 15:29:28 +02:00
daniel a2a3e67d49 Ent 7363 bug al copiar consola visual 2021-04-22 07:07:22 +00:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
Daniel Maya 296cb9125e Ent 5316 anadir seccion credential store al menu de discovery 2020-12-03 14:48:12 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
Tatiana Llorente c842c96d08 Fixed duplicated names - #4280 2019-09-10 12:19:53 +02:00
Tatiana Llorente b198700172 Fixed duplicated names - #4280 2019-09-10 12:18:17 +02:00
Tatiana Llorente bdee45c2dd Fixed duplicated names - #4280 2019-08-12 14:24:26 +02:00
Tatiana Llorente c7e410b16d Added discovery submenus to main menu - #4203 2019-07-03 11:08:17 +02:00
Daniel Rodriguez a3d0e3b55d Merge branch 'ent-4040-menu-resources-no-esta-resaltado-en-vista-de-agente' into 'develop'
Condition is added to keep the selection color in the main menu

See merge request artica/pandorafms!2464
2019-06-25 13:10:15 +02:00
fbsanchez 40cca5e1e3 BIG style change, erased all important flags 2019-05-30 18:21:13 +02:00
marcos.alconada d5ac57064b Condition is added to keep the selection color in the main menu 2019-05-29 11:34:23 +02:00
Manuel Montes 6bd38c6d4c Merge branch 'develop' into 'ent-3740-Buguillo-en-configuracion-de-ACLs'
Conflicts:
   pandora_console/include/functions_menu.php

Former-commit-id: 96e46da859b6d05409a8b2166bb2822493fe6558
2019-04-05 08:15:48 +02:00
fbsanchez fb818064ed minor fix menu
Former-commit-id: 6d0ca2d3d86af083c91a098326dc073d90187ab0
2019-03-27 14:39:02 +01:00
fbsanchez ba0ddfb826 style revission
Former-commit-id: d223662de64194115cf56264ceda987e732eb79a
2019-03-26 19:29:48 +01:00
alejandro-campos 079f578830 fix bad behavior of pandoras side menu on page load
Former-commit-id: b1d4eb3e2464fa441f16190d29b2d57cfaa9e3c5
2019-03-25 19:37:45 +01:00
manuel 603f8a08e8 Fixed bug in ACL setup section 2
Former-commit-id: a3d2f53cdc169fe7a5455368229e396451de0208
2019-03-21 13:15:21 +01:00
Luis Calvo 5d33d7468e Merge remote-tracking branch 'origin/develop' into ent-3578-ACL-visual-consol-not-working-properly
Former-commit-id: 506c3611ff578c95f07753113d1bc46d80069c95
2019-03-08 12:04:57 +01:00
Tatiana Llorente 7be5d3e9e0 new header and menu
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
2019-03-05 12:54:11 +01:00
Tatiana Llorente 36fa0fc41f new header and menu
Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018
2019-03-04 08:39:56 +01:00
Tatiana Llorente 3e87c8e931 new header and menu
Former-commit-id: 975b72219cb07e0d4f9b332607e554bd65ea7cc3
2019-02-26 10:43:59 +01:00
Luis Calvo de7c1ce978 Fixed ACL selection menu wrong sec for visual console
Former-commit-id: dd9f4a212f43774c2602932baa0c1a83e3ba6e56
2019-02-26 09:40:04 +01:00
Tatiana Llorente 4c92375a58 new header and menu
Former-commit-id: 3509107664a968fc358a8bb3e662f27b26b10c73
2019-02-25 12:23:15 +01:00
Tatiana Llorente 526311d1c6 new header and menu
Former-commit-id: 0748bc89d30e8ae4723026848d493d15d82af9cd
2019-02-25 11:54:46 +01:00
samucarc b96bf0e4b0 Fixed conflict
Former-commit-id: 9db99a8652b794c3e98c0372de6a43066886c5e4
2019-02-07 17:33:43 +01:00
artica b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
samucarc 0d48b4573a Fixed Label in the Console Menu
Former-commit-id: eb73f14fa5631dd481b36711ea0bb62943ec43e5
2019-01-14 18:54:43 +01:00
manuel.montes c8b5ecad06 Fixed submenu2 in functions_menu.php 2018-06-12 17:41:46 +02:00
fermin831 37dfdc9021 [Console Enterprise ACL] Added graph view to Reporting->Custom Graphs text name 2018-02-26 11:15:11 +01:00
daniel 0b5678fba6 add new funtionality view favourite console visual 2017-12-28 15:13:06 +01:00
enriquecd 27e7a51006 Fix graph container permissions and graph acl - #1576 2017-11-15 11:31:17 +01:00
fermin831 d7fbc62eca Modified menu_calculate_top to works well with fixed menu option 2017-03-27 15:47:48 +02:00
fermin831 2b74fbe57e Modified menu position to fit it with ACL enterprise 2017-03-27 15:32:05 +02:00
enriquecd b6e9ed3604 Add titles to all levels buttons in lateral menu buttons / 2 - #234 2017-02-07 17:43:22 +01:00
enriquecd 8622b90b13 Add titles to lateral menu buttons - #234 2017-02-07 14:53:32 +01:00
fermin831 26c34bf3cd Added notification messages on menu 2016-06-16 13:03:06 +02:00
m-lopez-f 67f1765248 Fixed problems with menus and acl enterprise 2016-05-18 11:40:20 +02:00