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

864 Commits

Author SHA1 Message Date
fbsanchez 5ccc16d7d6 Revert 28.sql 2019-06-27 15:04:58 +02:00
fbsanchez d956f08011 Minor fixes 2019-06-27 10:39:43 +02:00
fbsanchez 225de6b5ea MR forgotten change 2019-06-26 19:33:42 +02:00
Daniel Barbero Martin a10cf51b1b update current package 2019-06-26 15:37:04 +02:00
fbsanchez 4754e20784 Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion 2019-06-26 09:52:22 +02:00
fbsanchez 004eb11048 MR29 2019-06-25 15:24:15 +02:00
fbsanchez a507d28c1f Update Aws agent names 2019-06-25 10:12:25 +02:00
fbsanchez 180948c51c Import previous aws account 2019-06-24 19:36:50 +02:00
fbsanchez e4f6a95a89 MR29 credential store 2019-06-21 23:05:21 +02:00
fbsanchez 6682bad19f first steps credential store 2019-06-21 12:03:25 +02:00
Rafael Ameijeiras b428797004 delete_file 2019-06-19 10:12:06 +02:00
marcos.alconada a40e420de0 Removed , from numer format 2019-06-10 16:59:05 +02:00
marcos.alconada 58ba42cec1 Changed code for conversión 2019-06-10 14:53:47 +02:00
marcos.alconada cf84c3f579 Merge remote-tracking branch 'origin/develop' into ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info 2019-06-10 12:43:08 +02:00
marcos.alconada 833248991b Add mr 29 2019-06-07 11:24:00 +02:00
Luis Calvo 23e631f7d8 Added missing create table to migrate 6 to 7 2019-06-04 08:52:25 +02:00
Daniel Maya 30b8872ab3 fixed mr 28 2019-05-29 17:06:25 +02:00
Alejandro Fraguas 2e3338b595 Merge branch 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual' into 'develop' 
Ent 3961 añadir caché para los elementos de la consola visual

See merge request artica/pandorafms!2443
 2019-05-29 15:48:45 +02:00
Daniel Rodriguez 702b7e69ba Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews-3' into 'develop' 
Changed query and comment for tnews message

See merge request artica/pandorafms!2465
 2019-05-29 12:58:54 +02:00
marcos.alconada 1f3656c0d3 Changed query and comment for tnews message 2019-05-29 12:09:44 +02:00
Daniel Maya 552467286c Merge branch 'develop' into 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual' 
# Conflicts:
#   pandora_console/extras/mr/28.sql
 2019-05-29 11:10:31 +02:00
Luis Calvo 5966367f8f eHorus user level login conf added in user editor 2019-05-28 13:14:42 +02:00
Luis Calvo 3736d84589 Edit ehorus user 2019-05-27 18:49:47 +02:00
Luis Calvo 588d19102f Resolve merge conflict 2019-05-27 18:30:24 +02:00
marcos.alconada 01d96728c8 changed PK to NULL 2019-05-24 11:03:09 +02:00
Daniel Maya 4c874e152c Merge 2019-05-23 10:43:32 +02:00
Daniel Maya 2de2d1f482 Added expiration and deleted old cache data in pandora_db 2019-05-23 10:35:03 +02:00
Daniel Rodriguez 979f11ca8f Merge branch 'ent-1668-update-manager' into 'develop' 
Ent 1668 update manager

See merge request artica/pandorafms!2420
 2019-05-22 15:25:49 +02:00
Daniel Rodriguez c50eb57499 Merge branch 'ent-4016-error-en-valor-de-diagnostic-info' into 'develop' 
Added new min value for InnoDB file per table( 0 to 1)

See merge request artica/pandorafms!2416
 2019-05-22 12:05:29 +02:00
manuel ada49966e0 Merge branch 'develop' into ent-3468-Ayudas_online 
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
 2019-05-21 10:05:06 +02:00
Daniel Maya 5c0a197b6b Added cache 2019-05-20 15:15:54 +02:00
fbsanchez 5e9b2479eb Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager 2019-05-20 13:11:39 +02:00
fbsanchez c40e0ec702 pandora_console/extras/delete_files/delete_files.txt 
Former-commit-id: 6931c868b5a5df1e7068c4571902ad112a1333c9
 2019-05-16 15:38:51 +02:00
