fbsanchez
|
d547024274
|
fixes non-enterprise components
Former-commit-id: c22cec27d981c119531a0049469847b9d1a848eb
|
2019-03-01 09:51:16 +01:00 |
|
fbsanchez
|
ed9b736299
|
Merge remote-tracking branch 'origin/ent-3621-Discover-vista-de-tasks-bloqueada-y-duplicada' into ent-3595-discovery-fase-2
Former-commit-id: 9dcad6195eb21f84d90b570828791338ff069ddd
|
2019-03-01 09:50:09 +01:00 |
|
Alejandro Gallardo Escobar
|
42d8e72400
|
Recovered the lost code for the current user macro at the event responses.
(cherry picked from commit d554dcc7db0e8d007c645bc07d9160f3f57a3c4e [formerly 1a5860bc7a62efecba44d467df9eb9cf7e25070b])
Former-commit-id: de201ec04f1dc211c56db3fc0dbf8ae66a549ddf
|
2019-03-01 09:40:36 +01:00 |
|
Alejandro Gallardo Escobar
|
2ab938ded5
|
Visual Console Client: added an analogic clock
Former-commit-id: 642c1a39c14fe5db067d871448b3b9c8c8aa5d34
|
2019-03-01 09:31:54 +01:00 |
|
Alejandro Gallardo Escobar
|
850045f791
|
Visual Console Client: Improved the color cloud resizing
Former-commit-id: 4f6131a8368ea1af973527388ed641f104381fe6
|
2019-03-01 09:27:58 +01:00 |
|
artica
|
8fc432b934
|
Auto-updated build strings.
Former-commit-id: 818dfe6138fe1837c87d96d607b15e51e06336cb
|
2019-03-01 00:01:32 +01:00 |
|
Fermin
|
287ce78260
|
Move tnetwork_matrix to mr 26
Former-commit-id: 731ffaeb7253345bc83afe645f788e6a130080b4
|
2019-02-28 18:18:20 +01:00 |
|
samucarc
|
7e53461b94
|
Added new alert when failed database
Former-commit-id: ee0e8efaf3f32b4c5a86d421873555969274ca43
|
2019-02-28 17:40:11 +01:00 |
|
Fermin
|
511c5e3d10
|
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
pandora_console/extras/mr/25.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/agentes/configurar_agente.php
pandora_console/install.php
pandora_server/util/pandora_db.pl
Former-commit-id: 634d25e1ada208d27ba283506161682a9aa45949
|
2019-02-28 17:13:48 +01:00 |
|
Daniel Maya
|
fb40ef7ce4
|
Changed Maintainer in pandorafms-agent-unix
Former-commit-id: c0bff759d2926ec1459e66205b3918ec3d02d3f4
|
2019-02-28 17:12:31 +01:00 |
|
Daniel Rodriguez
|
927ad30966
|
Merge branch 'ent-3594-Unificacion-de-tamaños-de-checkbox-switch' into 'develop'
Unified sizes of the checkbox switch
See merge request artica/pandorafms!2198
Former-commit-id: 9305bc60fd8b4815f6bbb2ece58dfcdd72e1ad70
|
2019-02-28 13:58:07 +01:00 |
|
manuel
|
46089b31a8
|
Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch
Conflicts:
pandora_console/install.php
Former-commit-id: 3dee86da8f6b6b1c2caa5e6e1529acd7f60c1433
|
2019-02-28 13:36:18 +01:00 |
|
Daniel Maya
|
cefaccb651
|
Fixed synchronize collections in node
Former-commit-id: d48015ff7c41298fa87cbb5cf1f298beac501719
|
2019-02-28 13:02:59 +01:00 |
|
daniel
|
95b5c4ad01
|
add new macro for alert events
Former-commit-id: 08c5bf0168bcd5d9c23a23443187870269d61a40
|
2019-02-28 12:30:01 +01:00 |
|
alejandro-campos
|
52d6dfe815
|
fix discover task view
Former-commit-id: 5475d6be802cd4e7280d12aed6f8f91f7833ed98
|
2019-02-28 12:00:43 +01:00 |
|
artica
|
a8a9a9d620
|
Auto-updated build strings.
Former-commit-id: 2c0ee9351e5f306085921bde697a1b10de102b2e
|
2019-02-28 00:01:32 +01:00 |
|
fermin831
|
4489afe137
|
Added debugger and profiler deps to Dockerfile
Former-commit-id: 805ed1cbef91065fa248d85003e87d3ba134f2ca
|
2019-02-27 17:17:50 +01:00 |
|
fbsanchez
|
715bdbb04d
|
Merge branch 'fix/fraguas' into 'develop'
minor fixes
See merge request artica/pandorafms!2216
Former-commit-id: 856ba09c711fa9199e06518c42a05e4ae942b938
|
2019-02-27 14:04:54 +01:00 |
|
fbsanchez
|
f979af0735
|
minor fixes
Former-commit-id: 51a2308e80a85c5a099410c5883c9b389d3a74ab
|
2019-02-27 13:56:06 +01:00 |
|
fbsanchez
|
f8553b91e8
|
Merge branch 'fix/clippy' into 'develop'
clippy returns
See merge request artica/pandorafms!2215
Former-commit-id: 92fc5c2a79199fbd1b102edb0abad866eae1ab26
|
2019-02-27 13:45:40 +01:00 |
|
fbsanchez
|
ec5c9d7c27
|
clippy returns
Former-commit-id: b9ed010f5af1002593471a0d0298848b3593e41e
|
2019-02-27 13:41:26 +01:00 |
|
daniel
|
a718539919
|
Merge branch 'ent-change_mr_25' into 'develop'
change mr
See merge request artica/pandorafms!2213
Former-commit-id: 2500d4869601e900ec9f7437a9691cae38b76853
|
2019-02-27 11:41:44 +01:00 |
|
daniel
|
e55e47cbfa
|
change mr
Former-commit-id: 4ec37be9caef34e88b3e5ca65bca2c1aee7f03dd
|
2019-02-27 11:35:00 +01:00 |
|
alejandro-campos
|
0a37f6d848
|
add changes to migrate script
Former-commit-id: 7e1beeed2a8ff709cdd2e2ff992b610cd4aa7409
|
2019-02-27 11:32:39 +01:00 |
|
artica
|
26560c734c
|
Updated version and build strings.
Former-commit-id: 39df6ee0aee9f29c9afb8729f9e95b316ca8cd67
|
2019-02-27 11:25:50 +01:00 |
|
daniel
|
8780571a74
|
add new functionality in event response
Former-commit-id: 2cf28b95c068c40e79b8f05b212aad0f720de79b
|
2019-02-27 10:59:44 +01:00 |
|
Alejandro Gallardo Escobar
|
b0052577a4
|
Visual Console Client: added a color property to the digital clock item
Former-commit-id: 1393ecb7abcb612f21ec65848e2426f8433bb00b
|
2019-02-27 10:46:56 +01:00 |
|
samucarc
|
9f92f3f010
|
Fixed
Former-commit-id: 4fc7d9a22dd2a59501cd7ffc7539c431d37512a8
|
2019-02-27 10:35:40 +01:00 |
|
samucarc
|
8f24c0cb18
|
Fixed conflict in CLI apply_policy
Former-commit-id: ab512d9c2b88cd7042d6ae065251cd116b2ea5af
|
2019-02-27 10:28:36 +01:00 |
|
Alejandro Gallardo Escobar
|
cafede1599
|
Visual Console Client: finished the digital clock item
Former-commit-id: 3b14fb14ee0d1233966e3aac67cdca65378a0adf
|
2019-02-27 10:25:45 +01:00 |
|
Alejandro Gallardo Escobar
|
e97ee485ef
|
Visual Console Client: minor fixes
Former-commit-id: 62a0a7f33c65a0d9a2ee3be9cb15613d6664a06f
|
2019-02-27 10:25:19 +01:00 |
|
Alejandro Fraguas
|
75b889ff4a
|
Merge branch 'ent-3430-proyecto-discovery' into 'develop'
Ent 3430 proyecto discovery
See merge request artica/pandorafms!2210
Former-commit-id: 104df0b898d6f4bb9eef21005cca6a3f74c3e035
|
2019-02-27 10:02:14 +01:00 |
|
Daniel Rodriguez
|
e18eaaf415
|
Merge branch 'ent-3287-sincronizacion-plugin-de-servidor' into 'develop'
Ent 3287 sincronizacion plugin de servidor
See merge request artica/pandorafms!2199
Former-commit-id: 2153828c0deb35bd72dd6b39612c947b56782c40
|
2019-02-27 09:58:42 +01:00 |
|
artica
|
65b89f6688
|
Auto-updated build strings.
Former-commit-id: 59e3d47f8cc8c9fedb86f0ba6fd7fe183cb908b8
|
2019-02-27 00:01:47 +01:00 |
|
fbsanchez
|
7ed3252ca5
|
minor fixes
Former-commit-id: 75b33343bed508ff3ff136fa0fedc5d9d8c952be
|
2019-02-26 20:23:52 +01:00 |
|
fbsanchez
|
24a1adfb9f
|
minor fix
Former-commit-id: 6729d11217d0fecb7b64283b6e4d0485b9bdfdc8
|
2019-02-26 20:08:01 +01:00 |
|
fbsanchez
|
a8874f9b1b
|
Minor fixes
Former-commit-id: c3abb9964c61f0535ab59644f6eb1d0a8328212a
|
2019-02-26 20:00:41 +01:00 |
|
Daniel Rodriguez
|
33235b26d3
|
Merge branch '3597-Pequeno_arreglo_config_732' into 'develop'
fix minor error
See merge request artica/pandorafms!2202
Former-commit-id: fded71effc82a3ffde4d3a003f6f090f9e8e4b9f
|
2019-02-26 18:19:58 +01:00 |
|
fbsanchez
|
c1aaacbc07
|
minor updates in plugintools
Former-commit-id: 85d3d6a099d4b08b1d79d996157e1725e3414809
|
2019-02-26 18:16:10 +01:00 |
|
fbsanchez
|
0e7c498e1a
|
Comment updates
Former-commit-id: a711916af981c065d26def1943fc526d936de5d3
|
2019-02-26 17:53:58 +01:00 |
|
fbsanchez
|
5382f07ae2
|
Comment updates in wizard class
Former-commit-id: 9fbb1d0c6499dd1ad71c472970b3993193b581da
|
2019-02-26 17:42:12 +01:00 |
|
fbsanchez
|
5b3ce09515
|
Comment updates in wizard class
Former-commit-id: 0b820729a631d906fe4816ba74f84f700b500c01
|
2019-02-26 17:41:42 +01:00 |
|
fermin831
|
e19e7d3484
|
Modified agents_create_agent to permit create agents with name as alias
Former-commit-id: 9d3524e2dc02beb92d819cd877b9b44f64154fd5
|
2019-02-26 17:30:21 +01:00 |
|
Daniel Maya
|
2c0c050507
|
Disabled cache in server plugin synchronization
Former-commit-id: c8d60db8aece2db8611ee7d8ac44347f661d9b83
|
2019-02-26 17:20:23 +01:00 |
|
Alejandro Gallardo Escobar
|
56f15f0369
|
Visual Console Client: minor fix
Former-commit-id: e6085e0efed2896c5b1ba36166f6e81a0a73f4ad
|
2019-02-26 17:07:22 +01:00 |
|
Alejandro Gallardo Escobar
|
7a45d9f62e
|
Visual Console Client: fixed some lint errors and added the digital clock item
Former-commit-id: 643bc4997ec971e8892b4dcd439a2828dc4e441b
|
2019-02-26 17:05:30 +01:00 |
|
Alejandro Gallardo Escobar
|
527a27940c
|
Visual Console Client: updated the git ignore file
Former-commit-id: 7ab0b4f0eae404f2842df998c350e6ffe10ea09e
|
2019-02-26 17:03:36 +01:00 |
|
Alejandro Gallardo Escobar
|
7ee3107b93
|
Visual Console Client: upgraded dependencies
Former-commit-id: b80072afc5b7c72a34ec84df850d99e0038bd5d9
|
2019-02-26 17:02:27 +01:00 |
|
Alejandro Gallardo Escobar
|
299fb4261e
|
Visual Console Refactor: Added vscode configurations
Former-commit-id: 3712bfc6c10ff3ccadd5cf7274f9c2d39a453ad4
|
2019-02-26 17:01:23 +01:00 |
|
Alejandro Fraguas
|
d177bda2bd
|
Merge branch 'ent-3520-7484-Autenticación-por-ldap-no-contempla-la-posibilidad-de-ldaps' into 'develop'
Parameter changes deprecated in LDAP
See merge request artica/pandorafms!2168
Former-commit-id: 8cccefd16b2fab4134ddd397b45094936155ceea
|
2019-02-26 16:57:25 +01:00 |
|