Commit Graph

22513 Commits

Author SHA1 Message Date
Daniel Rodriguez c6da03316c Merge branch 'ent-7711-Fallo-al-mover-un-ítem-static-image-que-tuviera-vinculado-un-network-link' into 'develop'
Ent 7711 fallo al mover un ítem static image que tuviera vinculado un network link

See merge request artica/pandorafms!4346
2021-09-22 08:59:44 +00:00
Daniel Rodriguez f78d2e8a4b Merge branch 'ent-7697-varios-bugs-visuales-en-modal-de-configuracion-de-widget-metaconsola' into 'develop'
Fix widgets style bugs

See merge request artica/pandorafms!4272
2021-09-22 08:58:51 +00:00
artica 61e2a3f21b Auto-updated build strings. 2021-09-22 01:00:21 +02:00
alejandro.campos@artica.es d9dd7f211e created report for ipam networks 2021-09-21 16:02:17 +02:00
alejandro.campos@artica.es fc959f0bc6 created report for ipam networks 2021-09-21 15:59:14 +02:00
Daniel Rodriguez a252bbedac Merge branch 'ent-7371-comportamiento-extrano-editor-ace' into 'develop'
Fixed monospaced

Closes pandora_enterprise#7371

See merge request artica/pandorafms!4273
2021-09-21 13:18:43 +00:00
Daniel Rodriguez b02ecc7cae Merge branch 'ent-7473-11796-mala-representacion-de-percentil-en-graficas-personalizadas' into 'develop'
fixed error with percentiles in graphs

See merge request artica/pandorafms!4312
2021-09-21 13:18:18 +00:00
Daniel Rodriguez ce40b36923 Merge branch 'ent-7582-anadir-selector-horas-eventos' into 'develop'
Ent 7582 anadir selector horas eventos

Closes pandora_enterprise#7582

See merge request artica/pandorafms!4266
2021-09-21 13:17:30 +00:00
Daniel Rodriguez 1ac070d35d Merge branch 'ent-7339-warning-module-templates' into 'develop'
Improve pen list handling

Closes pandora_enterprise#7339

See merge request artica/pandorafms!4263
2021-09-21 13:16:44 +00:00
Daniel Rodriguez 3e4fafadf8 Merge branch 'ent-8013-Consolas-Visuales-en-Metaconsola-rotas' into 'develop'
Ent 8013 consolas visuales en metaconsola rotas

See merge request artica/pandorafms!4421
2021-09-21 13:07:35 +00:00
Daniel Maya 30ab96003c #6296 Fixed info popup and status images 2021-09-21 13:22:37 +02:00
artica d50cf7431b Auto-updated build strings. 2021-09-21 01:00:17 +02:00
Daniel Maya aef3e8affd #8013 Fixed percentile 2021-09-20 17:51:56 +02:00
Jose Gonzalez 4f64b7b64b Fix entities 2021-09-20 13:55:46 +02:00
Jose Gonzalez cd1b7daa00 Fix select fields size 2021-09-20 12:16:08 +02:00
artica 6153237481 Auto-updated build strings. 2021-09-20 01:00:17 +02:00
artica 43c22e9ec7 Auto-updated build strings. 2021-09-19 01:00:12 +02:00
artica 8d2d7f16de Auto-updated build strings. 2021-09-18 01:00:19 +02:00
Calvo 698ddd47df Fix api get group by id bug with or withouth url encode separator 2021-09-17 13:51:47 +02:00
Calvo 796f083730 Fix api get group by id bug 2021-09-17 11:52:30 +02:00
fbsanchez ddbb06a967 Merged policies conf fixer tool 2021-09-17 11:46:59 +02:00
Jose Gonzalez 3af47c0e5f Open network maps 2021-09-17 10:45:01 +02:00
Daniel Maya 29012dc968 resolved conflict 2021-09-17 09:25:01 +02:00
artica 33788c9238 Auto-updated build strings. 2021-09-17 01:00:18 +02:00
fbsanchez 47633b4794 A better explanation 2021-09-16 21:57:23 +02:00
fbsanchez 187c6700b1 Simplified Entity 2021-09-16 21:54:12 +02:00
fbsanchez b33be80be3 Entity dynamic method calling improved 2021-09-16 21:16:49 +02:00
Calvo 0778952461 Merge remote-tracking branch 'origin/develop' into ent-7449-autorefresh-en-vistas-que-no-existen 2021-09-16 16:32:27 +02:00
Jose Gonzalez a1869fcef0 Fix io_safe_output for ldap admin pass 2021-09-16 12:08:46 +02:00
artica d7452d19e8 Auto-updated build strings. 2021-09-16 01:00:22 +02:00
Calvo bd1e50dd48 Removed automatic assignation of PHP configuration variables 2021-09-15 12:20:40 +02:00
artica 4cd17dca40 Auto-updated build strings. 2021-09-15 01:00:20 +02:00
Calvo e30fb70f11 Fix tag treeview level2 2021-09-14 13:03:38 +02:00
vgilc 538da5ff30 Merge branch 'ent-7998-actualizar-mr' into 'develop'
updated MR and current_package token

