Commit Graph

28673 Commits

Author SHA1 Message Date
daniel a7baab0aba Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-24 12:07:32 +02:00
rafael 27e37f6897 11944 adding patch 773.2 changes on develop 2023-08-24 12:04:27 +02:00
Matias Didier 9e747e9952 Merge branch 'ent-11873-paradas-planificadas-de-modulos-ponen-en-modo-quiet-agente-en-vez-de-modulos' into 'develop'
Ent 11873 paradas planificadas de modulos ponen en modo quiet agente en vez de modulos

See merge request artica/pandorafms!6345
2023-08-24 08:43:28 +00:00
artica 89b679c4a4 Auto-updated build strings. 2023-08-24 01:00:18 +02:00
daniel dca15b5637 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-23 18:54:01 +02:00
daniel 512d5331d3 ITSM pandora_enterprise#11471 2023-08-23 18:52:06 +02:00
Rafael Ameijeiras 7a916dcb27 Merge branch 'ent-11547-diferenciar-about-para-usuarios-no-admin' into 'develop'
Ent 11547 diferenciar about para usuarios no admin

See merge request artica/pandorafms!6265
2023-08-23 14:34:23 +00:00
artica 4830cf21e6 Updated version and build strings. 2023-08-23 15:49:36 +02:00
Pablo Aragon 45c15acf8e 11930-Remove in pandora_db.pl integrity & functions_agents.php 2023-08-23 14:46:55 +02:00
Pablo Aragon 120298e6a3 11930-Remove in pandora_db.pl integrity & functions_agents.php 2023-08-23 14:00:35 +02:00
miguel angel rasteu 3a39670faf #11547 fix profile admin 2023-08-23 10:08:45 +02:00
Rafael Ameijeiras 8c19d5bf18 Merge branch 'ent-11926-nodo-meta-esta-roto' into 'develop'
Ent 11926 nodo meta esta roto

See merge request artica/pandorafms!6349
2023-08-23 07:52:27 +00:00
miguel angel rasteu ba606fa47a Merge branch 'develop' into ent-11547-diferenciar-about-para-usuarios-no-admin 2023-08-23 09:44:03 +02:00
Rafael Ameijeiras 1fa70b3afc Merge branch 'ent-11852-advertencia-al-usar-intervalos-largos' into 'develop'
Ent 11852 advertencia al usar intervalos largos

See merge request artica/pandorafms!6346
2023-08-23 05:56:19 +00:00
Rafael Ameijeiras 1bca8b0006 Merge branch 'ent-11819-cambios-en-wizard-de-las-consolas-visuales' into 'develop'
Ent 11819 cambios en wizard de las consolas visuales

See merge request artica/pandorafms!6338
2023-08-23 05:54:46 +00:00
artica 71ddd71146 Auto-updated build strings. 2023-08-23 01:00:53 +02:00
miguel angel rasteu fc32fcff87 #11926 Fix download CSV 2023-08-22 14:35:28 +02:00
miguel angel rasteu 9bb0b30772 #11926 Fix download CSV 2023-08-22 14:23:57 +02:00
Daniel Maya aa39f2eac2 #11926 Fixed requires 2023-08-22 12:41:30 +02:00
Daniel Maya 34f6838095 #11927 Fixed msg 2023-08-22 10:49:00 +02:00
daniel 5a61f074d7 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-22 09:22:11 +02:00
Rafael Ameijeiras 8eab813101 Merge branch 'ent-11051-marcar-como-leidos-todos-los-mensajes-del-sistema' into 'develop'
Ent 11051 marcar como leidos todos los mensajes del sistema

See merge request artica/pandorafms!6202
2023-08-22 06:46:29 +00:00
artica d17ea9891b Auto-updated build strings. 2023-08-22 01:00:41 +02:00
artica b977a2b0cc Updated version and build strings. 2023-08-21 16:13:08 +02:00
Rafael Ameijeiras 305c421ce0 Merge branch 'ent-8285-exportar-a-csv-vistas-parte-2-agent-modules-view' into 'develop'
Ent 8285 exportar a csv vistas parte 2 agent modules view

See merge request artica/pandorafms!6246
2023-08-21 11:44:43 +00:00
Jonathan 6a903f9dc3 #11819 vertical range for new rows only 2023-08-21 13:29:36 +02:00
Rafael Ameijeiras 4b10cd4216 Merge branch 'ent-10946-enlaces-filtrando-por-estado-en-widget-general-group-status' into 'develop'
Ent 10946 enlaces filtrando por estado en widget general group status

