tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,014 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

775 Commits

Author SHA1 Message Date
Daniel Maya 06e42de207 #11391 Fixed date 2023-10-02 12:39:40 +02:00
Daniel Rodriguez 05cd8142bf Merge branch 'ent-11471-integracion-pandora-integria' into 'develop' 
wip integration integriaIMS pandora_enterprise#11471

Closes pandora_enterprise#11471

See merge request artica/pandorafms!6131
 2023-09-28 10:05:15 +00:00
Rafael Ameijeiras 6acbc5b684 Merge branch 'ent-12050-security-hardening-console-widget-dashboard' into 'develop' 
Ent 12050 Security hardening: Console - Widget dashboard

See merge request artica/pandorafms!6450
 2023-09-27 14:07:04 +00:00
daniel 91393c9e39 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/include/styles/pandora.css
 2023-09-25 17:06:08 +02:00
Rafael Ameijeiras 60c3bb456a Merge branch 'ent-12099-cabecera-de-filtros-descuadrada-en-informes-vista-html' into 'develop' 
Ent 12099 cabecera de filtros descuadrada en informes vista html

See merge request artica/pandorafms!6480
 2023-09-25 11:22:08 +00:00
miguel angel rasteu 4b999b79d3 #12099 Fix filter position 2023-09-25 10:57:46 +02:00
Daniel Cebrian 6e794f74bb Merge branch 'ent-11965-security-hardening-console-vistas-estaticas' into ent-12050-security-hardening-console-widget-dashboard 2023-09-18 16:54:16 +02:00
Daniel Cebrian b85d622d51 Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas 2023-09-18 16:52:57 +02:00
Daniel Cebrian c101389a26 #12050 new widget security hardening 2023-09-14 12:44:03 +02:00
daniel af968b5e13 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-14 08:08:05 +02:00
Daniel Rodriguez d1fcbca557 Merge branch 'ent-10846-Vista-HA-en-Metaconsola' into 'develop' 
implemented database ha view in metaconsole

See merge request artica/pandorafms!6275
 2023-09-13 10:47:03 +00:00
Daniel Cebrian 8f146d1af7 Merge branch 'ent-11965-security-hardening-console-vistas-estaticas' into ent-12050-security-hardening-console-widget-dashboard 2023-09-13 09:52:09 +02:00
Daniel Cebrian 2a56b63f2a #11965 new filters for hardening 2023-09-08 14:06:33 +02:00
daniel ce0468b37e Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/include/functions_menu.php
 2023-09-08 13:11:52 +02:00
miguel angel rasteu a433a78a4c #Fix graph 2023-09-07 10:44:46 +02:00
daniel fce86cb2ac Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-06 07:50:27 +02:00
Jonathan 84bb4780ca #10639 new datepicker style and save filter 2023-08-29 12:17:41 +02:00
Jonathan d9e897568a Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-24 10:06:19 +02:00
Jonathan ab50a519ea #10639 version 2 datepicker 2023-08-24 09:36:15 +02:00
daniel dca15b5637 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-23 18:54:01 +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
daniel 5a61f074d7 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-22 09:22:11 +02:00
Jonathan 563323d0be #11852 warning time lapse more than 30 days 2023-08-21 13:05:39 +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
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
Jorge Rincon 5e91d8a340 Merge branch develop into ent-11315-anadir-filtrado-al-wizard-de-servicios 2023-08-18 09:38:05 +02:00
daniel 8bc65474f0 ITSM pandora_enterprise#11471 2023-08-16 16:52:57 +02:00
daniel 133eef456a Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 08:14:34 +02:00
Daniel Rodriguez c4ff61a2c0 Merge branch 'ent-11326-security-hardening-console' into 'develop' 
Ent 11326 Security hardening: Console

See merge request artica/pandorafms!6242
 2023-08-11 08:20:03 +00:00
Daniel Cebrian 06eae47560 Merge branch 'develop' into ent-11326-security-hardening-console 2023-08-09 13:27:21 +02:00
Jorge Rincon f1cbe8c360 #11851 Fixed operation of the interval field, allowing to add more than one. 2023-08-09 12:47:51 +02:00
daniel 7f82273dc4 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/65.sql
 2023-08-09 08:59:01 +02:00
Rafael Ameijeiras 752878fdeb Merge branch 'ent-9558-derivado-del-trabajo-q-a-765-error-en-metaconsola-parama-para-el-fichero-de-imagen' into 'develop' 
Ent 9558 derivado del trabajo q a 765 error en metaconsola parama para el fichero de imagen

See merge request artica/pandorafms!6306
 2023-08-07 07:27:50 +00:00
Rafael Ameijeiras b2821c0db3 Merge branch 'ent-11713-bugs-de-visualizacion-de-los-botones-de-accion-en-metaconsola-y-consola' into 'develop' 
Ent 11713 bugs de visualizacion de los botones de accion en metaconsola y consola

See merge request artica/pandorafms!6249
 2023-08-04 06:34:35 +00:00
Rafael Ameijeiras 0b680568b5 Merge branch 'ent-11739-compatibilidad-php-8-2-second' into 'develop' 
Ent 11739 compatibilidad php 8 2 second

See merge request artica/pandorafms!6300
 2023-08-04 06:32:37 +00:00
miguel angel rasteu 135c6835bd #11713 fix title buttons 2023-08-03 12:51:09 +02:00
Pablo Aragon 413528146b 9558-Fix background url html_print_autocomplete_modules() 2023-08-03 08:25:38 +02:00
Rafael Ameijeiras e6eee88a63 Merge branch 'ent-11377-users-bulk-operations-usuarios-con-perfil-x-anadido-no-aparecen-al-intentar-borrar-perfil' into 'develop' 
Ent 11377 users bulk operations usuarios con perfil x anadido no aparecen al intentar borrar perfil

See merge request artica/pandorafms!6010
 2023-08-02 10:42:36 +00:00
Daniel Maya aef7f0edd0 #11739 Fixed deprecated functions 4 2023-08-01 14:51:31 +02:00
Jonathan f2328407b1 Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-01 09:39:56 +02:00
Daniel Maya ad24712eed resolved conflict 2 2023-07-31 09:48:42 +02:00
miguel angel rasteu 9781809b22 #11713 Fix title 2023-07-31 09:27:50 +02:00
miguel angel rasteu 95e17b46bf Merge branch 'develop' into ent-11713-bugs-de-visualizacion-de-los-botones-de-accion-en-metaconsola-y-consola 2023-07-31 09:03:03 +02:00
Daniel Maya 858a6230b3 resolved conflict 2023-07-31 09:02:58 +02:00
alejandro.campos@artica.es 6114787764 Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-27 13:32:26 +02:00
Daniel Cebrian 001ffc1799 Merge branch 'develop' into ent-11326-security-hardening-console 2023-07-26 10:55:49 +02:00
Rafael Ameijeiras ce9d5218e7 Merge branch 'ent-11724-bug-del-boton-show-hide-de-campos-sensibles' into 'develop' 
Ent 11724 bug del boton show hide de campos sensibles

See merge request artica/pandorafms!6238
 2023-07-25 07:50:19 +00:00
alejandro.campos@artica.es 354324b9d1 implemented database ha view in metaconsole 2023-07-24 13:11:05 +02:00
daniel 1bf7f1e36e ITSM pandora_enterprise#11471 2023-07-21 14:23:42 +02:00