See merge request artica/pandorafms!4406
2021-09-14 10:24:44 +00:00
Calvo c1332a1064 updated MR and current_package token 2021-09-14 12:20:53 +02:00
artica cf3c328d18 Auto-updated build strings. 2021-09-14 01:00:17 +02:00
alejandro.campos@artica.es ae2dc6a0b6 moved to mr 49 2021-09-13 14:54:33 +02:00
Daniel Maya 3dc9165209 #7976 Fixed agent limit 2021-09-13 13:30:14 +02:00
artica c231c82e93 Updated version and build strings. 2021-09-13 12:08:23 +02:00
Calvo b039935470 Update Mr to 49 2021-09-13 10:45:22 +02:00
Calvo bb1e0a0b8b API set create alert template metaconsole support 2021-09-13 10:10:52 +02:00
artica 4ec67b51b7 Auto-updated build strings. 2021-09-13 01:00:16 +02:00
artica 4d2a52fcce Auto-updated build strings. 2021-09-12 01:00:13 +02:00
artica 48ee2d3fcd Auto-updated build strings. 2021-09-11 01:00:20 +02:00
Calvo 82e5b649d6 Css content moved to js to allow translation 2021-09-10 15:10:20 +02:00
Daniel Rodriguez 4a8461c2d3 Merge branch 'ent-7885-12292-General-Report-no-ordena-como-debe' into 'develop'
Ent 7885 12292 general report no ordena como debe

See merge request artica/pandorafms!4378
2021-09-10 11:17:54 +00:00
Daniel Rodriguez 93b4d81264 Merge branch 'ent-7730-visualizacion-update-manager-en-tema-oscuro' into 'develop'
add update manager black background update manager

See merge request artica/pandorafms!4270
2021-09-10 11:11:24 +00:00
Daniel Rodriguez 8ea02ab4c2 Merge branch 'ent-7991-bug-selector-css' into 'develop'
Fix name for css

Closes pandora_enterprise#7991

See merge request artica/pandorafms!4397
2021-09-10 11:08:24 +00:00
Jose Gonzalez a774d67f2a Merge remote-tracking branch 'origin' into ent-7514-pasar-networkmaps-a-open 2021-09-10 12:50:23 +02:00
Junichi Satoh 1c3ec719d7 Updated Japanese console translations. 2021-09-10 17:57:44 +09:00
Marcos Alconada 99a47b0739 set style on um-last and next button 2021-09-10 07:49:40 +00:00
Daniel Maya 10f1894b82 #7982 Added id_template_fields and id_template_conditions 2021-09-10 09:46:00 +02:00
Jose Gonzalez 316611f432 Fix name for css 2021-09-10 09:25:01 +02:00
artica 12b7cd0c63 Auto-updated build strings. 2021-09-10 01:00:21 +02:00
Daniel Rodriguez 1a66858020 Merge branch 'ent-7984-falla-chequeo-de-acls-en-la-api' into 'develop'
Fixed API access

