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

197 Commits

Author SHA1 Message Date
Daniel Barbero Martin 8c7654cd2d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/godmode/setup/os.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/users/user_edit.php
 2021-05-28 08:26:19 +02:00
Daniel Barbero Martin 6c305833bf fix groups, module_groups, network_components user_edit synch 2021-05-18 17:18:54 +02:00
José González ab984b8c32 Added standard headers 2021-04-30 13:50:58 +02:00
marcos 0ff28fb9a2 fixed error with icon groups policies 2021-04-22 16:09:05 +02:00
Jose Gonzalez 3d359dab36 Fixed merge with 7161 2021-04-13 12:55:35 +02:00
Daniel Maya 9bbac06771 Ent 7161 cambiar opciones de skin en usuarios y grupos 2021-04-13 09:26:50 +00:00
José González 4a028b2ee3 Merge branch 'develop' into 'ent-6387-limitar-agentes-por-grupo' 
# Conflicts:
#   pandora_console/extras/mr/46.sql
 2021-04-13 07:52:48 +00:00
Jose Gonzalez 62264c9d07 Added boolean casting for check acl 2021-04-09 14:05:33 +02:00
Jose Gonzalez f8d4039314 Fixed merges 2021-04-09 10:34:25 +02:00
fbsanchez c64f05dc17 minor fix while empty search condition 2021-04-07 20:31:24 +02:00
Luis 4ab7b1a135 Ent 6952 bug group creation user admin no all 2021-04-07 08:11:35 +00:00
Daniel Barbero Martin b78f4093ac fixed error tree groups agent edition metaconsole 2021-03-15 13:31:24 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
marcos 45a2b7141d fixed error with group cordinator profile with agent management meta 2021-02-17 14:07:18 +01:00
Jose Gonzalez 26a788b2e9 Added control for max agents in groups 2021-01-26 12:35:08 +01: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
Luis Calvo 31a8eefd2f Fixed bug allowing updating group with duplicated name 2020-11-04 16:22:44 +01:00
fbsanchez f744261821 minor fix 2020-10-27 16:03:35 +01:00
fbsanchez 27c2fa0860 minor fix 2020-10-05 11:52:41 +02:00
Marcos Alconada 48e19f3b59 add condition 2020-09-22 12:15:05 +02:00
Luis 7b09c1e943 Ent 6029 meta groups delete bug 2020-08-07 09:40:46 +02:00
marcos 415a8aa8b6 ignore keys on xss manage angent groups 2020-06-19 10:44:43 +02:00
marcos b3a270d0b3 fixed security error on manage agent group 2020-06-09 12:43:58 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
tatiana e939ac05a8 Delete groups in nodes when deleting in meta - #5138 2020-03-19 13:11:06 +01:00
fbsanchez 7d52614064 Ent 4615 implementar cifrado en los contenedores de credenciales usando el sistema de cifrado interno de pandora 2019-09-24 11:25:53 +02:00
fbsanchez 6ac21acd39 wip agent deployment scan 2019-07-25 18:35:51 +02:00
fbsanchez 3bbd01026e WIP agent deployment 2019-07-15 19:37:04 +02:00
fbsanchez 9fb32c4699 Deployment area single targets 2019-07-12 18:29:58 +02:00
fbsanchez 47cc0d9d6e WIP: Agent deployment center 2019-07-10 23:59:09 +02:00
fbsanchez 18d8f90f90 Credential store upgrade Azure 2019-07-03 16:04:40 +02:00
fbsanchez e1bf12a1fb Credential store 2019-06-25 18:21:23 +02:00
fbsanchez 22d936d4f3 credential store some js controls 2019-06-25 16:43:38 +02:00
fbsanchez 5658b98f0b intuitive credential store 2019-06-21 23:51:22 +02:00
fbsanchez e9ef9b64a3 credential_store 2019-06-21 19:34:47 +02:00
fbsanchez 6682bad19f first steps credential store 2019-06-21 12:03:25 +02:00
fbsanchez 4a42756ec6 group_management styles profiles 2019-05-29 15:44:51 +02:00
manuel 6bd8221bc0 changed helps 
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
 2019-04-29 14:36:02 +02:00
Tatiana Llorente f497d3bd2e Added class to action buttons and moved checkbox to the left side 
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
 2019-04-02 13:42:30 +02:00
Tatiana Llorente 26451c41a1 New design for the tables - #3707 
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
 2019-03-29 11:05:52 +01:00
Tatiana Llorente 845cb85c55 New design for tables - #3707 
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
 2019-03-27 17:03:55 +01:00
daniel 504a8e9d1a fixed warnings php 
Former-commit-id: d21cb02113c65a7f50a5e29f7f536e85ba5cb945
 2019-02-25 13:02:39 +01:00
Tatiana Llorente 4c2215a3db Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None 
Conflicts:
	pandora_console/install.php


Former-commit-id: bc20f50737c115ade0034b4ca9e6d4cab26d35e6
 2019-02-07 08:59:45 +01:00
Tatiana Llorente b8aab972c9 Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None 
Conflicts:
	pandora_console/godmode/groups/group_list.php


Former-commit-id: 6f928cc0a3ce2d4822affc7444254393d1d47b69
 2019-02-06 15:14:22 +01:00
Tatiana Llorente 9baa3dcfa2 Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos 
Conflicts:
	pandora_console/extensions/agents_modules.php
	pandora_console/extensions/module_groups.php
	pandora_console/general/login_page.php
	pandora_console/godmode/alerts/alert_list.builder.php
	pandora_console/godmode/alerts/alert_list.list.php
	pandora_console/godmode/gis_maps/configure_gis_map.php
	pandora_console/godmode/groups/group_list.php
	pandora_console/godmode/reporting/visual_console_builder.data.php
	pandora_console/godmode/reporting/visual_console_builder.editor.php
	pandora_console/godmode/reporting/visual_console_builder.elements.php
	pandora_console/godmode/setup/setup_visuals.php
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_networkmap.php
	pandora_console/include/functions_pandora_networkmap.php
	pandora_console/include/functions_ui.php
	pandora_console/include/functions_visual_map_editor.php
	pandora_console/include/styles/common.css
	pandora_console/include/styles/countdown.css
	pandora_console/include/styles/datepicker.css
	pandora_console/include/styles/dialog.css
	pandora_console/include/styles/help.css
	pandora_console/include/styles/menu.css
	pandora_console/include/styles/pandora.css
	pandora_console/include/styles/pandora_forms.css
	pandora_console/operation/agentes/estado_monitores.php
	pandora_console/operation/agentes/interface_traffic_graph_win.php
	pandora_console/operation/agentes/realtime_win.php
	pandora_console/operation/agentes/stat_win.php
	pandora_console/operation/events/events.php
	pandora_console/operation/snmpconsole/snmp_view.php
	pandora_console/operation/tree.php
	pandora_console/operation/visual_console/render_view.php


Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
 2019-02-05 09:23:53 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
tatiana.llorente@artica.es 7bc5fb47a0 Don't show image for groups without icon - #3446 
Former-commit-id: 6a67e368a2aef7f2df04a3937a0466064fa6894e
 2019-01-28 17:06:35 +01:00
tatiana.llorente@artica.es f5c96b7e5d New organization of CSS files - #3358 
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
 2019-01-24 11:10:49 +01:00