See merge request artica/pandorafms!6225
2023-08-21 11:18:14 +00:00
miguel angel rasteu 19fb83cd92 #11051 Fix css conflict 2023-08-21 13:16:53 +02:00
miguel angel rasteu e41ea004e2 #11051 Fix discovery task notification 2023-08-21 13:11:57 +02:00
Rafael Ameijeiras 82389ddf2d Merge branch 'ent-10870-15385-limpiar-eventos-desde-la-vista-detallada-de-evento' into 'develop'
Ent 10870 [#15385] Limpiar eventos desde la vista detallada de evento

See merge request artica/pandorafms!6174
2023-08-21 11:10:35 +00:00
Rafael Ameijeiras cbde07293c Merge branch 'ent-10701-cambiar-pintado-de-servicios-arbol-vertical' into 'develop'
Ent 10701 cambiar pintado de servicios arbol vertical

See merge request artica/pandorafms!6281
2023-08-21 11:06:41 +00:00
Jonathan 563323d0be #11852 warning time lapse more than 30 days 2023-08-21 13:05:39 +02:00
Jorge Rincon 35a7c409bf #11873 Fixed Scheduled Downtime quiet mode for modules 2023-08-21 13:03:44 +02:00
Rafael Ameijeiras b91798947e Merge branch 'ent-10603-personalizacion-weekly-mail-report' into 'develop'
Ent 10603 personalizacion weekly mail report

See merge request artica/pandorafms!6263
2023-08-21 10:22:10 +00:00
miguel angel rasteu b5767a696e #8285 Fix filter 2023-08-21 11:33:26 +02:00
miguel angel rasteu ec11dbab08 Merge branch 'develop' into ent-8285-exportar-a-csv-vistas-parte-2-agent-modules-view 2023-08-21 11:12:02 +02:00
miguel angel rasteu 4191a7037f #11051 Fix checkbox 2023-08-21 10:59:29 +02:00
miguel angel rasteu 6cbb332a8a #10701 Fix css conflict 2023-08-21 09:16:22 +02:00
miguel angel rasteu ebd98b479d #11051 Fix conflict css 2023-08-21 09:01:05 +02:00
miguel angel rasteu 970cc997cc #11051 Fix conflict 2023-08-21 08:25:53 +02:00
Rafael Ameijeiras a6e1e1cf61 Merge branch 'ent-11794-stored-cross-site-scripting-via-dashboard-panel' into 'develop'
Ent 11794 stored cross site scripting via dashboard panel

See merge request artica/pandorafms!6296
2023-08-21 06:23:49 +00:00
Rafael Ameijeiras 1f9cd3a773 Merge branch 'ent-11316-simplificar-vistas-de-soporte' into 'develop'
Ent 11316 Simplificar vistas de soporte

See merge request artica/pandorafms!6173
2023-08-21 06:16:41 +00:00
Rafael Ameijeiras 9c4825f03e Merge branch 'ent-10905-comprobacion-en-el-servidor-de-que-tiene-acceso-a-la-api' into 'develop'
Ent-10905-comprobacion-en-el-servidor-de-que-tiene-acceso-a-la-api

Closes pandora_enterprise#10905

See merge request artica/pandorafms!6289
2023-08-21 06:15:45 +00:00
daniel a63824d802 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/godmode/users/user_management.php
2023-08-21 08:08:34 +02:00
Rafael Ameijeiras bffc644bc0 Merge branch 'ent-11543-pantalla-de-login-en-modo-blanco' into 'develop'
Ent 11543 pantalla de login en modo blanco

See merge request artica/pandorafms!6205
2023-08-21 06:01:11 +00:00
Rafael Ameijeiras d60890dd08 Merge branch 'ent-11315-anadir-filtrado-al-wizard-de-servicios' into 'develop'
Ent 11315 anadir filtrado al wizard de servicios

See merge request artica/pandorafms!6251
2023-08-21 05:59:38 +00:00
Rafael Ameijeiras dbd90d79a7 Merge branch 'ent-10344-conexion-con-el-servidor-se-ha-perdido' into 'develop'
Ent 10344 Conexion con el servidor se ha perdido

See merge request artica/pandorafms!6228
2023-08-21 05:58:32 +00:00
artica 8ce9d3aa31 Auto-updated build strings. 2023-08-21 01:00:55 +02:00
artica b031f4140c Auto-updated build strings. 2023-08-20 01:00:46 +02:00
artica a6b55c1580 Auto-updated build strings. 2023-08-19 01:01:10 +02:00