See merge request artica/pandorafms!4395
2021-09-09 08:07:15 +00:00
artica f2875b5a86 Auto-updated build strings. 2021-09-09 01:00:24 +02:00
Daniel Rodriguez a18fd6ab0f Merge branch 'ent-7706-descuadre-texto-e-icono-de-los-botones' into 'develop'
fixed icon button position

See merge request artica/pandorafms!4243
2021-09-08 14:40:34 +00:00
Daniel Rodriguez 2e7dadb04e Merge branch 'ent-7591-mensaje-error-timeout-snmp-en-browser' into 'develop'
Fix format on snmp browser error messages

See merge request artica/pandorafms!4276
2021-09-08 14:37:14 +00:00
Daniel Rodriguez 3b5545cde4 Merge branch 'ent-7720-bug-visual-en-correlacion-de-alertas' into 'develop'
fixed error

See merge request artica/pandorafms!4244
2021-09-08 13:35:45 +00:00
Daniel Rodriguez 4372837f36 Merge branch 'ent-7961-bug-visual-en-las-graficas-de-log-viewer' into 'develop'
Log viewer graph capture model visual  bug

See merge request artica/pandorafms!4393
2021-09-08 13:23:22 +00:00
Daniel Rodriguez 6fff287b70 Merge branch 'ent-7314-comillas-comandos-remotos' into 'develop'
Added tip for notice to users for use single quotation

Closes pandora_enterprise#7314

See merge request artica/pandorafms!4376
2021-09-08 13:14:54 +00:00
fbsanchez 52ba314612 Fixed API access 2021-09-08 14:28:48 +02:00
José González 740a82253a Fixed quot string 2021-09-08 12:20:38 +02:00
Daniel Rodriguez 6599f80dff Merge branch 'ent-7444-Metaconsole-Triggered-alerts-report' into 'develop'
Fixed forget metaconsole alerts

Closes pandora_enterprise#7444

See merge request artica/pandorafms!4388
2021-09-08 10:14:22 +00:00
Daniel Maya 240caa3ad1 #7969 Fixed span with truncate 2021-09-08 12:14:03 +02:00
Calvo 44663c914a Log viewer graph capture model visual bug 2021-09-08 10:44:57 +02:00
artica 7e5dc6a9c4 Auto-updated build strings. 2021-09-08 01:00:19 +02:00
artica ecd818bbb7 Auto-updated build strings. 2021-09-07 01:00:19 +02:00
Calvo 62775e0dae Fix api group_id_by_name with url enconde separator 2021-09-06 18:13:14 +02:00
Jose Gonzalez e8eb77058b Fix 2021-09-06 15:19:23 +02:00
Jose Gonzalez bb743cb87f Fixed forget metaconsole alerts 2021-09-06 14:08:24 +02:00
Daniel Rodriguez 42d8bb6003 Merge branch 'ent-7801-Vulnerabilidad-File-Manager' into 'develop'
Fix vulnerability

Closes pandora_enterprise#7801

See merge request artica/pandorafms!4385
2021-09-06 11:23:26 +00:00
artica 6bb994f4b7 Auto-updated build strings. 2021-09-06 01:00:37 +02:00
artica 42a999b207 Auto-updated build strings. 2021-09-05 01:00:13 +02:00
artica 22a0709953 Auto-updated build strings. 2021-09-04 01:00:22 +02:00
Jose Gonzalez fa101db3b6 Fix vulnerability 2021-09-03 13:30:15 +02:00
Daniel Rodriguez 3f5d37493e Merge branch 'ent-7955-500-en-link-al-agente-desde-widget-list-of-latest-events-dashboard-metaconsola' into 'develop'
fixed error with node link events list dashboard