fbsanchez ec60a3193a removed all group from communications target 
Former-commit-id: 797a467fed8eff0f9a81c9bbe72780f4e91faa67
 2019-05-16 12:52:41 +02:00
fbsanchez 034480bf88 minor fixes 
Former-commit-id: ced1aad7a9835dab5b44817f191e33d2ca11cff3
 2019-05-16 12:28:46 +02:00
Luis Calvo 702926cf85 solved merge conflict mr 28.sql 
Former-commit-id: 687cf5c37f15648421843b5d2908351fc2f3c032
 2019-05-16 10:15:46 +02:00
fbsanchez 3bf06f0b72 MR minor updates 
Former-commit-id: 55105f3858b8ec659c67bf906b09afeb61a1d39c
 2019-05-15 00:00:21 +02:00
fbsanchez 8004e096fd MR 28 and minor fixes 
Former-commit-id: 99292ecb6401cf20066dd09188a32e24b9194b25
 2019-05-14 18:09:34 +02:00
Alejandro Fraguas 3548070ec1 Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' into 'develop' 
Add new message to News board

See merge request artica/pandorafms!2415

Former-commit-id: b0adfc73ac247cda59dea01e83429e06ba5747ee
 2019-05-14 17:56:43 +02:00
fbsanchez 920786216b UM notifications MR update 
Former-commit-id: 61be93c1174fbff4242e261caac591725d7ef4c5
 2019-05-14 17:17:04 +02:00
fbsanchez 53e9113b7e UM notifications MR update 
Former-commit-id: d2aad195cb9bab4e1efa504cb4b4a583f262f0e3
 2019-05-14 17:15:28 +02:00
Marcos Alconada d9dbc60eb5 Update pandoradb_migrate_6.0_to_7.0.mysql.sql 
Former-commit-id: cb2edea9dca48e33260ce2fb707ed48b04d23bde
 2019-05-14 16:45:28 +02:00
Daniel Barbero Martin 79701bba60 Merge remote-tracking branch 'origin/develop' into ent-1372-Poder-escoger-fecha-de-inicio-y-fin-en-Hourly-Weekly-y-Monthly-SLA 
Conflicts:
	pandora_console/extras/mr/28.sql


Former-commit-id: c1977a7269bdb26d5ce387513c6a0b04813ebe69
 2019-05-14 12:34:40 +02:00
manuel b89751e647 Merge branch 'develop' into ent-3468-Ayudas_online 
Conflicts:
pandora_console/godmode/alerts/configure_alert_command.php


Former-commit-id: 9051a95f31fd7163a0b326d7e513c5689c5b304f
 2019-05-14 11:50:07 +02:00
Marcos Alconada cf45be2c60 Merge branch 'develop' into 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' 
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql

Former-commit-id: b3872691ef8ef136cd921c5eb4365be2b32daf46
 2019-05-14 10:03:37 +02:00
marcos.alconada 9501187ebc Se cambian las consultas sql sin la imagen en la consulta 
Former-commit-id: fcfc9e05c4107f5b85b1a8f6140155fafe316c8e
 2019-05-14 10:01:30 +02:00
Luis Calvo 860a4cdbf2 Updated pandoradb and migrate 
Former-commit-id: 59d37439046c18c4de72ac7e078ef75a61603958
 2019-05-13 17:57:21 +02:00
Luis Calvo 8c1c337522 Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings 
Former-commit-id: 1eac76c75f311a20f402859cf7b9a47b70765f75
 2019-05-13 17:36:32 +02:00
Alejandro Campos 9347fc17aa Merge branch 'develop' into 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta' 
# Conflicts:
#   pandora_console/extras/mr/28.sql

Former-commit-id: f9ff15a815fa9a15f1d326174ac40acbdd4110dd
 2019-05-13 17:10:06 +02:00
manuel 20dace7de8 Merge branch 'develop' into ent-3468-Ayudas_online 
Conflicts:
pandora_console/godmode/agentes/agent_manager.php


Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
 2019-05-13 16:20:12 +02:00