8f25aa09fc
Auto-updated build strings.
2019-06-14 00:01:08 +02:00
23d09a3c46
wip massive event operations
2019-06-13 20:09:55 +02:00
b08e8b595d
multiple fixes
2019-06-13 19:41:21 +02:00
3c1336d298
Fixed problem to edit custom graphs on search
2019-06-13 18:27:51 +02:00
33bdb26e80
Fixed bug data in history show
2019-06-13 17:36:00 +02:00
ca89029c99
x
2019-06-13 17:29:07 +02:00
2fe0d22d7d
x
2019-06-13 17:27:49 +02:00
f1700fa927
Changed Ignore time to Scheduled shutdown fms
2019-06-13 17:21:33 +02:00
0df48675f3
event deletion
2019-06-13 16:28:26 +02:00
19b68ab784
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
2019-06-13 15:18:17 +02:00
018c942ecb
Added meta option in function ui_print_os_icon - #3999
2019-06-13 15:04:39 +02:00
e9b4dea6c5
update
2019-06-13 14:51:27 +02:00
029d3b073f
Avoid double validation, avoid redraw
2019-06-13 13:52:38 +02:00
0afb53dc17
fix in time comparison while validating events
2019-06-13 13:35:02 +02:00
beea6941e5
Merge branch 'ent-4200-visual-console-omnipresent-group-summary' into 'develop'
...
Fixed the omnipresent group summary bug
See merge request artica/pandorafms!2496
2019-06-13 13:25:50 +02:00
52b1c5e39b
fix bug: path of ssl certificate not being set on general settings
2019-06-13 13:18:17 +02:00
9740275388
dyn redraw
2019-06-13 13:07:11 +02:00
d12773cfd0
Avoid double validation, avoid redraw
2019-06-13 12:36:31 +02:00
ecc2fef8f6
event validation/in process
2019-06-13 12:30:09 +02:00
8554baef20
fix bug in item edition in metaconsole
2019-06-13 11:11:39 +02:00
fef1441d9f
Merge branch 'ent-4197-#8171-Permisos-en-consolas-visuales-con-ACLS' into 'develop'
...
Fixed bug in visual consoles permissions with ACLS
See merge request artica/pandorafms!2492
2019-06-13 10:46:39 +02:00
f1787c7920
Removed empty help in unknown modules - #4208
2019-06-13 10:11:03 +02:00
91ccee06ab
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
2019-06-13 10:06:56 +02:00
60ee0dd0fd
Auto-updated build strings.
2019-06-13 00:01:07 +02:00
f3a0f37a1c
Events agent grouped
2019-06-12 18:19:39 +02:00
af62bb1ae3
Fixed visual bug in discovery vmware - #4199
2019-06-12 16:47:53 +02:00
7d54a37e13
Fixed visual bug in discovery vmware - #4199
2019-06-12 16:44:09 +02:00
d0e7a03926
Merge branch 'ent-3809-error-sql-eventos-de-grupos-de-agentes' into 'develop'
...
Changed sql error
See merge request artica/pandorafms!2321
2019-06-12 16:00:58 +02:00
1780341524
Merge branch 'ent-4183-Ayudas-vacias' into 'develop'
...
Removed empty helps - #4183
See merge request artica/pandorafms!2491
2019-06-12 14:34:40 +02:00
f399023d46
Merge branch 'ent-3644-bug-redireccion-de-static-graph' into 'develop'
...
Solucionado pantalla en blanco
See merge request artica/pandorafms!2269
2019-06-12 14:25:58 +02:00
b930588f84
Merge branch 'ent-3892-bug-en-bulk-operations-de-plugins' into 'develop'
...
Ent 3892 bug en bulk operations de plugins
See merge request artica/pandorafms!2389
2019-06-12 13:54:09 +02:00
4bb300889d
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-12 13:17:36 +02:00
b615b50920
wip event grouped
2019-06-12 13:17:18 +02:00
1305e267de
Merge branch 'ent-3437-Guardar-user-password-modulos-WMI' into 'develop'
...
Remove autocomplete user and password in the form to create wmi modules - #3437
See merge request artica/pandorafms!2485
2019-06-12 13:03:56 +02:00
ab602d2f1d
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
2019-06-12 12:59:00 +02:00
c1d1c23a4f
Merge remote-tracking branch 'origin/develop' into ent-3644-bug-redireccion-de-static-graph
2019-06-12 12:37:52 +02:00
608f079ca0
now you need put an agent or visual console, else you cant create or update a Static Grap
2019-06-12 12:36:56 +02:00
166adc21e4
now you need put an agent or visual console, else you cant create or update a Static Grap
2019-06-12 12:32:13 +02:00
e332c4ffba
Merge remote-tracking branch 'origin/ent-3997-anadir-posicionamiento-a-los-elementos-de-la-consola-visual' into ent-3994-Añadir-actualización-de-ciertos-valores-a-la-api-web-de-la-consola-visual
2019-06-12 12:23:41 +02:00
ee7fb4db5f
Merge branch 'develop' into ent-3997-anadir-posicionamiento-a-los-elementos-de-la-consola-visual
2019-06-12 12:13:48 +02:00
4b224d1314
ad coments and delete is_metaconsole() condition
2019-06-12 10:13:37 +02:00
8793e2debd
Fixed the omnipresent group summary bug
2019-06-12 09:16:47 +02:00
d3da3747dd
Fixed the visualization of the combined graph item from the new visual console
2019-06-12 08:48:51 +02:00
51d5e1d951
Auto-updated build strings.
2019-06-12 00:01:07 +02:00
fdce139f84
Merge branch 'ent-4186-Error-en-add-map-connection-al-crear-mapas-gis' into 'develop'
...
fix bug when adding connection maps in gis map builder
See merge request artica/pandorafms!2490
2019-06-11 18:01:54 +02:00
e4139874dd
Removed option to show qr code in header - #4196
2019-06-11 18:00:41 +02:00
7307d34c75
Minor fix
2019-06-11 17:39:46 +02:00
31905f005a
Visual changes in Agent/Module View - #3739
2019-06-11 17:34:13 +02:00
5735326430
Added an async task to persist the visual console item movement to the database
2019-06-11 17:27:22 +02:00
4cf0fda28c
Merge branch 'ent-3300-Error-borrado-masivo-de-informes' into 'develop'
...
Fix bug in report massive deletion
See merge request artica/pandorafms!2493
2019-06-11 17:17:14 +02:00
cb6d71b930
Merge branch 'ent-3474-Exportar-a-csv-custom-field-view' into 'develop'
...
Ent 3474 exportar a csv custom field view
See merge request artica/pandorafms!2483
2019-06-11 17:06:14 +02:00
9d15ece41a
Added an event handler for move events of the visual console items
2019-06-11 16:44:19 +02:00
23469796f8
Limited result for user groups
2019-06-11 16:23:42 +02:00
cc9a7553bc
Merge branch 'develop' into 'ent-3300-Error-borrado-masivo-de-informes'
...
# Conflicts:
# pandora_console/godmode/reporting/reporting_builder.php
2019-06-11 16:18:29 +02:00
4815d73149
Update
2019-06-11 15:26:10 +02:00
48e6fef0b7
Event filters
2019-06-11 12:58:18 +02:00
40119f6d2e
Fixed bug in visual consoles permissions with ACLS
2019-06-11 12:55:43 +02:00
1436ec0782
Merge branch 'ent-4088-Falta-campo-estado-en-modulos-plugin-erroneos' into 'develop'
...
Added image for unknown and no data status - 4088
See merge request artica/pandorafms!2484
2019-06-11 12:07:45 +02:00
738958386a
guardo cambios
2019-06-11 10:01:51 +02:00
80ed5dc9c1
Removed empty helps - #4183
2019-06-11 09:33:43 +02:00
4a2688d6ac
Auto-updated build strings.
2019-06-11 00:01:06 +02:00
9d71c10308
Merge branch 'ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info' into 'develop'
...
Redolved ticket
See merge request artica/pandorafms!2273
2019-06-10 18:47:23 +02:00
cd1f8d0c10
Merge branch 'ent-3760-Error-de-login-LDAP' into 'develop'
...
Fixed function ldapsearch
See merge request artica/pandorafms!2301
2019-06-10 18:08:18 +02:00
577ddef8b3
fix bug when adding connection maps in gis map builder
2019-06-10 17:04:36 +02:00
a40e420de0
Removed , from numer format
2019-06-10 16:59:05 +02:00
81ac4e5bef
Merge branch 'ent-3466-ad-advanced-perms-fixed' into 'develop'
...
Ent 3466 ad advanced perms fixed
See merge request artica/pandorafms!2194
2019-06-10 16:05:21 +02:00
ef3d299d58
wip event view
2019-06-10 15:18:35 +02:00
58ba42cec1
Changed code for conversión
2019-06-10 14:53:47 +02:00
78e01d9c7d
Added encode
2019-06-10 13:04:52 +02:00
cf84c3f579
Merge remote-tracking branch 'origin/develop' into ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info
2019-06-10 12:43:08 +02:00
8092528742
Fixed reports export to csv meta bugs
2019-06-10 12:27:43 +02:00
d14ad39785
Merge branch 'ent-3915-7828-servicio-hijo-de-otro-no-borra-todos-los-modulos-del-agente-al-elminarlo' into 'develop'
...
Node deleted disapear in tree view
See merge request artica/pandorafms!2486
2019-06-10 10:51:26 +02:00
7bf087dd25
Auto-updated build strings.
2019-06-10 00:01:06 +02:00
ab4039fe5b
Auto-updated build strings.
2019-06-09 00:01:06 +02:00
0ee04ecb21
Auto-updated build strings.
2019-06-08 00:01:07 +02:00
bb552226a6
minor fix
2019-06-07 22:58:49 +02:00
f67bf8c2b7
wip event list filters
2019-06-07 22:44:02 +02:00
d4d4509266
wip event view
2019-06-07 21:22:07 +02:00
419a90d69c
wip event list
2019-06-07 17:35:13 +02:00
833248991b
Add mr 29
2019-06-07 11:24:00 +02:00
1e843777bc
Delete line with log4x
2019-06-07 10:57:15 +02:00
f89aefa7ab
Merge branch 'revert-928f6a79' into 'develop'
...
Revert "Merge branch 'ent-3626-referencias-log4x' into 'develop'"
See merge request artica/pandorafms!2487
2019-06-07 10:24:27 +02:00
d49d303469
Update pandoradb_data.sql
2019-06-07 10:20:29 +02:00
be82afc9c5
Update pandoradb_data.sql
2019-06-07 09:50:49 +02:00
021ae9b1cd
Merge branch 'ent-3561-error-herramienta-db-schema-check' into 'develop'
...
Ticket Resolved
See merge request artica/pandorafms!2227
2019-06-07 09:48:51 +02:00
241eda5c39
Revert "Merge branch 'ent-3626-referencias-log4x' into 'develop'"
...
This reverts merge request !2282
2019-06-07 09:35:13 +02:00
a13dab3f35
resolving merge conflict
2019-06-07 09:22:07 +02:00
2f0aa6c6a1
Auto-updated build strings.
2019-06-07 00:01:07 +02:00
73466b9096
Node deleted disapear in tree view
2019-06-06 18:47:10 +02:00
23e6711f09
WIP Events
2019-06-06 17:50:47 +02:00
4f9f9e65c2
Remove autocomplete user and password in the form to create wmi modules - #3437
2019-06-06 16:51:11 +02:00
ac679797a3
Merge remote-tracking branch 'origin/develop' into ent-4073-eventos-en-proceso-no-validan-ni-id-evento-ni-id-extra
2019-06-06 14:53:14 +02:00
701c11a457
Added event in process status validation when same extra id
2019-06-06 14:52:39 +02:00
a4ea5e7c77
Added image for unknown and no data status - 4088
2019-06-06 14:16:09 +02:00
527a9f4a35
Merge branch 'ent-3614-Vista-de-Servicios' into 'develop'
...
New styles for Services table view - #3614
See merge request artica/pandorafms!2468
2019-06-06 12:58:06 +02:00
2d84081ca7
Add styles for metaconsole - #3614
2019-06-06 12:09:35 +02:00
334e66aaf1
Export csv from custom field view meta - #3474
2019-06-06 10:39:09 +02:00
83743da2f5
Merge remote-tracking branch 'origin/develop' into ent-3429-event-report-options-saving
2019-06-06 10:34:07 +02:00
c6d1bb6533
Fixed fields not saving in event reports
2019-06-06 10:33:46 +02:00
034a910000
Auto-updated build strings.
2019-06-06 00:01:07 +02:00
7883fc5f96
Merge branch 'ent-4121-meta-user-edition-bug' into 'develop'
...
Fixed bug in meta user_edir form url
See merge request artica/pandorafms!2472
2019-06-05 12:00:31 +02:00
9791b174b2
Merge branch 'ent-4030-bug-en-busqueda-de-inventario' into 'develop'
...
Ent 4030 bug en busqueda de inventario
See merge request artica/pandorafms!2431
2019-06-05 10:23:43 +02:00
1ee347684e
Added condition if enterprise installed
2019-06-05 10:17:28 +02:00
3475684cdc
Merge remote-tracking branch 'origin/develop' into ent-3429-event-report-options-saving
2019-06-05 09:36:57 +02:00
1e74502866
Bugfix
2019-06-05 09:08:23 +02:00
cc43e40694
Merge branch 'develop' into ent-3739-Vista-Agent-Module-view-no-funciona-en-pantalla-completa-y-autorefresco
...
Conflicts:
pandora_console/extensions/agents_modules.php
2019-06-05 08:47:16 +02:00
95574adf80
Auto-updated build strings.
2019-06-05 00:01:08 +02:00
5b2eb8891b
tab moved
2019-06-04 22:43:26 +02:00
6ed2a0636e
styles review
2019-06-04 22:34:17 +02:00
b14cdfb4c2
minor fix in tactical
2019-06-04 22:22:33 +02:00
a1be1e7332
styles review
2019-06-04 22:16:58 +02:00
537a73be04
Merge branch 'ent-4131-error-migrate-6-a-7' into 'develop'
...
Added missing create table to migrate 6 to 7
See merge request artica/pandorafms!2477
2019-06-04 18:26:12 +02:00
0c21a2956c
Bugfix
2019-06-04 17:34:40 +02:00
1a8b09229c
Export csv from custom field view meta - #3474
2019-06-04 17:28:55 +02:00
795542b311
Added a mode to enable the edit mode of the visual console client items
2019-06-04 17:21:54 +02:00
9bc83b4ffd
Add new else
2019-06-04 17:08:08 +02:00
29529f18cd
API events in process state validation
2019-06-04 17:06:47 +02:00
22efc4ba44
Resolved problem with counts on search main
2019-06-04 17:05:17 +02:00
5d961c1485
Merge branch 'ent-3187-snmp-browser-no-muestra-datos-v3' into 'develop'
...
Unified SNMP version 3 code.
See merge request artica/pandorafms!2471
2019-06-04 16:40:41 +02:00
a1591f7a84
Merge branch 'ent-3362-7334-Bug-time-comparison-graficas-de-modulos' into 'develop'
...
Fixed bug in time comparison graphs
See merge request artica/pandorafms!2476
2019-06-04 16:29:52 +02:00
51f57e9247
Fix a typo.
2019-06-04 15:54:32 +02:00
e1eac631c1
tactical icon sizes
2019-06-04 15:42:27 +02:00
2f5265fcbb
color updates
2019-06-04 14:08:07 +02:00
c741020538
styles review
2019-06-04 13:57:55 +02:00
b2b3d748c1
Merge branch 'ent-3901-Macro-event-id-no-funciona-en-meta-si-el-evento-tiene-server-id-0' into 'develop'
...
allow fetching of event id in metaconsole event table when getting target of an…
See merge request artica/pandorafms!2437
2019-06-04 12:45:26 +02:00
c5cb76b271
Add policies to general search
2019-06-04 11:52:56 +02:00
4b6c21bb30
Add policies to general search and deleted help functions
2019-06-04 11:44:11 +02:00
23e631f7d8
Added missing create table to migrate 6 to 7
2019-06-04 08:52:25 +02:00
c584367c14
Auto-updated build strings.
2019-06-04 00:01:06 +02:00
cb1fb19b95
style review
2019-06-03 19:19:18 +02:00
974db824a8
style review
2019-06-03 19:13:29 +02:00
efd7abfc66
Merge branch 'ent-3581-proyectos-bug-deshabilitar-agente-software' into 'develop'
...
ticket resolved
See merge request artica/pandorafms!2207
2019-06-03 18:16:32 +02:00
5ba2ba1ef3
Fixed bug in time comparison graphs
2019-06-03 15:37:05 +02:00
d0e99e1018
Merge branch 'ent-3576-ldap-advanced-remote-user-unchecked' into 'develop'
...
Fixed ldap adv. perms continues apliying when autocreate remote is unselected
See merge request artica/pandorafms!2221
2019-06-03 15:09:15 +02:00
909fa354b4
Merge branch '4091-bug-en-permisos-al-crear-usuario-con-ldap-advanced' into 'develop'
...
Changed for create new user with advanced config enabled and forced automaticly disabled
See merge request artica/pandorafms!2459
2019-06-03 14:51:06 +02:00
31257c02a4
style review
2019-06-03 14:50:22 +02:00
7a09a80ace
style review
2019-06-03 14:30:23 +02:00
551a21ed86
Next contact fixes
2019-06-03 13:11:00 +02:00
13086b596c
Next contact
2019-06-03 13:04:49 +02:00
45c58a7c72
Merge branch 'ent-4041-7980-bug-parametro-event_storm_protection' into 'develop'
...
Variability event_storm_protection check is added with empty data
See merge request artica/pandorafms!2428
2019-06-03 11:58:52 +02:00
b4dcf4a6f1
style review
2019-06-03 11:55:56 +02:00
ddf3b7a258
Review 1
2019-06-03 11:21:44 +02:00
9de5dadbf2
style review
2019-06-03 11:16:51 +02:00
419b3f4fb1
Fixed module_manager with Agent limit surpassed or license expired
2019-06-03 10:47:54 +02:00
88b0802472
style review
2019-06-03 10:46:52 +02:00
eb5ee75d33
Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor
2019-06-03 09:18:49 +02:00
a11b674467
Auto-updated build strings.
2019-06-03 00:01:06 +02:00
cfc8d7d177
Auto-updated build strings.
2019-06-02 00:01:05 +02:00
f06d160141
Auto-updated build strings.
2019-06-01 00:01:06 +02:00
1aa6d8c298
Change module type ifOperStatus on Interface Wizard
2019-05-31 10:39:48 +02:00
4c85066ecd
Merge branch 'ent-3670-0-rebelde-en-autoconfigurador-de-agentes' into 'develop'
...
Resolved
See merge request artica/pandorafms!2245
2019-05-31 10:08:02 +02:00
69054571ab
Style review
2019-05-31 09:50:59 +02:00
2f734f2454
Auto-updated build strings.
2019-05-31 00:01:07 +02:00
40cca5e1e3
BIG style change, erased all important flags
2019-05-30 18:21:13 +02:00
cdbd5b3487
Fixed bug in meta user_edir form url
2019-05-30 17:23:32 +02:00
e72a55b4f3
Unified SNMP version 3 code.
2019-05-30 16:58:36 +02:00
2c36631130
Merge branch 'ent-3518-password-recovery-email-bad-message' into 'develop'
...
Fixed the error message of the password recovery
See merge request artica/pandorafms!2172
2019-05-30 15:35:18 +02:00
16d34bf584
Merge branch 'ent-3643-mensaje-duplicado-con-info-de-la-db_history-en-performance' into 'develop'
...
ticket resolved, duplicated sentece
See merge request artica/pandorafms!2239
2019-05-30 15:33:27 +02:00
6b4f1466f7
Merge branch 'ent-3825-local-components-salen-con-intervalos-inversos' into 'develop'
...
Changed check value on JS
See merge request artica/pandorafms!2340
2019-05-30 15:32:16 +02:00
e37d120115
Review 1
2019-05-30 13:58:57 +02:00
94153b823f
Help links
2019-05-30 11:25:09 +02:00
30320b7897
Fixed login button style and removed help icons from agent_management
2019-05-30 11:12:37 +02:00
44803b6403
Merge remote-tracking branch 'origin/develop' into ent-3614-Vista-de-Servicios
...
Conflicts:
pandora_console/include/styles/pandora.css
2019-05-30 11:09:15 +02:00
445cc8aab0
New styles for Services table view - #3614
2019-05-30 10:58:59 +02:00
bfef8e61ea
Auto-updated build strings.
2019-05-30 00:01:06 +02:00
bc279e99b0
Merge branch 'fix/styles' into 'develop'
...
Fix/styles
See merge request artica/pandorafms!2461
2019-05-29 18:31:43 +02:00
48094ffb2e
greater icons
2019-05-29 18:24:45 +02:00
c2346842c9
ui_toggle revierw
2019-05-29 18:13:21 +02:00
f16f35ad10
Changes styles
2019-05-29 17:49:09 +02:00
121ae89b1d
dyn style ui_print_help_tip
2019-05-29 17:34:11 +02:00
3c730fbedf
BC updated
2019-05-29 17:10:21 +02:00
30b8872ab3
fixed mr 28
2019-05-29 17:06:25 +02:00
47c9220cbb
clippy positions and control overflow
2019-05-29 17:02:01 +02:00
8c0bfd72a8
avoid icon overlap report view lsit
2019-05-29 16:52:38 +02:00
53f6649a57
tip img sty
2019-05-29 16:49:51 +02:00
e9198af17c
multiple changes
2019-05-29 16:45:53 +02:00
2e3338b595
Merge branch 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual' into 'develop'
...
Ent 3961 añadir caché para los elementos de la consola visual
See merge request artica/pandorafms!2443
2019-05-29 15:48:45 +02:00
4a42756ec6
group_management styles profiles
2019-05-29 15:44:51 +02:00
3083482457
Fixed label cache
2019-05-29 15:30:26 +02:00
4f27ae1021
minor style fix
2019-05-29 15:25:35 +02:00
f58d1bc6ee
Styling review
2019-05-29 15:14:13 +02:00
76e6588b7a
fixed cache in label, icon, clock, box and line
2019-05-29 13:54:14 +02:00
8bd4a2f8f7
Style align-top
2019-05-29 13:20:31 +02:00
3046cc5224
Style align-top
2019-05-29 13:13:24 +02:00
72999244c2
pandora_console/operation/agentes/estado_generalagente.php
2019-05-29 13:13:01 +02:00
7da60b447a
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-29 13:06:53 +02:00
505229abe4
minor style change - box
2019-05-29 13:03:58 +02:00
702b7e69ba
Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews-3' into 'develop'
...
Changed query and comment for tnews message
See merge request artica/pandorafms!2465
2019-05-29 12:58:54 +02:00
ad1251052e
Merge branch 'ent-4105-fallo-desplegable-snmp-wizard' into 'develop'
...
SNMP Browser fix
See merge request artica/pandorafms!2455
2019-05-29 12:50:09 +02:00
49dee1e2bc
Next contact to seconds
2019-05-29 12:42:55 +02:00
5131c24772
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-29 12:24:28 +02:00
ca083556c3
minor alignment select-multiple
2019-05-29 12:23:54 +02:00
487ff53825
Min. fields lenght headers
2019-05-29 12:09:45 +02:00
1f3656c0d3
Changed query and comment for tnews message
2019-05-29 12:09:44 +02:00
37af0ad612
Styles
2019-05-29 12:06:05 +02:00
ee7cd68d39
Merge branch 'ent-1668-update-manager' into 'develop'
...
UM register, UM newsletter flow improved
See merge request artica/pandorafms!2463
2019-05-29 11:55:34 +02:00
d5ac57064b
Condition is added to keep the selection color in the main menu
2019-05-29 11:34:23 +02:00
5ec162e058
Data title events
2019-05-29 11:24:17 +02:00
c8649a8dc4
Styles
2019-05-29 11:21:57 +02:00
552467286c
Merge branch 'develop' into 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual'
...
# Conflicts:
# pandora_console/extras/mr/28.sql
2019-05-29 11:10:31 +02:00
c0763b86d2
Merge branch 'ent-3924-eHorus-settings' into 'develop'
...
Ent 3924 e horus settings
See merge request artica/pandorafms!2417
2019-05-29 10:51:59 +02:00
32424ddae1
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-29 10:50:38 +02:00
5e3ca1664f
UM unregister restriction, only admins
2019-05-29 10:37:02 +02:00
4a60dbe415
Unregistration form
2019-05-29 10:27:28 +02:00
28555e09de
Unregistration form
2019-05-29 10:26:53 +02:00
30ce8f65e4
UM register, UM newsletter flow improved
2019-05-29 10:01:21 +02:00
9096444f8f
Merge branch 'ent-1480-4731-deshabilitado-de-modulos-agencia_aadcm' into 'develop'
...
Do not add disabled modules to the execution queue.
See merge request artica/pandorafms!2456
2019-05-29 09:53:38 +02:00
27963c4370
Fixed minor bug
2019-05-29 09:51:26 +02:00
22de7964c2
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-29 08:52:34 +02:00
c35cb56699
fixed errors
2019-05-29 08:50:46 +02:00
8572a13319
Auto-updated build strings.
2019-05-29 00:01:07 +02:00
f5d5cbf5b8
VC item cache improvements.
...
-Added a default value to the configuration.
-Changed the control to edit the cache expiration.
- Added the cache to more items.
2019-05-28 18:34:07 +02:00
d64e2cfb8c
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-28 18:05:33 +02:00
8e7b769977
Merge branch 'ent-3924-eHorus-settings' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3924-eHorus-settings
2019-05-28 18:04:52 +02:00
58a0ef1bf7
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
2019-05-28 18:03:55 +02:00
77dbb53db4
Fixed minor bug
2019-05-28 18:03:40 +02:00
70469c4909
Event list agent view
2019-05-28 18:03:01 +02:00
c8297165e8
Undo undesired changes
2019-05-28 17:41:39 +02:00
e993dcc3a5
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
2019-05-28 17:37:20 +02:00
6fdd88ab65
Fixed errors on eHorus user level conf
2019-05-28 17:19:13 +02:00
3b943ae902
fixed errors disabled/enabled module from list agents because not write in conf
2019-05-28 17:11:14 +02:00
99e485e96e
toggle updated
2019-05-28 16:24:28 +02:00
445db7c43b
module list agent view
2019-05-28 16:20:24 +02:00
d68bb176cf
Merge branch 'develop' into 'ent-4102-Cambios-vista-detalle-de-evento'
...
Conflicts:
pandora_console/include/styles/pandora.css
2019-05-28 15:56:16 +02:00
c57949079b
RC1 agent view
2019-05-28 13:32:17 +02:00
1df2bd3c21
Merge branch 'ent-4101-Cambios-vista-gráfica-de-módulo' into 'develop'
...
Ent 4101 cambios vista gráfica de módulo
See merge request artica/pandorafms!2462
2019-05-28 13:30:11 +02:00
348f0c2a65
agent view styling
2019-05-28 13:27:17 +02:00
5966367f8f
eHorus user level login conf added in user editor
2019-05-28 13:14:42 +02:00
9a12b34847
Updates styling
2019-05-28 12:13:29 +02:00
a3591b799a
Merge branch 'ent-3983-Informes-SLA-mensuales-de-keepalive-no-se-calculan-bien' into 'develop'
...
fix minor bug in reporting functions
See merge request artica/pandorafms!2460
2019-05-28 12:03:55 +02:00
92ca217800
minor fixes in style view tasklist
2019-05-28 10:57:36 +02:00
2cd19aa0cb
updates styles
2019-05-28 10:47:31 +02:00
5ea79cdfb8
Now only the Group item of the VC is cached by user
2019-05-28 10:39:34 +02:00
bdd7cc1317
Flex agent view
2019-05-28 09:48:09 +02:00
a6c0a082a7
Merge branch 'ent-4104-Cambios-vista-gráfica-de-módulo' into ent-4101-Cambios-vista-gráfica-de-módulo
2019-05-28 08:55:15 +02:00
8bfb1e6773
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-28 08:32:53 +02:00
11e5a4ce18
Auto-updated build strings.
2019-05-28 00:01:07 +02:00
e338d5ba95
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-27 22:40:11 +02:00
f57915285f
review styles agent view
2019-05-27 22:36:55 +02:00
f1499082fa
agent view rebuilt
2019-05-27 21:30:46 +02:00
954dd0b43a
UI_toggle updated
2019-05-27 19:08:41 +02:00
5be124f315
Styles review
2019-05-27 19:00:48 +02:00
3736d84589
Edit ehorus user
2019-05-27 18:49:47 +02:00
58d0dc5dbc
fix minor bug in reporting functions
2019-05-27 18:31:20 +02:00
588d19102f
Resolve merge conflict
2019-05-27 18:30:24 +02:00
f284112be2
Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews-2' into 'develop'
...
changed PK to NULL
See merge request artica/pandorafms!2451
2019-05-27 18:13:09 +02:00
f0fb6d7fd9
wip styles
2019-05-27 18:03:56 +02:00
61d3720787
Merge branch 'ent-4076-Quitar-ayudas-vacias-modulos' into 'develop'
...
Removed empty help icons in modules
See merge request artica/pandorafms!2454
2019-05-27 17:53:06 +02:00
91d388c8b3
Changed for create new user with advanced config enabled and forced automaticly disabled
2019-05-27 17:47:45 +02:00
2fd37b531e
Visual changes in module graph - #4104
2019-05-27 17:37:57 +02:00
513a74d120
Removed empty help icons in local components
2019-05-27 17:13:25 +02:00
556c07ad99
Minor changes in configurar_agente
2019-05-27 17:12:35 +02:00
fb8bc48d64
Now the vc item's cache expires when the item is updated
2019-05-27 16:40:09 +02:00
1eb1120c6e
Rename class events_show_more_table to table_modal_alternate - #4102
2019-05-27 16:18:10 +02:00
016a5b3745
Changed image for severity in modal events window - #4102
2019-05-27 15:51:03 +02:00
0b4a076798
Changed image for severity in modal events window - #4102
2019-05-27 15:49:10 +02:00
0280547465
some changes
2019-05-27 15:41:23 +02:00
bc64589046
fixed error create modules
2019-05-27 15:27:46 +02:00
9eecc414dd
cps changes - switch core touched - test this commit carefully
2019-05-27 14:12:53 +02:00
7347324601
Minor fixes - discovery styles
2019-05-27 13:19:08 +02:00
f8a0fc67f9
Minor improvements
2019-05-27 12:10:05 +02:00
ce8ba54e09
Merge remote-tracking branch 'origin/develop' into ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual
2019-05-27 11:31:24 +02:00
83602e07b9
Merge remote-tracking branch 'origin/develop' into ent-3881-discovery-fase-4
2019-05-27 11:06:29 +02:00
de3464bd02
Auto-updated build strings.
2019-05-27 00:01:05 +02:00
ba97da46c6
Auto-updated build strings.
2019-05-26 00:01:04 +02:00
a13701ed82
Auto-updated build strings.
2019-05-25 00:01:06 +02:00
bf3ac73feb
Removed empty help icons
2019-05-24 14:26:28 +02:00
41bc705c02
Image only for welcome message
2019-05-24 14:19:31 +02:00
9587b4cc44
Image only for welcome message
2019-05-24 14:18:39 +02:00
1d403ec2f8
SNMP Browser fix
2019-05-24 13:42:49 +02:00
0ee2ed6f5e
Removed empty help icons in modules
2019-05-24 12:59:25 +02:00
c5bd3204ab
Minor style, avoided duplicated iface names with spaces
2019-05-24 11:42:46 +02:00
0319e4d4e6
Removed empty help icons
2019-05-24 11:11:30 +02:00
01d96728c8
changed PK to NULL
2019-05-24 11:03:09 +02:00
f5586d7b70
Merge branch 'ent-3630-7648-7712-campo-label-no-se-muestra-en-informes-de-graficas' into 'develop'
...
fixed label reports and more fixed
See merge request artica/pandorafms!2413
2019-05-24 10:47:15 +02:00
cc09c257bc
Auto-updated build strings.
2019-05-24 00:01:06 +02:00
9d7d58f43e
Merge branch 'fix/newsletter_ent' into 'develop'
...
Newsletter reminder settings ent
See merge request artica/pandorafms!2449
2019-05-23 19:25:43 +02:00
4400d9303f
subscription manager udp
2019-05-23 19:22:05 +02:00
211b05c9d6
minor fix in newsletter logic
2019-05-23 18:59:38 +02:00
058c9d3806
Newsletter reminder settings ent
2019-05-23 18:54:04 +02:00
f46fdea220
Merge remote-tracking branch 'origin/develop' into fix/uno
2019-05-23 18:46:56 +02:00
8f9c9fd156
removed trace from user_edit
2019-05-23 18:46:43 +02:00
1386a44e07
fixed errors label report
2019-05-23 17:52:28 +02:00
51f846af05
Merge branch 'ent-3893-Errata-en-Bulk-operation-de-politicas' into 'develop'
...
Fixed visual bug in policies operations actions
See merge request artica/pandorafms!2369
2019-05-23 17:24:59 +02:00
7c236149b0
Merge branch 'ent-3592-Se-eliminan-items-de-informes-aunque-se-cancele' into 'develop'
...
Fixed bug in items reports deleted
See merge request artica/pandorafms!2208
2019-05-23 17:18:00 +02:00
7097481cca
Merge branch 'ent-3974-Los-campos-de-module-plugin-no-se-guardan' into 'develop'
...
fixed bug in macros of plugin modules
See merge request artica/pandorafms!2442
2019-05-23 17:08:34 +02:00
9e1de4cbb3
Merge branch 'ent-1668-update-manager' into 'develop'
...
rb UM GCv
See merge request artica/pandorafms!2447
2019-05-23 16:16:26 +02:00
4ec6aadf7d
rb UM GCv
2019-05-23 16:12:40 +02:00
f1c077b753
Merge branch 'ent-1668-update-manager' into 'develop'
...
UM GCv
See merge request artica/pandorafms!2446
2019-05-23 16:09:16 +02:00
4abbbf6680
UM GCv
2019-05-23 15:55:07 +02:00
5d4ba6cb01
Merge branch 'ent-1668-update-manager' into 'develop'
...
summarized counts
See merge request artica/pandorafms!2445
2019-05-23 15:47:25 +02:00
08aa824f97
summarized counts
2019-05-23 15:38:45 +02:00
1529a04507
Merge branch 'ent-1668-update-manager' into 'develop'
...
fixed: um url relative
See merge request artica/pandorafms!2444
2019-05-23 11:33:46 +02:00
0ee42fbafe
fixed: um url relative
2019-05-23 11:23:42 +02:00
4c874e152c
Merge
2019-05-23 10:43:32 +02:00
dd8af874fa
Merge branch 'ent-1668-update-manager' into 'develop'
...
license forms sync MC-N
See merge request artica/pandorafms!2441
2019-05-23 10:36:43 +02:00
2de2d1f482
Added expiration and deleted old cache data in pandora_db
2019-05-23 10:35:03 +02:00
7b5ae40868
multiple fixes
2019-05-23 10:27:50 +02:00
4c3dea3ba4
Auto-updated build strings.
2019-05-23 00:01:07 +02:00
0728c73844
fixed bug in macros of plugin modules
2019-05-22 19:14:01 +02:00
2cfe4378c2
license forms sync MC-N
2019-05-22 18:50:51 +02:00
5a3e5c84ad
Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor
2019-05-22 16:55:05 +02:00
dfb7067db2
Merge branch 'ent-1668-update-manager' into 'develop'
...
minor fix MC environments
See merge request artica/pandorafms!2439
2019-05-22 16:54:33 +02:00
119a5ea2fd
Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor
2019-05-22 16:52:56 +02:00
8b511c2ca3
Merge branch 'ent-3984-7962-ldap-bug-en-token-force-automatically-create-profile-user' into 'develop'
...
Changed condition for ldap Force automatically create profile user
See merge request artica/pandorafms!2422
2019-05-22 16:15:06 +02:00
86cb526893
minor fix MC environments
2019-05-22 15:40:17 +02:00
4fe7680694
Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor
2019-05-22 15:33:13 +02:00
bd88cbd42d
1st approach simplifying MC management
2019-05-22 15:31:59 +02:00
892dcc750f
Updated version and build strings.
2019-05-22 15:29:49 +02:00
979f11ca8f
Merge branch 'ent-1668-update-manager' into 'develop'
...
Ent 1668 update manager
See merge request artica/pandorafms!2420
2019-05-22 15:25:49 +02:00
88234503c0
Merge branch 'ent-4078-7999-Error-al-actualizar-los-cambios-en-la-vista-de-usuario' into 'develop'
...
Fixed url in user_edit
See merge request artica/pandorafms!2436
2019-05-22 14:14:15 +02:00
07b42f7241
Changed for metaconsole
2019-05-22 13:57:31 +02:00
5b286b4f67
Merge branch 'ent-3975-mejorar-la-actualizacion-de-los-datos-y-elementos-de-la-consola-visual' into 'develop'
...
Mejorar la actualizacion de los datos y elementos de la consola visual
See merge request artica/pandorafms!2429
2019-05-22 13:06:18 +02:00
c50eb57499
Merge branch 'ent-4016-error-en-valor-de-diagnostic-info' into 'develop'
...
Added new min value for InnoDB file per table( 0 to 1)
See merge request artica/pandorafms!2416
2019-05-22 12:05:29 +02:00
e82916001b
allow fetching of event id in metaconsole event table when getting target of an event response in metaconsole having server_id=0
2019-05-22 10:18:44 +02:00
ba9edc0378
Auto-updated build strings.
2019-05-22 00:01:07 +02:00
85a3437124
Merge branch 'ent-3964-autorefresco-no-funciona-733-734-v2' into 'develop'
...
Ent Autorefresco no funciona en la version 733, 734 (v2)
See merge request artica/pandorafms!2435
2019-05-21 17:41:10 +02:00
f6171de522
Merge branch 'ent-3468-Ayudas_online' into 'develop'
...
helpers
See merge request artica/pandorafms!2381
2019-05-21 17:28:27 +02:00
edbde3fecb
Fixed url in user_edit
2019-05-21 17:14:29 +02:00
e361c4243a
Autorefresh bug fix
2019-05-21 12:16:06 +02:00
ce359bfaf6
Merge branch 'ent-3937-eliminar-echos-y-prints-de-las-subclases-de-wizard' into 'develop'
...
Ent 3937 eliminar echos y prints de las subclases de wizard
See merge request artica/pandorafms!2430
2019-05-21 12:11:53 +02:00
ada49966e0
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
2019-05-21 10:05:06 +02:00
b853582fb9
Changed preview by \"click here\" message
2019-05-21 08:29:59 +02:00
20e38ead81
Auto-updated build strings.
2019-05-21 00:01:08 +02:00
77fc1abe89
minor style updates and fixes in safe-output
2019-05-20 18:16:21 +02:00
5c0a197b6b
Added cache
2019-05-20 15:15:54 +02:00
5e9b2479eb
Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager
2019-05-20 13:11:39 +02:00
a898fad2c3
lint fixes
2019-05-20 10:35:46 +02:00
d82d178a0d
Auto-updated build strings.
2019-05-20 00:01:08 +02:00
2dc5fce6a6
Auto-updated build strings.
2019-05-19 00:01:06 +02:00
509c476c33
Auto-updated build strings.
2019-05-18 00:01:08 +02:00
105695f1bd
Added notification for serialize_precicion value
2019-05-17 18:29:38 +02:00
fdd61e4f27
Fixed agent searh box
2019-05-17 16:36:21 +02:00
0046e209fe
lint changes
2019-05-17 14:46:19 +02:00
54d3eefa43
lint changes
2019-05-17 14:27:59 +02:00
e746a49158
lint changes
2019-05-17 14:26:44 +02:00
bdcea7ec7d
Minor fix
2019-05-17 14:25:17 +02:00
a0b7164d9f
lint changes
2019-05-17 14:20:01 +02:00
2c8dd3b5e5
Merge remote-tracking branch 'origin/develop' into ent-3975-mejorar-la-actualizacion-de-los-datos-y-elementos-de-la-consola-visual
2019-05-17 14:16:23 +02:00
34218fa7eb
Improved the management of the async requests of the visual console client
2019-05-17 14:09:30 +02:00
0c9f8892e0
Changed evaluates permissions
2019-05-17 13:58:34 +02:00
ea39766d59
Merge branch 'ent-3684-Dashboard-publico-no-muestra-mapa-de-red' into 'develop'
...
ent-3684-Dashboard-publico-no-muestra-mapa-de-red into develop
See merge request artica/pandorafms!2427
2019-05-17 12:11:19 +02:00
86dabc6476
Variability event_storm_protection check is added with empty data
2019-05-17 11:31:02 +02:00
833c2d91a7
Merge branch 'ent-4013-7999-Bug-custom-graph-en-consola-visual-return' into 'develop'
...
Fixed error window in visual console
See merge request artica/pandorafms!2426
2019-05-17 11:27:57 +02:00
9b4d1b3dba
Merge branch 'ent-2108-incongruencias-creacion-accion-pandora-fms-event' into 'develop'
...
Recovered event criticity field from event alert
See merge request artica/pandorafms!2425
2019-05-17 10:49:34 +02:00
bf202496da
Auto-updated build strings.
...
Former-commit-id: ff3141fab3d61823cc7bf64e4e013ccda69ecffd
2019-05-17 00:01:10 +02:00
a0faffe161
Form eHorus user login with title
...
Former-commit-id: 7b55f446802bb9c24602d2e626789a3365599835
2019-05-16 18:59:17 +02:00
0cd60d0431
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
...
Former-commit-id: fb3ba4cbda0daa688550708e4bc99e6512eea413
2019-05-16 18:11:33 +02:00
b3d2eaaf9e
Fixed img url on js
...
Former-commit-id: 72a6122343da8c27248c639a6afa180fbfded9c0
2019-05-16 17:25:18 +02:00
1bfd91725e
Changed <img> to hmtl_print_image
...
Former-commit-id: 6f72ebce38470308bccb08c5d0b1906b5e711472
2019-05-16 17:13:14 +02:00
f1705af9f6
Fixed error window in visual console
...
Former-commit-id: 757fb0daa0a56b517a88063dedbe5cbf51cdf73e
2019-05-16 16:04:38 +02:00
c40e0ec702
pandora_console/extras/delete_files/delete_files.txt
...
Former-commit-id: 6931c868b5a5df1e7068c4571902ad112a1333c9
2019-05-16 15:38:51 +02:00
0f35923073
Recovered event criticity field from event alert
...
Former-commit-id: e59764a9cf5eec411f6f5e28d306444273d9f89c
2019-05-16 13:23:47 +02:00
ec60a3193a
removed all group from communications target
...
Former-commit-id: 797a467fed8eff0f9a81c9bbe72780f4e91faa67
2019-05-16 12:52:41 +02:00
3cdbfd3646
minor fix in php requirements
...
Former-commit-id: bc268f18f8d46b8db6b1b28b3df5011bc56823d0
2019-05-16 12:50:16 +02:00
c8c0194183
Minor fix in url
...
Former-commit-id: 087a93624d65109c9c66de329c4365b98d99c8ed
2019-05-16 12:33:05 +02:00
034480bf88
minor fixes
...
Former-commit-id: ced1aad7a9835dab5b44817f191e33d2ca11cff3
2019-05-16 12:28:46 +02:00
0173c856af
Merge branch 'ent-4036-8031-no-funcionan-las-custom-graph-cuando-el-idioma-es-frances' into 'develop'
...
Changed simple quote in alerts
See merge request artica/pandorafms!2419
Former-commit-id: 9cab37f3ab87dd3c056f2750a1be9e5204f73e51
2019-05-16 12:17:22 +02:00
8f2dce439b
Add javascript for insert name to reports
...
Former-commit-id: 75e51a652c0e713379093196ad04a10505c38447
2019-05-16 12:13:58 +02:00
e7dbb55392
Minor fixes
...
Former-commit-id: 51e446b36a4ad2b93a1a2e3ff76e89ea2a21db9b
2019-05-16 12:00:49 +02:00
13b32003b3
save changes ticket 3937
...
Former-commit-id: 264c0fed3ddcf7c34796af0a3c2bd4d48a6763bb
2019-05-16 11:37:48 +02:00
50ad335794
Merge branch 'ent-3720-7750-anadir-filtros-en-custom-graphs-2' into 'develop'
...
New branch without thras files
See merge request artica/pandorafms!2423
Former-commit-id: 909ad4d321231e4d610b409c3f5b1224a780150b
2019-05-16 11:37:25 +02:00
a25a08f48d
Added an async task manager to the visual console client
...
Former-commit-id: 4f5c92a976ae976e77cc11505c7a57bf31121930
2019-05-16 11:04:03 +02:00
702926cf85
solved merge conflict mr 28.sql
...
Former-commit-id: 687cf5c37f15648421843b5d2908351fc2f3c032
2019-05-16 10:15:46 +02:00
f5f66fc144
Auto-updated build strings.
...
Former-commit-id: dff1ba74fcb60ee0ba0278c8baf25614ce391c58
2019-05-16 00:01:06 +02:00
9c08aa7b57
Auto-updated build strings.
...
Former-commit-id: 37439887da302715dff5aa9ba55f3dd11a27f2ca
2019-05-15 00:01:11 +02:00
3bf06f0b72
MR minor updates
...
Former-commit-id: 55105f3858b8ec659c67bf906b09afeb61a1d39c
2019-05-15 00:00:21 +02:00
d871b599ef
General fixes and UM comm updates
...
Former-commit-id: b4c58f467f195627f96afe7f06b59004adeb83be
2019-05-14 23:49:01 +02:00
0e99b750b4
New branch without trash files
...
Former-commit-id: fd64df2d8fb7d69ad871d870cbe11e4e69ae677d
2019-05-14 18:15:23 +02:00
8004e096fd
MR 28 and minor fixes
...
Former-commit-id: 99292ecb6401cf20066dd09188a32e24b9194b25
2019-05-14 18:09:34 +02:00
3548070ec1
Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' into 'develop'
...
Add new message to News board
See merge request artica/pandorafms!2415
Former-commit-id: b0adfc73ac247cda59dea01e83429e06ba5747ee
2019-05-14 17:56:43 +02:00
be20163073
Merge branch 'ent-3799-bug-en-configuracion-ehorus' into 'develop'
...
Ent 3799 bug en configuracion ehorus
See merge request artica/pandorafms!2421
Former-commit-id: cf20d4985c6de38e1eab8bdd23ddb32708cc57ba
2019-05-14 17:38:55 +02:00
920786216b
UM notifications MR update
...
Former-commit-id: 61be93c1174fbff4242e261caac591725d7ef4c5
2019-05-14 17:17:04 +02:00
53e9113b7e
UM notifications MR update
...
Former-commit-id: d2aad195cb9bab4e1efa504cb4b4a583f262f0e3
2019-05-14 17:15:28 +02:00
35c7ea1f48
Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4020-cambiar-mensaje-de-bienvenida-tnews
...
Former-commit-id: 3c10d8ecea2a6fdb44a6003d45ccf146972a92e1
2019-05-14 17:14:02 +02:00
bc849c16fb
Only one image for welcome new board
...
Former-commit-id: a8effda6019c394a9a2d15fbf4998490867b3b02
2019-05-14 17:13:44 +02:00
f807c23df7
Merge branch 'ent-3264-importa-politicas-desde-resource-registration-en-modo-centralizado' into 'develop'
...
Fixed policy import with centralized management in node
See merge request artica/pandorafms!2217
Former-commit-id: abe02564ab3d19101e37f02bd9cc9f37739e1992
2019-05-14 16:50:42 +02:00
d9dbc60eb5
Update pandoradb_migrate_6.0_to_7.0.mysql.sql
...
Former-commit-id: cb2edea9dca48e33260ce2fb707ed48b04d23bde
2019-05-14 16:45:28 +02:00
43547267a0
Changed condition for ldap Force automatically create profile user
...
Former-commit-id: caa1218b7ae4dc09649a6a4bb54b158255ea268f
2019-05-14 15:59:35 +02:00
ff8abf9b40
updated function for show and hide ehorus form
...
Former-commit-id: 91c91ee7b1014dfa4d8f7719cb848ae4770199f5
2019-05-14 15:34:22 +02:00
26bc3af1d1
Fixed centralized mode message
2019-05-14 15:16:24 +02:00
6e35f6aec7
UM updates and fixes
...
Former-commit-id: 1c06fca2174091a1a18de3d88724dc4243306b39
2019-05-14 13:41:21 +02:00
827ebcfbc5
Fix helps
...
Former-commit-id: c4c666d8552f153a8d29320d655d27da50fa4267
2019-05-14 13:09:49 +02:00
79701bba60
Merge remote-tracking branch 'origin/develop' into ent-1372-Poder-escoger-fecha-de-inicio-y-fin-en-Hourly-Weekly-y-Monthly-SLA
...
Conflicts:
pandora_console/extras/mr/28.sql
Former-commit-id: c1977a7269bdb26d5ce387513c6a0b04813ebe69
2019-05-14 12:34:40 +02:00
ae11ea18c9
Merge remote-tracking branch 'origin/develop' into ent-3630-7648-7712-campo-label-no-se-muestra-en-informes-de-graficas
...
Conflicts:
pandora_console/include/functions_graph.php
Former-commit-id: 8436d51b142d4f3d528b3f1c4d459f5194f6a234
2019-05-14 12:27:02 +02:00
b89751e647
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/alerts/configure_alert_command.php
Former-commit-id: 9051a95f31fd7163a0b326d7e513c5689c5b304f
2019-05-14 11:50:07 +02:00
421e6b559d
Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into develop
...
Former-commit-id: 1addcf3afd8ef2b4376f7b888ea10e1e5735deb7
2019-05-14 11:46:39 +02:00
8ff62a58ce
Merge branch 'ent-3695-ipam-oids' into 'develop'
...
IPAM vlan wizard ExtremeXOS
See merge request artica/pandorafms!2409
Former-commit-id: e3881101a9d529cf64241b24ed251eaafc45d6f5
2019-05-14 11:30:55 +02:00
b508e40a73
Changed simple quote in alerts
...
Former-commit-id: 48f06d79b9f6e93ba2164d8da6240f28cc4f785c
2019-05-14 11:11:27 +02:00
15446453fb
Merge branch 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta' into 'develop'
...
Ent 3771 nueva tipo de macro password en comandos acciones de alerta
See merge request artica/pandorafms!2397
Former-commit-id: bd4887079f93ed26eef66f5b5047dcc07caf56a6
2019-05-14 10:53:44 +02:00
4497554b37
Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into develop
...
Former-commit-id: b271e6e740b1f0cdec273786fae3e707288e72cd
2019-05-14 10:40:49 +02:00
865796ed5e
Merge branch 'visual-console-phase-2' into 'develop'
...
Visual console phase 2
See merge request artica/pandorafms!2404
Former-commit-id: af616c2346655fcf1f5732c00c0ef2f053126d86
2019-05-14 10:21:14 +02:00
cf45be2c60
Merge branch 'develop' into 'ent-4020-cambiar-mensaje-de-bienvenida-tnews'
...
# Conflicts:
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
Former-commit-id: b3872691ef8ef136cd921c5eb4365be2b32daf46
2019-05-14 10:03:37 +02:00
9501187ebc
Se cambian las consultas sql sin la imagen en la consulta
...
Former-commit-id: fcfc9e05c4107f5b85b1a8f6140155fafe316c8e
2019-05-14 10:01:30 +02:00
bad2a330fd
Se muestra en la pantalla mediante html la imganen
...
Former-commit-id: ddd86fc0b4768ed5c3750c304fded70de3389864
2019-05-14 09:48:41 +02:00
5fe4a240be
se añade imagen y se quita de bbdd
...
Former-commit-id: 4d9174e95ffb6f5a35aa194177363c27dcd2c4a1
2019-05-14 09:47:45 +02:00
b7ebb44c48
Auto-updated build strings.
...
Former-commit-id: 8ec4c48ebf34ee5d60ddb8b0b1579c47874e936f
2019-05-14 00:01:09 +02:00
5f87b13e13
WIP: updatemanager interaction
...
Former-commit-id: 5983c8a2f885dc696fb5bdf779e3e56783687667
2019-05-13 19:34:10 +02:00
81f7cf699b
Merge branch 'ent-3768-no-funciona-selector-de-nodo-event-group-report-meta' into 'develop'
...
Ternary condition is added
See merge request artica/pandorafms!2311
Former-commit-id: c7e9365d322c9f2bf7b52a58c4e6f077f3e68288
2019-05-13 18:36:34 +02:00
6ca07c0914
Merge remote-tracking branch 'origin/develop' into 1668-update-manager
...
Former-commit-id: 33d676ea02d3dfbb3f8c3c23aa8466192516eafb
2019-05-13 17:58:35 +02:00
860a4cdbf2
Updated pandoradb and migrate
...
Former-commit-id: 59d37439046c18c4de72ac7e078ef75a61603958
2019-05-13 17:57:21 +02:00
ced1b32915
Configuration, Registration and newsletter wizards
...
Former-commit-id: bbd367a10fd01c229c848b15572c4b1d6ccb75cf
2019-05-13 17:55:41 +02:00
8c1c337522
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
...
Former-commit-id: 1eac76c75f311a20f402859cf7b9a47b70765f75
2019-05-13 17:36:32 +02:00
539f416cc4
Merge
...
Former-commit-id: ab93502ce1140ff37c513f2c574b4ca22f552ee9
2019-05-13 17:30:35 +02:00
ce34adb9d8
Fixed errors and corrected style
...
Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a
2019-05-13 17:28:23 +02:00
9347fc17aa
Merge branch 'develop' into 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta'
...
# Conflicts:
# pandora_console/extras/mr/28.sql
Former-commit-id: f9ff15a815fa9a15f1d326174ac40acbdd4110dd
2019-05-13 17:10:06 +02:00
a38ef3e729
Merge branch 'ent-3858-Alert-template-Condition-Type-Not-normal' into 'develop'
...
Added condition type not normal in alert templates
See merge request artica/pandorafms!2376
Former-commit-id: bfd561123a0eb57cfb4c99a0c12f3c665a661765
2019-05-13 16:51:34 +02:00
20dace7de8
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/agentes/agent_manager.php
Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
2019-05-13 16:20:12 +02:00
2f2385c9cb
Merge remote-tracking branch 'remotes/origin/ent-3611-Vista-Creación-Edición-de-Agente' into develop
...
Former-commit-id: bcd067e3b702c3eaa60fff2aeae7e39625f565ef
2019-05-13 15:57:19 +02:00
b6e8578d1d
Fixed a minor sintax error - #3611
...
Former-commit-id: 75ba583e8d060887c80eb32fd648157d2c4428bd
2019-05-13 15:54:06 +02:00
14717a6c6d
Fixed merge conflict
...
Former-commit-id: bd98cc80ad87b840a60c2548667352f5c6041c55
2019-05-13 15:15:14 +02:00
17ba0e19cb
Added new min value for <code>InnoDB file per table( 0 to 1)
...
Former-commit-id: ac389928deec2fdc8af9d965c049a66f0fe57839
2019-05-13 15:08:57 +02:00
e6fa42ddca
Fixed a minor bug in remote config - #3611
...
Former-commit-id: 02a786832c8b02a7f5962cf9021cb5a2fe525bcc
2019-05-13 15:02:13 +02:00
895588ebe0
Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings
...
Former-commit-id: c5f4313d97cad17c9f653dc0e4bbc0d9e7e9f308
2019-05-13 15:00:35 +02:00
27096276ec
agent view user acces ehorus
...
Former-commit-id: 66739ce807d5bd5f2e46ce9fd1aa0cc72afbb4bc
2019-05-13 15:00:29 +02:00
e9082c5d8a
Fixed a minor bug in remote config - #3611
...
Former-commit-id: 905739bc36ce640de743f4d6cf62031263c698eb
2019-05-13 14:55:15 +02:00
ecacf2d3f5
Merge branch 'ent-3799-bug-en-configuracion-ehorus' into 'develop'
...
Ent 3799 bug en configuracion ehorus
See merge request artica/pandorafms!2403
Former-commit-id: 183212d8ad2e9cab574800000ac71576d7ae75ae
2019-05-13 14:54:25 +02:00
f281dda622
Merge branch 'ent-4013-7999-Bug-custom-graph-en-consola-visual' into 'develop'
...
Fixed error window in visual console
See merge request artica/pandorafms!2412
Former-commit-id: 312950779bb4cd02938f1e825d86ab3c1fef01ff
2019-05-13 14:52:17 +02:00
5f2bd0bc8d
Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente
...
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: f04b28c642afe7fe1251ae966b3964c321b34c29
2019-05-13 13:17:17 +02:00
20f77f5393
Merge branch 'ent-4004-Estilos-Discovery' into 'develop'
...
Unify the styles of Discovery with Pandora - #4004
See merge request artica/pandorafms!2411
Former-commit-id: 463116b12ece33846a8d86514145e2d97e7eaec1
2019-05-13 13:05:34 +02:00
3d66fca5d6
Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings
...
Former-commit-id: df2707c912cccfa684dc82e5ad8a777819b2b9e8
2019-05-13 10:08:37 +02:00
874f4764ea
Merge remote-tracking branch 'origin/ent-4004-Estilos-Discovery' into ent-3937-Eliminar-echos-y-prints-de-las-subclases-de-wizard
...
Former-commit-id: 2344b96903d759aa88b01404f259c6f70077027f
2019-05-13 09:38:24 +02:00
40af2205b1
Auto-updated build strings.
...
Former-commit-id: bde62e989e369e296a685f7d2050a92f4b8417e2
2019-05-13 00:01:06 +02:00
3fc5f183fd
Auto-updated build strings.
...
Former-commit-id: bcb6a01291e16430de319d27a04f21723e39a5c5
2019-05-12 00:01:06 +02:00
0008f57e35
Auto-updated build strings.
...
Former-commit-id: 62f8df997289fe4c8e8e63eedbb8dcdb1a08da1f
2019-05-11 00:01:09 +02:00
c527435a0e
eHorus user-login settings
...
Former-commit-id: e62be3b137ef5583fbd29186a834a86b075e78fb
2019-05-10 15:32:25 +02:00
b51cdb93df
arreglo con la vista del formulario
...
Former-commit-id: 0d5b5c099ce2e096d8e3d8e1c0a6220baa27e0a9
2019-05-10 15:00:21 +02:00
793304b52d
Se habilita el boton de ehorus
...
Former-commit-id: aceee670b00ad4291b7f4e9e0a90f17dca3feed9
2019-05-10 12:26:09 +02:00
ab2bf737d5
Merge remote-tracking branch 'origin/develop' into ent-3894-Bug-Feature-labels-weigh-en-graficas
...
Conflicts:
pandora_console/include/functions.php
Former-commit-id: 6c1ef8bcb15b9969b25082851fa39c8241398b29
2019-05-10 12:18:10 +02:00
ac60e296c1
Add new message to News board
...
Former-commit-id: ad9170857d95fa2c211d09a5f59f6012739177c5
2019-05-10 11:17:46 +02:00
a9834dc415
Merge branch 'develop' into 'ent-4004-Estilos-Discovery'
...
Conflicts:
pandora_console/godmode/wizards/HostDevices.class.php
Former-commit-id: de7b4b069e1c5f673b567fcb3271ec867d0fbae1
2019-05-10 09:55:54 +02:00
44b14debdc
Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings
...
Former-commit-id: 781b73ee3896c138223d46d40abdb3a7100bcf2c
2019-05-10 09:38:31 +02:00
12c9952e4a
Merge branch 'develop' into ent-3858-Alert-template-Condition-Type-Not-normal
...
Conflicts:
pandora_console/extras/mr/28.sql
Former-commit-id: 841526b8d92b3f5ea7e642a36829b1bc33c62c8a
2019-05-10 09:11:17 +02:00
3119278b26
Auto-updated build strings.
...
Former-commit-id: 1dc55561e83817f91b38b437d57e479fb13f3ac3
2019-05-10 00:01:14 +02:00
ecce1160e1
Added button to select ehorus conf type and box into user conf
2019-05-09 19:23:18 +02:00
8027238dfd
Merge branch 'ent-3925-eliminar-custom-response-deprecated' into 'develop'
...
Ent 3925 eliminar custom response deprecated
See merge request artica/pandorafms!2390
Former-commit-id: aa92dfe86b9039f45db063cd1a711b26e8c36442
2019-05-09 17:52:46 +02:00
72eb2babad
se quita install.php
...
Former-commit-id: 34ab35a67b924c6d0aab9f756a0c73bffd36c8cd
2019-05-09 17:44:54 +02:00
5126c651f7
Changed '' of query
2019-05-09 17:38:40 +02:00
f186cd6201
Added cache_expiration in mr, pandoradb and migrate
2019-05-09 17:37:01 +02:00
43ce4f9883
Added helps
2019-05-09 17:20:27 +02:00
3e91207186
Merge branch 'ent-3617-Gráfica-de-módulos' into 'develop'
...
Ent 3617 gráfica de módulos
See merge request artica/pandorafms!2407
Former-commit-id: ac545e4211f9e68e81482657c6e294dcac082a8e
2019-05-09 17:03:03 +02:00
e981edfa89
fixed label reports and more fixed
...
Former-commit-id: a71c341fc7f6f182f7d847911a7dc4e0cd6f36f7
2019-05-09 16:26:38 +02:00
9b51928e35
Added HTML edit feature, needed because TinyEdit adds lot's of HTML and is not practical. You need to edit the contents in HTML. Is not a security issue, because only admin can edit this news contents.
...
Former-commit-id: 4039346ffe4fc2628f515b4cdaeaf1655377e74b
2019-05-09 16:01:51 +02:00
dab12ecdc5
Fixed error window in visual console
...
Former-commit-id: 97def5509195b687a1607810043076e58dd72fe0
2019-05-09 15:06:03 +02:00
e0729b6ca6
Se vuelve a crear la rama
...
Former-commit-id: 8ac69d4e1d15be23411faff82dc2bddcfcf7f7b6
2019-05-09 14:59:47 +02:00
c775d0359c
Merge branch 'ent-3973-al-hacer-update-de-un-comando-persiste-valor-antiguo-de-los-campos-al-refrescar-la-vista' into 'develop'
...
Show new values after update
See merge request artica/pandorafms!2405
Former-commit-id: aa2b2a4857e47a4999ef9ca42f6ba1b59fa9d714
2019-05-09 14:36:51 +02:00
143def5d87
Added helps
2019-05-09 13:43:53 +02:00
7c3e883c01
Merge branch 'ent-3770-texto-del-pandora-diag' into 'develop'
...
Ent 3770 texto del pandora diag
Closes pandora_enterprise#3529, pandora_enterprise#1744, pandora_enterprise#3305, pandora_enterprise#3121, and pandora_enterprise#3252
See merge request artica/pandorafms!2393
Former-commit-id: d78409acd362ebc5308495c359344f5b706685cd
2019-05-09 13:01:28 +02:00
c2b8ad22d3
Added cache_expiration in builder items
2019-05-09 12:44:58 +02:00
fd83540ad5
New menu module graph for interface modules- #3617
2019-05-09 12:39:03 +02:00
artica
fbsanchez
marcos.alconada
Luis Calvo
Tatiana Llorente
Daniel Maya
Alejandro Fraguas
alejandro-campos
Daniel Rodriguez
Alejandro Gallardo Escobar
manuel
Ramon Novoa
ismael.moreno
Daniel Barbero Martin
artica
root
slerena