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

935 Commits

Author SHA1 Message Date
fbsanchez 3c87efe113 Merge remote-tracking branch 'origin/develop' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
 2019-11-14 17:13:38 +01:00
fbsanchez 94d87c2a3c Avoid welcome window on updates. 2019-11-14 14:14:50 +01:00
fbsanchez b0920d93af Merge branch 'ent-4772-omnishell' into ent-EDF 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2019-11-13 18:15:19 +01:00
fbsanchez b9633933e1 Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/general/header.php
 2019-11-12 14:17:45 +01:00
Daniel Barbero Martin c68a5b57dd fixed Change bbdd 2019-11-05 16:04:48 +01:00
fbsanchez f4f618c1da Merge remote-tracking branch 'origin/ent-EDF' into ent-4769-modulos-ssh-php-perl 2019-11-05 15:40:14 +01:00
Daniel Barbero Martin e5f24ca884 Merge develop 2019-11-05 15:27:06 +01:00
fbsanchez 58cbc3c738 Merge remote-tracking branch 'origin/develop' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/pandoradb_data.sql
 2019-11-05 15:17:09 +01:00
fbsanchez ec3c7ba559 Some remote command examples 2019-11-04 20:36:03 +01:00
Daniel Barbero Martin 7bfa076263 fixed error bbdd 2019-10-30 14:52:10 +01:00
Daniel Barbero Martin d37410ed8c fixed error bbdd 2019-10-30 14:43:10 +01:00
Daniel Barbero Martin b7710a6562 fix remove mr34 to mr33 2019-10-30 08:04:13 +01:00
Daniel Barbero Martin 2bb81a839a Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/menu.php
	pandora_console/pandoradb_data.sql
 2019-10-29 17:15:19 +01:00
fbsanchez 383967f68a Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF 2019-10-29 16:56:01 +01:00
fbsanchez f3fdcb4de0 MR update 2019-10-29 16:06:34 +01:00
Daniel Barbero Martin 3056c6741a changes bbdd mr34 2019-10-28 12:20:55 +01:00
fbsanchez 74007ebf70 33 => 34, cleanup 2019-10-28 12:18:56 +01:00
fbsanchez d6681cedd1 33 => 34 2019-10-28 12:18:13 +01:00
Daniel Barbero Martin f06a55c6bb continue feedback mail 2019-10-23 19:50:57 +02:00
Tatiana Llorente 30caad5a6c Added column cache_expiration in tlayout_template_data in MR, migrate, and pandoradb.sql - #4810 2019-10-15 16:50:05 +02:00
fbsanchez 6bf3772690 remote cmd => remote execution 2019-10-09 19:20:58 +02:00
Daniel Barbero 8af72c1c9d add Remote CMD 2019-10-09 17:26:06 +02:00
Daniel Barbero Martin 2ee725b204 fixed minor error 2019-09-26 16:43:31 +02:00
alejandro-campos 96622933fc added new section in integria setup to configure different options for event responses and alert created tickets 2019-09-26 13:22:10 +02:00
Alejandro Campos 20cebbe988 Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria' 
# Conflicts:
#   pandora_console/extras/mr/32.sql
 2019-09-23 17:16:15 +02:00
alejandro-campos 9bf2980f01 fix minor bugs in integria integration 2019-09-23 12:48:20 +02:00
fbsanchez 6def88472a Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha' 
# Conflicts:
#   pandora_console/extras/mr/32.sql
 2019-09-19 10:18:15 +02:00
Daniel Rodriguez d939bf9e93 Merge branch 'ent-3878-Report-type-summation-not-working-properly-migratesql' into 'develop' 
Ent 3878 report type summation not working properly migratesql

See merge request artica/pandorafms!2738
 2019-09-18 17:54:17 +02:00
Alejandro Fraguas 4adf584827 Merge branch 'ent-4655-nomenclatura-licencia' into 'develop' 
Changed caption Expires

See merge request artica/pandorafms!2736
 2019-09-18 16:49:55 +02:00
Luis 0c72fe718c Update pandoradb_migrate_6.0_to_7.0.mysql.sql 2019-09-18 16:42:09 +02:00
Luis Calvo 4628e41f69 Added missing changes to pandora_migratte 2019-09-18 16:39:05 +02:00
Jose Gonzalez be1cde5466 Deleted tests 2019-09-18 15:41:20 +02:00
Jose Gonzalez a4e22d325d Solved issue 2019-09-18 15:39:33 +02:00
Luis Calvo 43af2269ee Fixed default values uncompress data 2019-09-18 11:51:01 +02:00
Luis Calvo e409b33c6c Added changes to treport_content_template to db 2019-09-17 12:32:07 +02:00
Luis Calvo e89efea022 Added column 'uncompressed_module' to 'treport_content' 2019-09-16 11:18:01 +02:00
fbsanchez aa6c105841 Update 32.sql missed ';' 2019-09-12 17:47:49 +02:00
fbsanchez ebcce5cad4 Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha' 
# Conflicts:
#   pandora_console/extras/mr/32.sql
 2019-09-12 11:17:44 +02:00
Daniel Rodriguez da7811953c Merge branch 'ent-3918-cambiar-el-tamaño-por-defecto-de-los-elementos-de-icono' into 'develop' 
Added mr and uncommented code

See merge request artica/pandorafms!2558
 2019-09-06 13:38:11 +02:00
fbsanchez 148cd5cce6 db updates pandora_db 2019-09-05 10:45:17 +02:00
fbsanchez 5c535514e1 Updated MR reference 2019-09-02 15:44:48 +02:00
fbsanchez 9868462d43 Merge remote-tracking branch 'origin/develop' into ent-4190-mejoras-para-el-menu-de-gestionar-ha 2019-09-02 09:57:45 +02:00
Daniel Maya de47275735 Fixed mr 2019-08-30 10:34:52 +02:00
Daniel Maya 5ad22620b9 mr power up 2019-08-28 12:49:41 +02:00
Daniel Maya 63da85798e Change mr 2019-08-26 16:10:06 +02:00
Daniel Maya 473b29252c Merge branch 'develop' into ent-3918-cambiar-el-tamaño-por-defecto-de-los-elementos-de-icono 2019-08-26 16:08:03 +02:00
fbsanchez 62ec37cf59 propagate tdatabase updates 2019-08-10 03:18:45 +02:00
fbsanchez adbb48ab87 pandora HA review 2019-08-10 02:13:01 +02:00
Alejandro Campos 12eacc1933 Merge branch 'develop' into 'ent-4388-Nuevos-eventos' 
# Conflicts:
#   pandora_console/extras/mr/31.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2019-08-05 09:26:18 +02:00
Daniel Rodriguez 7ff5e23792 Merge branch 'ent-4460-Eliminar-antigua-integracion-con-integria' into 'develop' 
removed all deprecated references to integria from code and db data

See merge request artica/pandorafms!2626
 2019-08-02 12:28:03 +02:00