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 |
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 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 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 |
|
Alejandro Fraguas
|
441fb979e1
|
Merge branch 'ent-3210-Nueva-vista-de-servicios' into 'develop'
Ent 3210 nueva vista de servicios
See merge request artica/pandorafms!2195
Former-commit-id: f29cb46b83ff0fde722f3c5e3eaf26aedf5cf327
|
2019-02-26 16:32:34 +01:00 |
|
fermin831
|
86509caf6b
|
Fixed downtimes disabled and enabled agents
Former-commit-id: a5c2362e4faf6c0ed9ff2047b6d070aa4d7cdac8
|
2019-02-26 14:44:51 +01:00 |
|
alejandro-campos
|
7791639b35
|
fix bad image routes
Former-commit-id: 236701131f5c2f5b11c01b878d8a04b71f76ddd3
|
2019-02-26 13:31:35 +01:00 |
|
fbsanchez
|
9f60d824c5
|
Merge branch 'ent-3430-last-updates' into 'develop'
Updated breadcrum
See merge request artica/pandorafms!2203
Former-commit-id: f4497ff71f61bcb47c106bd2db13648ecc0f32b2
|
2019-02-26 12:40:16 +01:00 |
manuel
|
c886dd1dfa
|
Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch
Conflicts:
pandora_console/include/functions_html.php
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: 5cd5899c222ba13ec9bfa0212e5d2ec580353787
|
2019-02-26 12:31:37 +01:00 |
|
Daniel Maya
|
45419fbfb0
|
Fixed href in plugins with centralized node
Former-commit-id: 03fa2c15b7a9fb14cdc12499c3bc2a204bae3cd5
|
2019-02-26 12:23:46 +01:00 |
|
manuel
|
875d7ecaba
|
Unified sizes of the checkbox switch
Former-commit-id: f6f8eca748f67fdf1e4a98256c3ca590b61328ac
|
2019-02-26 12:04:18 +01:00 |
Tatiana Llorente
|
34eedc5330
|
new header and menu
Former-commit-id: aac70c14548c725b68fa031202e0b8449b725f45
|
2019-02-26 11:20:17 +01:00 |
|
Tatiana Llorente
|
3e87c8e931
|
new header and menu
Former-commit-id: 975b72219cb07e0d4f9b332607e554bd65ea7cc3
|
2019-02-26 10:43:59 +01:00 |
|
fbsanchez
|
c38ac4b837
|
Updated breadcrum
Former-commit-id: 51c14ea50e6c7d419d610ef1b52c4769214495ef
|
2019-02-26 10:34:37 +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 |
|
daniel
|
d4c46ec14f
|
fix minor error
Former-commit-id: 81b5c41c49a5e121c5ac34c12bfd5b1b7f5f943a
|
2019-02-26 08:44:50 +01:00 |
|
artica
|
88202977fa
|
Auto-updated build strings.
Former-commit-id: e3e3a3aba908a64a4743bd8b18337510e0c6e609
|
2019-02-26 00:01:57 +01:00 |
|
Daniel Rodriguez
|
11106f9b86
|
Merge branch 'ent-2835-revision-visor-de-logs' into 'develop'
Added models in tlog_graph_models
See merge request artica/pandorafms!2200
Former-commit-id: 33da3ceca68bc25975dd9f62ed24d7ca0c8a01e4
|
2019-02-25 19:37:49 +01:00 |
|
Daniel Rodriguez
|
d7a8cdb181
|
Merge branch 'ent-2082-Mejoras-en-selector-de-widgets' into 'develop'
Ent 2082 mejoras en selector de widgets
See merge request artica/pandorafms!2201
Former-commit-id: 7a4a7bab989e10e3135f249c61d115dcaa0ea277
|
2019-02-25 19:10:21 +01:00 |
|
Alejandro Campos
|
7f47a4504b
|
Merge branch 'develop' into 'ent-2082-Mejoras-en-selector-de-widgets'
# Conflicts:
# pandora_console/extras/mr/25.sql
Former-commit-id: b0781f5c0d3bce0fdd6a35bba4c77a26f8d112ac
|
2019-02-25 18:47:28 +01:00 |
|
alejandro-campos
|
4bf7469565
|
change mr and migrate for table twidget
Former-commit-id: fb7bfc3771b2c019a7e70771d4e5bd47043ba99b
|
2019-02-25 18:42:52 +01:00 |
|
alejandro-campos
|
13cbc78fdd
|
change mr and migrate for table twidget
Former-commit-id: d7d07f5e036a8dd81debcb974bd42217e2b59b26
|
2019-02-25 18:41:24 +01:00 |
|
Daniel Maya
|
16f1474691
|
Added models in tlog_graph_models
Former-commit-id: 76d6f1358677c02eab4681a1bb290fda0476c91b
|
2019-02-25 17:45:37 +01:00 |
|
alejandro-campos
|
db5d2ceee1
|
fix bad routes in services treeview
Former-commit-id: 27bfcca5a7e0f7c3929e2a1f449c0f1d318891c9
|
2019-02-25 17:04:07 +01:00 |
|
Alejandro Fraguas
|
c603a9ecf3
|
Merge branch 'ent-3430-discovery' into 'develop'
Ent 3430 discovery
See merge request artica/pandorafms!2153
Former-commit-id: 92b4527dd76ecf403990669e08b6c43497b08fe9
|
2019-02-25 16:55:08 +01:00 |