b7d4144904
fix remove debug
2020-11-18 17:37:33 +01:00
7e2fc669f7
fixed status filter when applying changes to a module of any agent
2020-11-18 16:48:49 +01:00
13d90bb1c5
Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario
2020-11-18 12:05:57 +01:00
e0404d565a
Fix vulnerability
2020-11-17 14:49:26 +01:00
2ee187ae53
Fixed acl on discovery tasklist
2020-11-16 18:30:23 +01:00
8baf5df61a
Fix visual issue
2020-11-13 14:09:22 +01:00
2fdd34265f
WIP: Backup upload
2020-11-13 13:53:54 +01:00
a049ff1e16
WIP: Backup upload
2020-11-13 13:44:40 +01:00
d623606c0f
WIP: Backup upload
2020-11-13 13:38:54 +01:00
63395dd88f
WIP: Backup upload
2020-11-13 13:33:05 +01:00
1ca65e59d5
WIP: Backup upload
2020-11-13 13:31:13 +01:00
a0a1be254d
WIP: Backup upload
2020-11-13 13:28:07 +01:00
98205973a5
WIP: Backup upload
2020-11-13 11:43:26 +01:00
08cc67696a
WIP: Backup upload
2020-11-13 11:36:06 +01:00
b8437bec79
Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red
2020-11-11 11:09:30 +01:00
ac762469b6
Added trim in search
2020-11-10 13:54:15 +01:00
ea0e229951
Fixed license expired and license trial
2020-11-10 12:10:25 +01:00
01b315de3f
Merge branch 'ent-#10872-GUARDIA-Problemas-menus-de-modulos' into 'develop'
...
added check for element
See merge request artica/pandorafms!3577
2020-11-04 16:40:36 +01:00
a786f5e132
Merge branch 'ent-6571-failazo-ha-al-perder-hilos' into 'develop'
...
Added server component status - crash -
See merge request artica/pandorafms!3547
2020-11-04 16:39:28 +01:00
31a8eefd2f
Fixed bug allowing updating group with duplicated name
2020-11-04 16:22:44 +01:00
b585a4e372
Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red
2020-11-03 16:35:25 +01:00
241c90f201
fixed security vulnerability
2020-11-03 15:58:53 +01:00
8202839888
warn while updating user admin > standar
2020-11-03 10:14:17 +01:00
5ddb3f4421
title for dialog (user form)
2020-11-03 10:11:18 +01:00
8b01565948
Avoid confirm dialog while profiles are assigned to user
2020-11-03 10:08:23 +01:00
95ed4c9665
Merge remote-tracking branch 'origin/develop' into ent-6577-creacion-de-usuario-con-global-profile-administrator-no-deberia-necesitar-anadirle-mas-perfiles
2020-11-03 10:02:45 +01:00
d171d84595
Merge branch 'ent-6678-Bug-en-select-de-nodos-de-TODOS-los-items-en-metaconsola' into 'develop'
...
Fix combo server in reports builder
See merge request artica/pandorafms!3589
2020-10-30 14:43:38 +01:00
946c548244
Merge branch 'ent-6626filtros-de-eventos-personalizados-no-guardia-varios-apartados' into 'develop'
...
Primeras modificaciones del filtro de eventos
See merge request artica/pandorafms!3585
2020-10-30 14:42:41 +01:00
f1080757a0
Fix combo server in reports builder
2020-10-30 13:30:59 +01:00
326d1dac49
Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red
2020-10-30 10:38:30 +01:00
20fa959a0c
Merge remote-tracking branch 'origin/develop' into ent-6577-creacion-de-usuario-con-global-profile-administrator-no-deberia-necesitar-anadirle-mas-perfiles
...
Conflicts:
pandora_console/godmode/users/configure_user.php
2020-10-29 17:26:05 +01:00
8e09a30a05
WIP Networklink POC
2020-10-29 17:20:16 +01:00
f8511de008
fixed error 6495
2020-10-29 16:39:00 +01:00
b972bc627a
Update event_edit_filter.php
2020-10-29 15:04:53 +01:00
6bcca915ba
resuelto el error que vaciaba el module search
2020-10-29 14:57:54 +01:00
4f3e09c6c3
Merge branch 'ent-6488-URL-creación-de-agentes-sin-redireccionar-se-crea-agente-con-grupo-0' into 'develop'
...
Ent 6488 url creación de agentes sin redireccionar se crea agente con grupo 0
See merge request artica/pandorafms!3541
2020-10-29 13:43:10 +01:00
d5a57156dc
Merge branch 'ent-6487-visual-console-favourites-page-constantly-reloads' into 'develop'
...
Fix continous reload page cased by automatic form submit
See merge request artica/pandorafms!3561
2020-10-29 13:22:10 +01:00
8144d3bc95
Merge branch 'ent-6497-bug-en-item-group-alert-report-seleccionando-el-grupo-all' into 'develop'
...
Forced recursion while selecting All group - group_alert_report
See merge request artica/pandorafms!3543
2020-10-29 12:40:43 +01:00
83233b6192
Merge branch 'ent-6485-bug-en-la-recursion-de-grupos-del-item-agents-modules-de-informes' into 'develop'
...
groups_get_children and propagate update
See merge request artica/pandorafms!3545
2020-10-29 12:36:49 +01:00
5ae4330121
Merge branch 'ent-6555-No-hay-mensaje-de-aviso-al-eliminar-perfil-del-usuario-en-metaconsola-da-error' into 'develop'
...
Ent 6555 no hay mensaje de aviso al eliminar perfil del usuario en metaconsola da error
See merge request artica/pandorafms!3551
2020-10-29 12:21:57 +01:00
6112b3e932
minor fix
2020-10-29 10:55:07 +01:00
7a776cd270
Merge branch 'ent-6469-entities-componentes-remotos' into 'develop'
...
Ent 6469 entities componentes remotos
Closes pandora_enterprise#6469
See merge request artica/pandorafms!3569
2020-10-28 17:15:59 +01:00
8a47210dd5
Merge branch 'ent-6531-Bug-en-item-Simple-graph-de-informes-metaconsola' into 'develop'
...
fixed error report selector modules in metaconsole
See merge request artica/pandorafms!3544
2020-10-28 15:18:22 +01:00
94cfd51501
Ent 6512 error en acls de alertas
2020-10-28 11:41:30 +01:00
fa9f4bca95
Merge branch 'ent-6580-bug-en-la-edicion-de-grupos-asignando-como-padre-a-si-mismo' into 'develop'
...
exclude branch from select_for_Groups given group_id
See merge request artica/pandorafms!3550
2020-10-28 11:19:05 +01:00
f744261821
minor fix
2020-10-27 16:03:35 +01:00
2b2acefa31
Snmp and WMI in recon task move open
2020-10-27 15:02:05 +01:00
315e522b2e
added check for element
2020-10-27 12:01:38 +01:00
be09fb8a29
Fixed code error
2020-10-26 10:36:43 +01:00
7ff518f4aa
Solved issues with entities
2020-10-26 10:34:31 +01:00
f3de0540fc
Fix continous reload page cased by automatic form submit
2020-10-22 19:56:13 +02:00
cd52b30eb5
visual fixes
2020-10-22 15:47:39 +02:00
f2143545b3
Able to create users without profile assignment
2020-10-22 13:35:42 +02:00
def59508ae
changed behavior of all group acl check and fixed acl vulnerabilities
2020-10-22 12:00:44 +02:00
335e74c26b
Fixed warning message in metaconsole
2020-10-22 09:53:59 +02:00
ea87392bc1
minor fix
2020-10-21 17:03:46 +02:00
bfa5b81ee8
Added server component status - crash -
2020-10-21 14:03:46 +02:00
42cca865ac
groups_get_children and propagate update
2020-10-21 11:38:57 +02:00
73ff2cff9d
fixed error report selector modules in metaconsole
2020-10-20 18:30:53 +02:00
4babcbe647
Forced recursion while selecting All group - group_alert_report
2020-10-20 18:25:04 +02:00
3c95d17482
Fixed new_agent
2020-10-20 16:15:42 +02:00
53362f6424
update branch
2020-10-13 15:04:33 +02:00
db716d6b1e
Merge remote-tracking branch 'origin/develop' into ent-3653-finalizacion-de-paradas-planificadas-al-dia-siguiente-de-su-comienzo
2020-10-13 13:54:51 +02:00
5ad265cbc8
Merge branch 'ent-6456-error-critico-operaciones-masivas-grupo-0' into 'develop'
...
Fix unhandled extra-options in group selector inclusions
See merge request artica/pandorafms!3518
2020-10-09 10:23:18 +02:00
b6ee1a9434
Merge branch 'ent-6432-No-funciona-el-envio-de-mails-by-default' into 'develop'
...
fixed email test
See merge request artica/pandorafms!3504
2020-10-08 20:01:33 +02:00
a4b2e38ffc
Fix unhandled extra-options in group selector inclusions
2020-10-08 16:41:26 +02:00
5a5fb6eeea
Allow define time start greater than time end in weekly planed downtimes
2020-10-07 14:49:46 +02:00
2ba412cb55
Minor fixes discovery tasklist usability
2020-10-07 10:29:43 +02:00
40864eee6b
add new token to report
2020-10-07 09:34:43 +02:00
848f60229a
updates on 2FA all users feature
2020-10-06 17:02:58 +02:00
2915a3bd35
fixed email test
2020-10-06 11:07:46 +02:00
1b5ccfb20a
Add new token chart fit to content
2020-10-05 17:03:30 +02:00
e403c781ea
Merge branch 'ent-5822-prueba-concepto-modal-selector-de-grupos' into 'develop'
...
Group selection improvement
See merge request artica/pandorafms!3450
2020-10-05 13:11:23 +02:00
e5fe9d5c29
feature 2FA_all_users
2020-10-05 12:29:51 +02:00
48831b5032
add new options char
2020-10-05 12:04:46 +02:00
27c2fa0860
minor fix
2020-10-05 11:52:41 +02:00
2187f9d0c9
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
2020-10-02 14:56:07 +02:00
ea3f147bad
minor fixes group selector
2020-10-02 14:31:41 +02:00
a5d5a45cac
add render graph to reports
2020-10-02 14:16:55 +02:00
3956fb1d2f
implemented new server file editor
2020-10-01 17:39:34 +02:00
b07d24ed25
Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos
...
Conflicts:
pandora_console/include/functions_api.php
pandora_console/operation/events/events.php
2020-09-30 18:38:27 +02:00
95f58776c8
fixes group selection
2020-09-30 17:47:44 +02:00
f8666adf0f
F2 feature
2020-09-30 14:20:57 +02:00
311186a70a
Merge branch 'ent-6328-Consola-movil-imagenes-rotas' into 'develop'
...
fixed mobile console donut charts
See merge request artica/pandorafms!3470
2020-09-30 13:19:06 +02:00
b7c2913071
Avoid create agent if no group is selected
2020-09-29 15:49:10 +02:00
d73c215b91
Avoid create agent if no group is selected
2020-09-29 15:48:20 +02:00
5d63bc547e
Group selection review
2020-09-29 14:22:58 +02:00
5f4893ef1a
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
2020-09-29 12:47:11 +02:00
9d0becc012
Added other password fields
2020-09-29 10:12:49 +02:00
6a21a668bf
Added control for reveal passwords
2020-09-29 09:44:20 +02:00
f69166bd53
Updates style width group selector
2020-09-28 18:04:46 +02:00
029a447e70
gcp minor fixes
2020-09-28 13:55:26 +02:00
ef043a169a
Increased number of max macro data fields from 15 to 20
2020-09-25 10:47:36 +02:00
4880cbd29b
Merge branch 'ent-6134-cambio-visual-en-checkbox-de-informes' into 'develop'
...
Ent 6134 cambio visual en checkbox de informes
See merge request artica/pandorafms!3448
2020-09-23 14:07:07 +02:00
f8bfd6c99b
Merge branch 'ent-6119-cambiar-critical-warning-status-por-critical-warning-threshold' into 'develop'
...
Ent 6119 cambiar critical warning status por critical warning threshold
See merge request artica/pandorafms!3423
2020-09-23 14:06:09 +02:00
a07f1d891f
Ent 6262 um operaciones masivas
2020-09-23 11:36:15 +02:00
12bc9e2b4e
Merge branch 'ent-6195-10482-entities-en-tabla-de-auditoria' into 'develop'
...
Ent 6195 10482 entities en tabla de auditoria
See merge request artica/pandorafms!3411
2020-09-23 09:38:29 +02:00
48e19f3b59
add condition
2020-09-22 12:15:05 +02:00
422b0ac71d
Merge branch 'ent-6050-tamano-de-la-ventana-de-front-page-for-custom-reports-muy-pequeno-en-los-visual-styles' into 'develop'
...
Ent 6050 tamano de la ventana de front page for custom reports muy pequeno en los visual styles
See merge request artica/pandorafms!3446
2020-09-22 11:11:26 +02:00
cc62975202
Merge branch 'ent-6118-create-user-user-id' into 'develop'
...
Ent 6118 create user user
See merge request artica/pandorafms!3444
2020-09-22 10:09:59 +02:00
c6165fbdee
fixed mobile console donut charts
2020-09-21 15:13:07 +02:00
d450213b95
Merge branch 'ent-6322-10688-edicion-usuarios-tecla-intro-borra-perfil' into 'develop'
...
Avoid deleting profiles while pressing enter in user details (management)
See merge request artica/pandorafms!3456
2020-09-18 14:35:32 +02:00
adceae8dda
minor fixes
2020-09-18 09:40:26 +02:00
0d19f500b1
Merge branch 'ent-6153-AADCM-Reset-counter-for-non-sustained-alerts' into 'develop'
...
checkd option by default on creation
See merge request artica/pandorafms!3454
2020-09-18 09:27:22 +02:00
957eae39f7
Merge branch 'ent-6169-10444-Bulk-Operations-sobre-modulo-SNMP-no-funciona' into 'develop'
...
fix snmp version update
See merge request artica/pandorafms!3426
2020-09-18 09:25:46 +02:00
4fb69f343a
minor fix
2020-09-17 19:32:28 +02:00
5c511bb88e
Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos
2020-09-17 16:57:56 +02:00
bc166dfba2
module custom id in event list + minor fixes
2020-09-17 16:51:23 +02:00
4c8414cda5
Merge branch 'ent-4292-TinyMCE-status-bar' into 'develop'
...
Solved issue with TinyMCE status bar. Now can view it properly
See merge request artica/pandorafms!2910
2020-09-17 15:14:33 +02:00
867fccf604
Custom id improvements
2020-09-17 14:38:01 +02:00
536e24d09e
Merge branch 'ent-6288-No-se-puede-generar-Log-Report-item-en-informes' into 'develop'
...
fix agents selector check
See merge request artica/pandorafms!3433
2020-09-17 12:45:36 +02:00
0e3c10a698
Merge
2020-09-17 10:35:18 +02:00
4174d9910f
Merge branch 'ent-6279-vulnerabilidades-XSS' into 'develop'
...
Ent 6279 vulnerabilidades xss
See merge request artica/pandorafms!3445
2020-09-17 10:17:11 +02:00
b97014f577
Cleaned traces
2020-09-16 17:40:18 +02:00
9ac9a75658
Fixed mistake with update in os list
2020-09-16 14:47:33 +02:00
81cdfdbaa1
Merge branch 'ent-6289-Item-import-text-from-url-tiene-que-ser-items-de-la-ruta-de-consola-si-no-falla' into 'develop'
...
added warning message
See merge request artica/pandorafms!3442
2020-09-16 13:32:37 +02:00
8a6920a973
minor change
2020-09-16 11:43:53 +02:00
fae8070e29
Report macros now apply on showing report
2020-09-15 19:57:52 +02:00
589d9c1d7c
minor fixes
2020-09-14 17:48:38 +02:00
d86d0ff090
Avoid deleting profiles while pressing enter in user details (management)
2020-09-14 17:42:04 +02:00
5bd208a95c
checkd option by default on creation
2020-09-14 13:43:18 +02:00
a70fc200b7
Fixed bug in unit field
2020-09-14 09:27:01 +02:00
77e465fff9
fixed errors in massive operations
2020-09-11 14:35:32 +02:00
3374a89ae0
Group selection improvement
2020-09-11 14:34:41 +02:00
4b531a96c2
Changed checkbox switch
2020-09-10 17:48:07 +02:00
eaa4924a0f
Fixed visual bug
2020-09-09 17:16:25 +02:00
58f521e8b5
Avoid XSS in Edit OS form.
2020-09-09 15:28:11 +02:00
99bb0eb809
Avoid XSS in Remote components form.
2020-09-09 14:44:19 +02:00
bcf5d3ca05
Fixed visual bug
2020-09-09 14:32:02 +02:00
8f477b1833
Avoid XSS in List of special days. Added control for only show help tip if description has data
2020-09-09 12:49:43 +02:00
de49530fd1
Avoid XSS in User management
2020-09-09 11:58:09 +02:00
77496bd5a2
added warning message
2020-09-09 09:35:21 +02:00
c4e192f7f7
fix agents selector check
2020-09-04 13:54:07 +02:00
d4b44d33a0
fix snmp version update
2020-09-01 17:39:25 +02:00
f75a0a98f1
add condition in UM if group equals 0
2020-09-01 13:26:10 +02:00
05fadd167d
Changed names
2020-09-01 12:30:55 +02:00
fe8e7b7d0c
Add new filter search actions
2020-08-31 12:48:00 +02:00
b96cade165
new options 24x7 sla,availavility reports
2020-08-31 12:33:41 +02:00
f477919433
Fixed entities in query
2020-08-28 13:56:15 +02:00
5565d839c3
Merge remote-tracking branch 'origin/develop' into ent-6093-error-fields-en-alertas-snmp
2020-08-26 09:00:35 +02:00
516de686cf
Fixed issue
2020-08-25 15:03:19 +02:00
1b14d83fd4
Added None value
2020-08-25 10:58:26 +02:00
0512149ee4
Merge branch 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' into 'develop'
...
Ent 6102 edicion nombre sincronizacion alertas metaconsola
See merge request artica/pandorafms!3364
2020-08-20 14:43:17 +02:00
77142a0c1a
fixed vulnerability
2020-08-14 11:42:49 +02:00
86bfcbcd90
changes on user list
2020-08-12 13:20:53 +02:00
85d8e1f796
Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola'
...
# Conflicts:
# pandora_console/extras/mr/40.sql
# pandora_console/godmode/alerts/configure_alert_template.php
2020-08-07 13:17:41 +02:00
1ab4e89a14
Merge branch 'ent-6036-Error-en-edicion-de-acciones-de-alerta' into 'develop'
...
fix empty check condition
See merge request artica/pandorafms!3359
2020-08-07 09:46:09 +02:00
a123eaa18c
Merge branch 'ent-5609-link-to-credential-store-from-remote-module-creation' into 'develop'
...
Added link to credential store from module creation
See merge request artica/pandorafms!3363
2020-08-07 09:45:43 +02:00
ef73e7a73c
Merge branch 'ent-6099-bug-al-duplicar-modulo' into 'develop'
...
resolved error with duplucated modules
See merge request artica/pandorafms!3357
2020-08-07 09:42:08 +02:00
7b09c1e943
Ent 6029 meta groups delete bug
2020-08-07 09:40:46 +02:00
bfe504b3be
Merge branch 'ent-6053-error-envio-informe-mail-vista-informes' into 'develop'
...
Fixed report sendmail success message
See merge request artica/pandorafms!3353
2020-08-07 09:37:10 +02:00
35f231ac8c
Restored alert actions help (needed for macros)
2020-08-07 09:36:43 +02:00
20addda9fe
Fixed missing ckbox custom graphs
2020-08-07 09:35:27 +02:00
248c5936b6
fixed error with filter form
2020-08-07 09:19:46 +02:00
bb2fb0c631
Merge remote-tracking branch 'origin/develop' into ent-6099-bug-al-duplicar-modulo
2020-08-07 08:47:11 +02:00
cbc8630dfc
Ent 5206 9287 exportacion a csv con dato con muchos decimales y miles trae confusion
2020-07-23 16:52:24 +02:00
9f2e722787
Ent 6034 improvement of the um profile
2020-07-23 13:26:39 +02:00
2c535bb747
Fixed labels mode classic
2020-07-21 15:06:41 +02:00
7d69cbe65d
Merge branch 'ent-5907-bug-status-modulo-prediccion' into 'develop'
...
Solved issue with thresholds in prediction modules
Closes pandora_enterprise#5907
See merge request artica/pandorafms!3293
2020-07-21 10:48:06 +02:00
51f2db16cb
Merge branch 'ent-5587-no-tiene-en-cuenta-las-acciones-default-filtrar-alertas' into 'develop'
...
Changed query for get default actions in templates
Closes pandora_enterprise#5587
See merge request artica/pandorafms!3320
2020-07-20 07:54:08 +02:00
249e4a737a
Merge branch 'ent-5806-post-process-genera-lineas-repetidas' into 'develop'
...
Changed nothing option for avoid duplicates
Closes pandora_enterprise#5806
See merge request artica/pandorafms!3297
2020-07-20 07:52:48 +02:00
8915492323
Merge branch 'ent-6004-error-visual-en-el-filtrado-de-componentes-en-metaconsola' into 'develop'
...
fixed visual error tag meta
See merge request artica/pandorafms!3318
2020-07-20 07:51:57 +02:00
100db2d4db
Merge branch 'ent-5920-Fallo-al-pinchar-en-visual-console-manager-en-metaconsola' into 'develop'
...
Fixed error link builder in VC
See merge request artica/pandorafms!3275
2020-07-16 12:11:51 +02:00
f3ad52e0fa
Ent 5532 edicion creacion de templates acciones comandos modo centralizado
2020-07-13 12:23:46 +02:00
492c7f90cf
Merge branch 'ent-5670-no-aparecen-los-valores-introducidos-al-crear-una-platilla-de-alerta' into 'develop'
...
fixed error
See merge request artica/pandorafms!3321
2020-07-13 11:13:24 +02:00
fbb251f358
Merge branch 'ent-5468-parsear-campos-exec-server-por-si-hay-espacios-sobre-todo-ip' into 'develop'
...
Ent 5468 parsear campos exec server por si hay espacios sobre todo ip
See merge request artica/pandorafms!3334
2020-07-13 10:54:42 +02:00
c0661fc1b7
fixed legend max 10 modules for chart
2020-07-13 10:02:56 +02:00
8b24faa129
Merge branch 'ent-2002-Remote-component-centralizado' into 'develop'
...
Blocked create and update of remote component group when meta has centralized management
Closes pandora_enterprise#2002
See merge request artica/pandorafms!3272
2020-07-10 10:11:25 +02:00
f3d1a80252
Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola'
...
# Conflicts:
# pandora_console/extras/mr/40.sql (solved)
2020-07-10 08:19:07 +02:00
009d5c7bc0
Merge remote-tracking branch 'origin/develop' into ent-6000-operaciones-masivas-de-servicios
2020-07-09 16:51:50 +02:00
df9ab22fc1
Merge branch 'ent-6012-servicios-dinamicos' into 'develop'
...
MR change smart services
See merge request artica/pandorafms!3316
2020-07-08 18:01:16 +02:00
8925821a2b
Merge branch 'ent-6045-snmp-alert-field-10-se-borra' into 'develop'
...
Fixed minor bug field10 param
See merge request artica/pandorafms!3346
2020-07-08 11:04:47 +02:00
5e039adb26
Solve the issue for alerts, os names and tags
2020-07-07 11:05:19 +02:00
37a97cd2ad
Added link to credential store from module creation
2020-07-07 10:26:19 +02:00
cf26293a33
WIP massive services
2020-07-06 19:35:31 +02:00
0ef7ff1198
fix empty check condition
2020-07-06 14:35:22 +02:00
534aa8c7c5
Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
2020-07-06 14:31:55 +02:00
4ad7735dd7
resolved error with duplucated modules
2020-07-06 10:09:36 +02:00
76d724321f
Fixed report sendmail success message
2020-07-03 14:18:30 +02:00
63df6c15f0
Merge branch 'develop' into ent-6030-Problema-codificacion
2020-07-01 16:39:00 +02:00
88d72b3d66
Fixed minor bug field10 param
2020-07-01 14:41:31 +02:00
5502ee6b01
Fixed bug in module manage meta
2020-07-01 10:16:55 +02:00
faaf14bfd4
Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
...
Conflicts:
pandora_console/extras/mr/39.sql
pandora_console/include/lib/Module.php
2020-06-30 17:04:33 +02:00
311b259684
Backup upload
2020-06-30 12:16:51 +02:00
db452f41f5
Added trim in address
2020-06-26 10:11:41 +02:00
02bffc7e0d
Merge branch 'ent-5935-Logs-de-la-consola-refactorizacion' into 'develop'
...
changed console and audit log locations
See merge request artica/pandorafms!3278
2020-06-25 15:28:13 +02:00
36e57ddd1d
New report last value
2020-06-25 12:18:37 +02:00
a8671078f1
Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
...
Conflicts:
pandora_console/install.php
2020-06-25 11:25:43 +02:00
5aef38dd72
Merge branch 'ent-5186-Texto-HTML-plano-en-apartado-de-los-reports-en-visual-styles' into 'develop'
...
fixes in reports front page default setup
See merge request artica/pandorafms!3250
2020-06-24 12:43:23 +02:00
549a17a428
Ent 5470 se duplican los sistemas operativos
2020-06-23 14:45:04 +02:00
9ce4c90456
Merge branch 'develop' into 'ent-5186-Texto-HTML-plano-en-apartado-de-los-reports-en-visual-styles'
...
# Conflicts:
# pandora_console/godmode/setup/setup_visuals.php
2020-06-23 10:04:24 +02:00
cec16d01b8
Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion
2020-06-23 09:56:21 +02:00
a81e4acbb7
Merge branch 'develop' into 'ent-6030-Problema-de-codificacion'
...
# Conflicts:
# pandora_console/include/functions_config.php
2020-06-23 09:28:21 +02:00
6520ad2107
Added setup token
2020-06-23 09:21:15 +02:00
7be71080eb
Merge branch 'ent-5959-xxs-special-day' into 'develop'
...
ignore keys xss special days
See merge request artica/pandorafms!3323
2020-06-22 09:37:07 +02:00
487ab4e86a
Merge branch 'ent-5956-xss-manage-agent-group' into 'develop'
...
ignore keys on xss manage angent groups
See merge request artica/pandorafms!3322
2020-06-22 09:25:05 +02:00
d64ff918d6
Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion
2020-06-19 12:22:28 +02:00
1243968872
Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion
2020-06-19 12:12:52 +02:00
1f4de3ee4d
ignore keys xss special days
2020-06-19 10:53:14 +02:00
415a8aa8b6
ignore keys on xss manage angent groups
2020-06-19 10:44:43 +02:00
Daniel Barbero Martin
alejandro-campos
marcos
Jose Gonzalez
Luis Calvo
fbsanchez
Daniel Maya
Daniel Rodriguez
manuel.montes
Alejandro Fraguas