tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
37,362 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

322 Commits

Author SHA1 Message Date
Jose Gonzalez 98736c1ab4 Merge 2023-02-13 10:24:07 +01:00
Daniel Maya be3c7bca6c resolved conflict 2023-02-10 11:55:45 +01:00
Daniel Maya 758f906616 #9663 menu redesing 4 2023-02-07 15:22:51 +01:00
Jonathan b88f26500b #9819 Change labels Accoustic console 2023-01-31 08:35:47 +01:00
Jonathan 624463d573 #9819 change setcion menu configuration sound 2023-01-30 08:27:03 +01:00
Jonathan 34fede2ce1 #9819 New section configuration sound event 2023-01-27 12:42:23 +01:00
daniel 95575b4e90 remove old format events sounds pandora_enterprise#10208 2023-01-27 12:37:25 +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
Calvo 63840b1d55 Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-19 11:31:02 +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
Alejandro Campos 867e1cc2b3 Merge branch 'develop' into 'ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional' 
# Conflicts:
#   pandora_console/extras/mr/60.sql
 2022-12-13 11:42:41 +00:00
alejandro.campos@artica.es 6a173664d4 Removed transactional server 2022-11-11 12:09:03 +01:00
Daniel Barbero ccc2e830f4 add sound events to metaconsole pandora_enterprise#8854 2022-11-03 15:12:50 +01:00
alejandro.campos@artica.es 17d7261173 implement cluster in open project 2022-10-20 13:17:26 +02:00
jose.gonzalez@pandorafms.com f2ebd96cc8 WIP: Created new way to do the menus 2022-10-20 09:43:02 +02:00
Daniel Barbero a21048c4c5 Merge remote-tracking branch 'origin/develop' into ent-9425-agrupar-eventos-por-id_extra 2022-10-14 08:11:51 +02:00
Daniel Barbero 9e2c6edfeb new group by events for extraid pandora_enterprise#9425 2022-09-27 15:08:09 +02:00
Calvo 8174925a91 Delete favourite vc from menu when vc is deleted 2022-09-26 11:32:07 +02:00
Calvo da0dad0148 WIP:Move inventory to open 2022-09-14 18:12:39 +02:00
Daniel Maya b4a061a190 #9442 Fixed enterprise acl 2022-08-23 13:22:10 +02:00
Daniel Barbero Martin 01ba149280 new console report pandora_enterprise#6367 2022-07-08 13:40:20 +02:00
Daniel Barbero Martin 033027f360 modal sound events pandora_enterprise#9095 2022-07-04 17:09:30 +02:00
Daniel Barbero Martin 2dc16a2a19 modal sound events pandora_enterprise#9095 2022-07-01 13:08:39 +02:00
Daniel Barbero Martin e28bfe9f3f modal sound events pandora_enterprise#9095 2022-06-30 17:17:05 +02:00
Daniel Barbero Martin f6de9fb0a0 events sound pandora_enterprise#7960 2022-05-31 10:10:44 +02:00
Daniel Maya 74996e3cc0 WIP heatmap 2 2022-02-25 09:41:32 +01:00
Daniel Maya 3c50164270 WIP heatmap 2022-02-11 14:50:57 +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
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 1e51197afb Fix menu favourite GIS maps. services and dashboards large title 2021-10-27 19:39:18 +02:00
Jose Gonzalez b61e7c6c58 Fixed visual with browsers with more zoom 2021-10-19 17:04:39 +02:00
Jose Gonzalez 9699b368ef Fixed visual issues and handle browser zoom 2021-10-19 16:56:54 +02:00
Calvo 9b736d0c48 Deleted and reubicated acl options 2021-07-30 13:49:22 +02:00
Daniel Rodriguez b8fe685028 Merge branch 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' into 'develop' 
implemented user level authentication for integria ims integration

See merge request artica/pandorafms!4117
 2021-05-17 14:41:11 +00:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
alejandro.campos@artica.es 93f3551326 Create interface views 2021-04-12 18:17:09 +02:00
Daniel Maya 79914082e9 Ent 6850 quitar nta 2021-03-24 15:16:13 +00:00
alejandro.campos@artica.es 3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
Daniel Maya b54845fdcf Ent 6851 quitar marquesina de vista de eventos 2021-03-09 16:39:26 +00:00
Alejandro Campos d4054f15d0 Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora' 
# Conflicts:
#   pandora_console/extras/mr/45.sql
#   pandora_console/godmode/alerts/configure_alert_action.php
#   pandora_server/util/pandora_db.pl
 2021-03-04 10:27:07 +00:00
