2ceba76d22
Fixed ldap conf tooltips
...
Former-commit-id: 957a6c1d90ce99630fa2327c829f178561192a50
2019-03-05 09:09:24 +01:00
930c527ad2
Auto-updated build strings.
...
Former-commit-id: 2bf7188690fce3ac4ff2b8d124b552f6a6f7d608
2019-03-05 00:01:26 +01:00
9d7c6854a8
fixed error in snmp browser change server
...
Former-commit-id: 0545012dd8526bdf4cc836af2d263af7b5ca5328
2019-03-04 15:33:36 +01:00
1cfabda53e
Merge branch 'ent-3224-7026-anadir-token-agent-name-as-alias-a-importacion-de-agentes-por-csv' into 'develop'
...
Modified agents_create_agent to permit create agents with name as alias
See merge request artica/pandorafms!2209
Former-commit-id: ef47fc540cedd0c06b58805a3fb162d5807ecc32
2019-03-04 13:22:56 +01:00
488be0d602
Changed radio buttons by checkbox switch
...
Former-commit-id: f0c64cecbf9e1197be08a9a95248d3b4ea8bd949
2019-03-04 13:12:01 +01:00
12a287f322
Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into ent-3432-Nueva-cabecera-y-menu-lateral
...
Conflicts:
pandora_console/godmode/setup/setup_visuals.php
pandora_console/install.php
Former-commit-id: 1c1a318ae74ab3a363a88d99cc079eea6e213171
2019-03-04 09:52:05 +01:00
36fa0fc41f
new header and menu
...
Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018
2019-03-04 08:39:56 +01:00
3ed6a2b089
Auto-updated build strings.
...
Former-commit-id: d8e95284d6eded43b5d1af26b172a034a06d3bed
2019-03-04 00:01:22 +01:00
62c7e8dffc
Auto-updated build strings.
...
Former-commit-id: dd2dc5dcc124d58611076b2e38dd65a596c23f3b
2019-03-03 00:01:24 +01:00
b194d439d2
Auto-updated build strings.
...
Former-commit-id: 8081bea8a9b82eca462bc1ae7b600162a08faea6
2019-03-02 00:01:29 +01:00
d4b79179d9
Fixed width unit on graph, setted to px instead of %
...
Former-commit-id: 2517a1bfad9c609709f30025c2d6927c0011ade1
2019-03-01 14:58:41 +01:00
c5a5df01f6
add tip SLA Services
...
Former-commit-id: da452d98c0b3b43d36c4c53de70df762f6530c8d
2019-03-01 14:26:25 +01:00
fadf75a626
fixed minor error lenght str.warning and str.critical 1024 charts
...
Former-commit-id: c7c32a48731eff5c786bd0710652a31a64364861
2019-03-01 13:36:38 +01:00
02ff69ea0b
fixed errors SLA With planned downtime
...
Former-commit-id: 7350d33d917f967ea624e4763ed816af97c0743a
2019-03-01 12:34:34 +01:00
a5c3136321
Merge branch 'ent-3621-Discover-vista-de-tasks-bloqueada-y-duplicada' into 'develop'
...
fix discover task view
See merge request artica/pandorafms!2223
Former-commit-id: f8c236623756ef6e76d54cf4ab905f706df1ea84
2019-03-01 12:16:08 +01:00
b4170ca285
minor fixes, removed tuser_task_scheduled from tasklist, also cde over ipam references
...
Former-commit-id: 46be3614b9aeb9837748149a805427d68a07f566
2019-03-01 11:08:49 +01:00
1d48e337fc
Merge branch 'ent-3497-event-responses-current-user-macro' into 'develop'
...
Recovered the lost code for the current user macro at the event responses.
See merge request artica/pandorafms!2231
Former-commit-id: 21bb62cba0d22beba25b6105e2a44651937cb003
2019-03-01 10:38:14 +01:00
42d8e72400
Recovered the lost code for the current user macro at the event responses.
...
(cherry picked from commit d554dcc7db
2019-03-01 09:40:36 +01:00
8fc432b934
Auto-updated build strings.
...
Former-commit-id: 818dfe6138fe1837c87d96d607b15e51e06336cb
2019-03-01 00:01:32 +01:00
7e53461b94
Added new alert when failed database
...
Former-commit-id: ee0e8efaf3f32b4c5a86d421873555969274ca43
2019-02-28 17:40:11 +01:00
fb40ef7ce4
Changed Maintainer in pandorafms-agent-unix
...
Former-commit-id: c0bff759d2926ec1459e66205b3918ec3d02d3f4
2019-02-28 17:12:31 +01:00
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
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
cefaccb651
Fixed synchronize collections in node
...
Former-commit-id: d48015ff7c41298fa87cbb5cf1f298beac501719
2019-02-28 13:02:59 +01:00
52d6dfe815
fix discover task view
...
Former-commit-id: 5475d6be802cd4e7280d12aed6f8f91f7833ed98
2019-02-28 12:00:43 +01:00
a8a9a9d620
Auto-updated build strings.
...
Former-commit-id: 2c0ee9351e5f306085921bde697a1b10de102b2e
2019-02-28 00:01:32 +01:00
4489afe137
Added debugger and profiler deps to Dockerfile
...
Former-commit-id: 805ed1cbef91065fa248d85003e87d3ba134f2ca
2019-02-27 17:17:50 +01:00
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
f979af0735
minor fixes
...
Former-commit-id: 51a2308e80a85c5a099410c5883c9b389d3a74ab
2019-02-27 13:56:06 +01:00
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
ec5c9d7c27
clippy returns
...
Former-commit-id: b9ed010f5af1002593471a0d0298848b3593e41e
2019-02-27 13:41:26 +01:00
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
e55e47cbfa
change mr
...
Former-commit-id: 4ec37be9caef34e88b3e5ca65bca2c1aee7f03dd
2019-02-27 11:35:00 +01:00
0a37f6d848
add changes to migrate script
...
Former-commit-id: 7e1beeed2a8ff709cdd2e2ff992b610cd4aa7409
2019-02-27 11:32:39 +01:00
26560c734c
Updated version and build strings.
...
Former-commit-id: 39df6ee0aee9f29c9afb8729f9e95b316ca8cd67
2019-02-27 11:25:50 +01:00
8780571a74
add new functionality in event response
...
Former-commit-id: 2cf28b95c068c40e79b8f05b212aad0f720de79b
2019-02-27 10:59:44 +01:00
9f92f3f010
Fixed
...
Former-commit-id: 4fc7d9a22dd2a59501cd7ffc7539c431d37512a8
2019-02-27 10:35:40 +01:00
8f24c0cb18
Fixed conflict in CLI apply_policy
...
Former-commit-id: ab512d9c2b88cd7042d6ae065251cd116b2ea5af
2019-02-27 10:28:36 +01:00
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
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
65b89f6688
Auto-updated build strings.
...
Former-commit-id: 59e3d47f8cc8c9fedb86f0ba6fd7fe183cb908b8
2019-02-27 00:01:47 +01:00
7ed3252ca5
minor fixes
...
Former-commit-id: 75b33343bed508ff3ff136fa0fedc5d9d8c952be
2019-02-26 20:23:52 +01:00
24a1adfb9f
minor fix
...
Former-commit-id: 6729d11217d0fecb7b64283b6e4d0485b9bdfdc8
2019-02-26 20:08:01 +01:00
a8874f9b1b
Minor fixes
...
Former-commit-id: c3abb9964c61f0535ab59644f6eb1d0a8328212a
2019-02-26 20:00:41 +01:00
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
0e7c498e1a
Comment updates
...
Former-commit-id: a711916af981c065d26def1943fc526d936de5d3
2019-02-26 17:53:58 +01:00
5382f07ae2
Comment updates in wizard class
...
Former-commit-id: 9fbb1d0c6499dd1ad71c472970b3993193b581da
2019-02-26 17:42:12 +01:00
5b3ce09515
Comment updates in wizard class
...
Former-commit-id: 0b820729a631d906fe4816ba74f84f700b500c01
2019-02-26 17:41:42 +01:00
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
2c0c050507
Disabled cache in server plugin synchronization
...
Former-commit-id: c8d60db8aece2db8611ee7d8ac44347f661d9b83
2019-02-26 17:20:23 +01:00
Luis Calvo
artica
daniel
Daniel Rodriguez
manuel
Tatiana Llorente
Alejandro Fraguas
fbsanchez
Alejandro Gallardo Escobar
samucarc
Daniel Maya
alejandro-campos
fermin831
artica