5e496d0d7a
Fixed url target in Supervisor
...
Former-commit-id: 4e69ec7a157d8bceb3cbfc88c52a886a4353dc0e
2019-03-04 14:52:57 +01:00
8fc432b934
Auto-updated build strings.
...
Former-commit-id: 818dfe6138fe1837c87d96d607b15e51e06336cb
2019-03-01 00:01:32 +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
a8a9a9d620
Auto-updated build strings.
...
Former-commit-id: 2c0ee9351e5f306085921bde697a1b10de102b2e
2019-02-28 00:01:32 +01:00
ec5c9d7c27
clippy returns
...
Former-commit-id: b9ed010f5af1002593471a0d0298848b3593e41e
2019-02-27 13:41:26 +01:00
26560c734c
Updated version and build strings.
...
Former-commit-id: 39df6ee0aee9f29c9afb8729f9e95b316ca8cd67
2019-02-27 11:25:50 +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
65b89f6688
Auto-updated build strings.
...
Former-commit-id: 59e3d47f8cc8c9fedb86f0ba6fd7fe183cb908b8
2019-02-27 00:01:47 +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
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
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
7791639b35
fix bad image routes
...
Former-commit-id: 236701131f5c2f5b11c01b878d8a04b71f76ddd3
2019-02-26 13:31:35 +01:00
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
875d7ecaba
Unified sizes of the checkbox switch
...
Former-commit-id: f6f8eca748f67fdf1e4a98256c3ca590b61328ac
2019-02-26 12:04:18 +01:00
d4c46ec14f
fix minor error
...
Former-commit-id: 81b5c41c49a5e121c5ac34c12bfd5b1b7f5f943a
2019-02-26 08:44:50 +01:00
88202977fa
Auto-updated build strings.
...
Former-commit-id: e3e3a3aba908a64a4743bd8b18337510e0c6e609
2019-02-26 00:01:57 +01:00
db5d2ceee1
fix bad routes in services treeview
...
Former-commit-id: 27bfcca5a7e0f7c3929e2a1f449c0f1d318891c9
2019-02-25 17:04:07 +01:00
ac9452583a
Added no data to show to some graphs where id not found
...
Former-commit-id: 1697a482e80521666f679eb18d2f44fc3975e304
2019-02-25 16:50:27 +01:00
b7cc25314d
Unified sizes of the checkbox switch
...
Former-commit-id: 392fdf006c81fb5586349b8a4b4544e0c07aa903
2019-02-25 16:20:05 +01:00
67e53bf7a7
add new way of importing css for treeview
...
Former-commit-id: d88bb38ac7d20ab5f554cfb1399b17ddf6f62fb2
2019-02-25 16:15:17 +01:00
510833eaf1
Merge remote-tracking branch 'origin/develop' into ent-3430-discovery
...
Former-commit-id: 418593106602da6aa270905e478e25b50a8f5ebd
2019-02-25 10:47:46 +01:00
9753faa17a
Auto-updated build strings.
...
Former-commit-id: 01fee147745dfd638487449f20211abd8e83b71e
2019-02-25 00:01:36 +01:00
a49f68e96b
Auto-updated build strings.
...
Former-commit-id: ee007a4042fe893b73e088abd7a7b6cd0bdc45d2
2019-02-24 00:01:50 +01:00
febe2cc3a6
Auto-updated build strings.
...
Former-commit-id: 4f687af81ee7ab9541649e5f395c2e2aaf359609
2019-02-23 00:02:37 +01:00
4289684e00
Cloud Discovery RC1
...
Former-commit-id: 9933be0c76b44592783e686bfa2da9ab63df1022
2019-02-23 00:01:59 +01:00
8b5f50f883
Discovery minor fixes
...
Former-commit-id: 3914d7a99fb70d88c1a1f95d3c2aeb100f277266
2019-02-22 19:18:07 +01:00
4abf19722b
Minor fixes and improvements. Discovery
...
Former-commit-id: d4410ddca6aec18ed28b7b0236ee16a3e8a6d2b8
2019-02-22 18:12:01 +01:00
faae9c58b3
implement services tree view
...
Former-commit-id: a081515f62ab210f96687577bfde60d5f6d23f23
2019-02-22 14:09:27 +01:00
1feebae564
removed fullurl supervisor
...
Former-commit-id: 74cc731977477c444150d49aff9ab062ddac065a
2019-02-22 13:33:46 +01:00
eb56fd566c
implemented services treeview
...
Former-commit-id: d5d71442d0c6122ba91b160647559cdf03f55625
2019-02-22 13:07:47 +01:00
3d2bfa95b5
add table console task in discovery
...
Former-commit-id: b13571167c063188102a8473fb57fa63c18bece3
2019-02-22 12:53:35 +01:00
b1aa0fe2f2
Merge from develop
...
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
1aa60fd15d
Merge branch 'ent-3511-Bug-en-la-edicion-del-widget-de-tipo-Agent/Module-View' into 'develop'
...
Ent 3511 bug en la edicion del widget de tipo agent/module view
See merge request artica/pandorafms!2190
Former-commit-id: bffc145be0e0eee4265dcdf7d8be2447e467bb79
2019-02-22 09:18:11 +01:00
b1149a053b
Auto-updated build strings.
...
Former-commit-id: f642e8fe029c7df7a017abe433d7768acd8577fd
2019-02-22 00:01:38 +01:00
36410a26d1
Merge branch 'ent-3436-custom-fields-como-macros-en-el-server' into 'develop'
...
Add support for column macros.
See merge request artica/pandorafms!2182
Former-commit-id: 93dad8f6c54f6e46e5e54dab347a96cffe2fd240
2019-02-21 14:38:21 +01:00
e32c4025a4
Supervisor. minor fixes
...
Former-commit-id: 036bc6a871db86d7a8925c7d5e2531d9f62ca839
2019-02-21 14:18:33 +01:00
fd77b94f96
Fix regexp Supervisor
...
Former-commit-id: 7dc32dd119ae78a3158e7c5d20bc5f73a8c94d2f
2019-02-21 14:16:17 +01:00
a54903d9c6
Merge branch 'ent-3279-planned-downtime-creation-api-cli' into 'develop'
...
API/CLI: fixed planned downtime creation
See merge request artica/pandorafms!2184
Former-commit-id: 84f21e2c9762af3a1c1c04c24dc6e35848c0f437
2019-02-21 13:32:15 +01:00
d9e0f2ea42
Merge remote-tracking branch 'origin/develop' into 3088-Se_carga_filtro_en_vista_de_eventos_cuando_no_hay_filtro_activo
...
Former-commit-id: f0ab3426fdf23bbceed7c2cd991b37c33ec3ae2e
2019-02-21 13:26:12 +01:00
dc4d5b1bd7
fixed error in widget
...
Former-commit-id: 3b0d2e8641d35f7c339aa4229f0a7108216704e0
2019-02-21 13:21:05 +01:00
4148387c50
Updates discovery
...
Former-commit-id: e99072a2b7a1ddd528698e12bdfe75b0b56ba25b
2019-02-21 13:05:48 +01:00
ad3e2b88bf
Minor fixes Wiz.Discovery
...
Former-commit-id: 750cd3ab1902ed3eda9806aa9b505d5e4a1175be
2019-02-21 11:19:38 +01:00
1156b29743
Auto-updated build strings.
...
Former-commit-id: f760ca3d8b53ad47017d82e6bc2fbb298a69312b
2019-02-21 00:01:55 +01:00
08c6d782a4
Add menuentry discovery
...
Former-commit-id: bc40f0bda89947a88a912484642aa3c89ded64f8
2019-02-20 18:24:32 +01:00
0ed6c6d620
Merge branch 'ent-3430-discovery' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3430-discovery
...
Conflicts:
pandora_console/godmode/wizards/Wizard.main.php
Former-commit-id: 570168ca638ea3403de5768b08c640a909aa27d2
2019-02-20 16:54:52 +01:00
8266c716e8
Merge branch 'ent-3138-ent-Cambiar-alert-por-dialog' into 'develop'
...
Cambiar alert por dialog
See merge request artica/pandorafms!2178
Former-commit-id: b8d1f9f1797ef1d3f54975ca8a695f0a5033938e
2019-02-20 16:37:03 +01:00
300626e551
Merge remote-tracking branch 'origin/develop' into ent-3499-Numero_de_respuestas_de_eventos_masivas
...
Former-commit-id: 4a8482ccef3661c83553dff8f5533c29321f95f2
2019-02-20 15:38:15 +01:00
fbsanchez
artica
manuel
artica
samucarc
Alejandro Fraguas
Daniel Rodriguez
alejandro-campos
daniel
fermin831