Alejandro Campos
|
5b9d7bcb81
|
Merge branch 'develop' into 'ent-6631-Bug-en-dashboard-de-usuario-sin-permiso-2'
# Conflicts:
# pandora_console/include/lib/Dashboard/Widgets/agent_module.php
|
2021-01-15 14:52:26 +01:00 |
|
alejandro-campos
|
a0931d7ada
|
changes in dashboard permissions
|
2021-01-15 13:52:31 +01:00 |
|
Daniel Rodriguez
|
ea86889673
|
Merge branch 'ent-6645-bug-acl-discovery-tasks' into 'develop'
Fixed acl on discovery tasklist
See merge request artica/pandorafms!3618
|
2021-01-14 14:43:42 +01:00 |
|
alejandro-campos
|
366d02f203
|
Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3
|
2021-01-14 09:22:06 +01:00 |
|
Jose Gonzalez
|
1fc1752b01
|
Solved merge
|
2021-01-12 13:26:48 +01:00 |
|
Jose Gonzalez
|
d1831e71fb
|
Finished development
|
2021-01-12 13:24:08 +01:00 |
|
fbsanchez
|
73c182f65d
|
Avoid performance tests if there are not enough modules in system
|
2021-01-11 18:32:44 +01:00 |
|
Jose Gonzalez
|
422174b66f
|
WIP: Backup upload
|
2021-01-11 18:00:24 +01:00 |
|
fbsanchez
|
186b807ff7
|
Merge remote-tracking branch 'origin/develop' into ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery
Conflicts:
pandora_console/include/styles/wizard.css
|
2021-01-07 10:50:57 +01:00 |
|
José González
|
02475d25b6
|
Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
# pandora_console/general/header.php
# pandora_console/general/sap_view.php
|
2020-12-23 06:48:22 +01:00 |
|
Daniel Rodriguez
|
ad1ede437c
|
Merge branch 'ent-5983-Bugs-y-cambios-en-el-nuevo-tree-view' into 'develop'
changes in treeview
See merge request artica/pandorafms!3654
|
2020-12-22 13:02:17 +01:00 |
|
Jose Gonzalez
|
ba527391b4
|
WIP: Backup upload
|
2020-12-18 13:18:03 +01:00 |
|
Jose Gonzalez
|
5f0d686034
|
Changed Network Tools for External Tools
|
2020-12-18 12:31:44 +01:00 |
|
Jose Gonzalez
|
daa6e47768
|
Changes ended
|
2020-12-17 19:33:10 +01:00 |
|
Daniel Rodriguez
|
2591d8874a
|
Merge branch 'ent-6804-buscador-pandora-permite-acceder-politicas-open' into 'develop'
Ent 6804 buscador pandora permite acceder politicas open
Closes pandora_enterprise#6804
See merge request artica/pandorafms!3688
|
2020-12-17 17:05:26 +01:00 |
|
Daniel Rodriguez
|
7ae5b65740
|
Merge branch 'ent-6282-module-templates-sin-datos' into 'develop'
Fixed issue
Closes pandora_enterprise#6282
See merge request artica/pandorafms!3624
|
2020-12-17 16:56:17 +01:00 |
|
Marcos Alconada
|
f9b2417d89
|
error con modulos duplicados en module templates
|
2020-12-17 16:55:30 +01:00 |
|
Jose Gonzalez
|
7d5f4f8f65
|
WIP: Backup upload
|
2020-12-17 16:51:05 +01:00 |
|
Jose Gonzalez
|
959fbd4764
|
WIP: Backup upload
|
2020-12-17 13:04:21 +01:00 |
|
Jose Gonzalez
|
6da8f33e20
|
WIP
|
2020-12-16 14:26:32 +01:00 |
|
Jose Gonzalez
|
010dc65dd4
|
WIP: Backup upload
|
2020-12-16 14:09:54 +01:00 |
|
Jose Gonzalez
|
430457b30a
|
Deleted logstash references
|
2020-12-15 13:12:00 +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
|
46d40b72c2
|
Fixed snmp interfaces
|
2020-12-11 14:42:37 +01:00 |
|
Daniel Rodriguez
|
4b51e26086
|
Merge branch 'ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery' into 'develop'
discovery.cloud.gcp
See merge request artica/pandorafms!3479
|
2020-12-09 13:54:25 +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
|
4760e0b20c
|
Fix
|
2020-12-02 15:49:13 +01:00 |
|
Luis Calvo
|
a90aeb14ff
|
Fixed services ACL on services treeview
|
2020-12-02 11:45:54 +01:00 |
|
Marcos Alconada
|
f72d924f1e
|
ticket 6435
|
2020-12-02 10:10:34 +01:00 |
|
fbsanchez
|
eb67b387b9
|
Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery
Conflicts:
pandora_console/include/class/CredentialStore.class.php
|
2020-12-01 17:32:02 +01:00 |
|
Luis
|
aeb7a7e9c6
|
Add decimal separator to all pandora csv
|
2020-12-01 11:56:15 +01:00 |
|
Daniel Rodriguez
|
f869fbb7cd
|
Merge branch 'ent-6406-No-se-ven-los-datos-string-en-el-tree' into 'develop'
fixed bad module id reference
See merge request artica/pandorafms!3505
|
2020-12-01 11:55:56 +01:00 |
|
Jose Gonzalez
|
250a378773
|
Fixed for show better results
|
2020-12-01 11:52:12 +01:00 |
|
fbsanchez
|
54d5529599
|
removed duplicated methods (unified in HTML class) added minor improvements
|
2020-11-30 17:50:36 +01:00 |
|
Jose Gonzalez
|
efff64c4bf
|
Added control for avoid null values in dynamic components
|
2020-11-30 12:29:25 +01:00 |
|
Jose Gonzalez
|
649442f794
|
Updated copyrights
|
2020-11-27 13:52:35 +01:00 |
|
fbsanchez
|
79b3f2d762
|
Merge remote-tracking branch 'origin/develop' into ent-6445-excesivo-tiempo-de-carga-web-cuando-un-servidor-esta-caido
|
2020-11-26 11:28:39 +01:00 |
|
fbsanchez
|
1121440943
|
Clean only recovered servers
|
2020-11-26 11:28:31 +01:00 |
|
alejandro-campos
|
448cc253b4
|
changes in treeview
|
2020-11-25 17:00:37 +01:00 |
|
Daniel Rodriguez
|
8471f170fb
|
Merge branch 'ent-6542-agents-alerts-view-fallos-visuales' into 'develop'
Fix
See merge request artica/pandorafms!3652
|
2020-11-25 14:40:38 +01:00 |
|
Jose Gonzalez
|
7187c54730
|
Fix
|
2020-11-25 14:33:52 +01:00 |
|
Jose Gonzalez
|
da3bb9b808
|
Fix
|
2020-11-25 14:29:11 +01:00 |
|
Jose Gonzalez
|
5f9db9a896
|
Fix
|
2020-11-25 14:27:42 +01:00 |
|
Daniel Rodriguez
|
b1fd90ae58
|
Merge branch 'ent-6542-agents-alerts-view-fallos-visuales' into 'develop'
Ent 6542 agents alerts view fallos visuales
Closes pandora_enterprise#6542
See merge request artica/pandorafms!3594
|
2020-11-25 13:35:17 +01:00 |
|
fbsanchez
|
d18fffb0cb
|
Merge remote-tracking branch 'origin/develop' into ent-6445-excesivo-tiempo-de-carga-web-cuando-un-servidor-esta-caido
Conflicts:
pandora_console/include/class/ConsoleSupervisor.php
|
2020-11-25 12:07:53 +01:00 |
|
Jose Gonzalez
|
60ca2109f3
|
Solved issue with full screen
|
2020-11-25 11:59:03 +01:00 |
|
Jose Gonzalez
|
912b2179bd
|
Fix visual issues
|
2020-11-25 11:36:14 +01:00 |
|
Jose Gonzalez
|
0cc1da21b0
|
Fix errors
|
2020-11-24 15:53:25 +01:00 |
|
Jose Gonzalez
|
ed1b8f9713
|
Fix some bugs and added surround input feature
|
2020-11-24 15:51:02 +01:00 |
|
alejandro-campos
|
f5648d734d
|
fixed snapshot in meta
|
2020-11-23 17:09:58 +01:00 |
|