alejandro.campos@artica.es 901d12fec0 Integration with Integria 2021-02-25 13:18:04 +01:00
Luis Calvo 778419e71d Merge remote-tracking branch 'origin/develop' into ent-6844-quitar-vista-estadisticas-eventos 2021-01-25 13:06:36 +01:00
Luis Calvo 210f2057cd Removes event_statistics view 2020-12-21 17:56:24 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
fbsanchez 032faf8c0c WIP Smart services 2020-06-26 15:48:58 +02:00
Tatiana Llorente 1f16abd4bd Ent 5701 quitar feature de chat 2020-05-08 15:39:24 +02:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
vgilc f4372bb766 Merge branch 'ent-4917-Pete-SQL-al-añadir-un-dia-especial-a-la-lista-de-dias-especiales' into 'develop' 
Ent 4917 pete sql al añadir un dia especial a la lista de dias especiales

See merge request artica/pandorafms!2861
 2019-12-10 11:43:46 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
Tatiana Llorente 32f4ad2c4f Changed name of variable filter in menu 2019-11-05 11:20:57 +01:00
Tatiana Llorente 84ae4a8391 Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria 
Conflicts:
	pandora_console/extras/mr/32.sql
 2019-09-25 10:50:31 +02:00
alejandro-campos f73cd80336 minor changes in integria integration 2019-09-23 15:16:31 +02:00
Tatiana Llorente 027f9fd9d4 New view - List of Integria IMS tickets - #4642 2019-09-17 12:59:29 +02:00
alejandro-campos 97353bbfed backup changes 2019-08-08 13:36:12 +02:00
fbsanchez 86600ca454 RSS menu filter loaded 2019-06-25 12:21:18 +02:00
manuel 40119f6d2e Fixed bug in visual consoles permissions with ACLS 2019-06-11 12:55:43 +02:00
fbsanchez 6648e0268a removed reconview link from menu 
Former-commit-id: 41b80e4eaa41617982c91a218aee3902b76e4fde
 2019-04-15 12:54:22 +02:00
fermin831 b2f046e4d6 Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/extras/mr/26.sql
	pandora_console/include/class/ConsoleSupervisor.php
	pandora_console/include/class/NetworkMap.class.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/menu.php

Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
 2019-03-27 12:11:23 +01:00
fbsanchez ba0ddfb826 style revission 
Former-commit-id: d223662de64194115cf56264ceda987e732eb79a
 2019-03-26 19:29:48 +01:00
fermin831 4a201bc74b [Network usage map] Fixed menus and added header. 
Former-commit-id: 1cdfc4f7f388f0705b32a362ce8c5f3ac1fb49b2
 2019-03-25 16:00:57 +01:00
Fermin 7b9bbe6b9c Fixed reporting menu 
Former-commit-id: efaf4d26e0d48bbdea3df7afb2c462a1b70a6701
 2019-03-08 09:29:12 +01:00
fermin831 ccb8078a5a Added listeners and talkers netflow explorer 
Former-commit-id: aabd4c468ae9163a89447da170861a5ab1dcc2a0
 2019-03-06 13:31:55 +01:00
Fermin 568d187902 Style fix 
Former-commit-id: d7d8ba5bdc7269496adf6a1caa2ffa0631102cd5
 2019-03-01 14:26:59 +01:00
Fermin cbb4f971a2 Added new network menus 
Former-commit-id: 885f092dbfcc561cca5bf1bf8c3ba8497d94ffc4
 2019-03-01 14:23:10 +01:00
fermin831 2c1eb0fe03 Added aws view menu 
Former-commit-id: a64079eb5e773d3fe36031bac856aa801728f79d
 2019-02-22 14:16:39 +01:00
fbsanchez 42dc0c60be supervisor 
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
 2019-02-12 11:41:21 +01:00
fermin831 ac6b74dcdf Added new window to display user notifications config 
Former-commit-id: 57ba8fcd01365cedc92535d7cf71f70432a55a94
 2019-02-06 11:36:28 +01:00