See merge request artica/pandorafms!4382
2021-09-03 09:44:49 +00:00
artica 30c6a78b35 Auto-updated build strings. 2021-09-03 01:00:40 +02:00
marcos 8b048c8c19 fixed error with node link events list dashboard 2021-09-02 16:43:16 +02:00
Jose Gonzalez ce2bdc1917 Fixed issues uploading files and fix vulnerability 2021-09-02 13:38:55 +02:00
Jose Gonzalez 0c96fd6f71 Merge remote-tracking branch 'origin' into ent-7804-modificar-comportamiento-file-manager 2021-09-02 12:43:05 +02:00
marcos 3547c09a16 add black theme on update manager online 2021-09-02 12:05:54 +02:00
artica 737943fee2 Auto-updated build strings. 2021-09-02 01:00:55 +02:00
José González 6b90b33a26 Merge branch 'develop' into 'ent-7804-modificar-comportamiento-file-manager'
# Conflicts:
#   pandora_console/include/functions_filemanager.php
2021-09-01 15:33:44 +00:00
marcos 1bec5014c7 resoled conflcits 2021-09-01 16:58:36 +02:00
Jose Gonzalez 423bd106d5 Fix issues 2021-09-01 16:57:48 +02:00
marcos f49d6d3088 fixed error with node link events list dashboard 2021-09-01 16:54:07 +02:00
Daniel Rodriguez b8e1391ffd Merge branch 'ent-7911-errores-file-manager' into 'develop'
Fixed issues with files upload

Closes pandora_enterprise#7911

See merge request artica/pandorafms!4370
2021-09-01 13:18:10 +00:00
Daniel Rodriguez fedc46dc1d Merge branch 'ent-7953-mapas-con-estilos-mal' into 'develop'
Fix map styles

See merge request artica/pandorafms!4380
2021-09-01 09:11:01 +00:00
Daniel Rodriguez 8397f778b3 Merge branch 'ent-6885-11172-añadir-opcion-de-nor-en-monitor-detail' into 'develop'
add not option in monitor detail filter

See merge request artica/pandorafms!4112
2021-09-01 08:54:49 +00:00
Daniel Rodriguez f94ad30df4 Merge branch 'ent-7506-ediciones-acciones-modo-advanced-no-amplia' into 'develop'
fixed error with manual resize advanced action alerts

See merge request artica/pandorafms!4381
2021-09-01 08:52:53 +00:00
Jose Gonzalez 73cd0fd17e Changed content of advice 2021-09-01 10:29:25 +02:00
Calvo de0352f81c MR changes 2021-09-01 09:35:31 +02:00
Calvo d5910e8a3a Merge remote-tracking branch 'origin/develop' into ent-7587-error-nombre-idioma-aleman 2021-09-01 09:14:39 +02:00
artica 10dd28246c Auto-updated build strings. 2021-09-01 01:00:24 +02:00
Daniel Rodriguez a853c8a0c6 Merge branch 'ent-7786-agentes-asignados-a-politicas-en-metaconsola' into 'develop'
Ent 7786 agentes asignados a politicas en metaconsola

See merge request artica/pandorafms!4280
2021-08-31 13:47:00 +00:00
Jose Gonzalez 3570ee6e04 Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta 2021-08-31 14:49:53 +02:00
Daniel Rodriguez f12f3d6cf4 Merge branch 'ent-7915-Error-SQL-en-filtro-de-custom-field-en-informe-de-inventario-de-agentes' into 'develop'
Ent 7915 error sql en filtro de custom field en informe de inventario de agentes

See merge request artica/pandorafms!4375
2021-08-31 10:05:31 +00:00
Daniel Rodriguez f53969731a Merge branch 'ent-7638-11735-vista-de-eventos-en-dashboard-menus-descolocados' into 'develop'
fixed error with wrong event list dialog in dashboard

See merge request artica/pandorafms!4374
2021-08-31 10:03:30 +00:00
marcos 3cb2b92774 fixed error with manual resize advanced action alerts 2021-08-31 11:47:36 +02:00