Alejandro Gallardo Escobar d38236091b Format fixes 
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
 2019-02-01 09:55:29 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
enriquecd 5ab43d8106 Add menu section, new db tables and two new module types in pandoradb 2018-01-16 15:41:35 +01:00
daniel 0b5678fba6 add new funtionality view favourite console visual 2017-12-28 15:13:06 +01:00
Arturo Gonzalez d1a4458aad Added new section to menu 2017-10-24 13:51:34 +02:00
Arturo Gonzalez 2e71af2568 Added new visual styles to event sound console 2017-05-25 17:11:35 +02:00
enriquecd d066c5f88f Erase integria incidents integration with integria tickets - #29 2017-01-25 12:40:42 +01:00
Arturo Gonzalez e9eb60a718 Changed events sound styles and added new filters. Ticket #109 Gitlab 2016-12-05 15:23:17 +01:00
Arturo Gonzalez 6f20c31560 New networkmaps in progress... (Deleted the older new networkmaps reference, rest in peace sweet heart) 2016-09-30 10:46:32 +02:00
Arturo Gonzalez 9f70d5081b New networkmaps in progress... (Traspassing the code from E to O) 2016-09-13 16:39:21 +02:00
m-lopez-f 581d3835db Fixed acl's permmissions. Ticket #3912 2016-09-08 16:06:12 +02:00
fermin831 d0c1d5eede Changed require for include 2016-08-31 12:10:14 +02:00
fermin831 7462ff1ece RSS menu does not appear if IP is not in white API IP list 2016-08-30 10:47:00 +02:00
m-lopez-f 3ae6866ab0 Fixed problems with menu. Internal Ticket: #3912 2016-08-29 16:09:11 +02:00
m-lopez-f 2db19c539f Fixed problems with ACL permmisions. Internal Tiquet: #3912 2016-08-29 09:40:43 +02:00
Arturo Gonzalez 39d54518eb New transmap in progress (problem with merge from develop) 2016-05-30 13:13:39 +02:00
Arturo Gonzalez a4dd64bb8e Merge branch 'develop' into feature/transactional-map 
Conflicts:
	pandora_console/include/constants.php
	pandora_console/operation/menu.php
 2016-05-30 13:08:34 +02:00
m-lopez-f 67f1765248 Fixed problems with menus and acl enterprise 2016-05-18 11:40:20 +02:00
Arturo Gonzalez ceee981cfb New transmap in progress... (This is only THE BEGINNING) 2016-04-29 15:31:22 +02:00
mdtrooper 9376e9aa6d Merge branch 'develop' into feature/new_networkmap 2016-02-10 14:54:08 +01:00
mdtrooper b0b6b89509 Add menu entry. 2016-02-01 12:56:14 +01:00
m-lopez-f 1c374acc3f Change refr in visual console. Tiquet: #3277 2016-01-28 11:57:32 +01:00
mdtrooper 90c024eb9c Now the menu entries are can highlight with subpages (with the item 'pages'). TICKET: #2903 2016-01-18 14:50:42 +01:00
m-lopez-f 332fce904d Fixed problems with includes javascript when enter in list of gis map. Tiquet: #2935 
(cherry picked from commit ecd5e92184)
 2015-11-25 08:40:22 +01:00
m-lopez-f 25a3e09895 Move links submenu and add image and style. tiquet: #2960 2015-11-17 12:20:34 +01:00
m-lopez-f 4761d4ad8e Fixed styles of lateral menu and add link in submenu of tools. Tiquet: #2960 2015-11-17 11:20:45 +01:00
m-lopez-f 7f1d89940d Change menu. Tiquet: #2471 2015-08-19 08:49:16 +02:00
mdtrooper 7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +02:00
mdtrooper 819b1d5d77 Clean the source code style. 2015-06-08 09:32:01 +02:00
m-lopez-f c3026d70a4 Fixed error en menu, not show option 2015-05-04 15:59:31 +02:00
m-lopez-f 6544269429 Add forgotten options in menu 2015-04-23 11:02:24 +02:00
m-lopez-f 645875a3a1 Fixed menu add sections that it isnt in menu 2015-04-23 08:44:04 +02:00
m-lopez-f dc09a9a14e Change visual and add new images 2015-04-21 17:26:20 +02:00