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

634 Commits

Author SHA1 Message Date
Daniel Rodriguez 5138756525 Merge branch 'ent-8958-13577-Error-al-quitar-un-comando-de-una-acción' into 'develop' 
Ent 8958 13577 error al quitar un comando de una acción

See merge request artica/pandorafms!4878
 2022-06-06 12:16:15 +00:00
Daniel Maya 37c8fe73df #9017 Fixed alert list 2022-05-23 16:36:16 +02:00
Daniel Maya a2de9121b7 #8958 remove the option none 2022-05-10 15:15:40 +02:00
Daniel Rodriguez 3f7067fe48 Merge branch 'ent-I-do-now-like-procedures' into 'develop' 
Allow both behaviours in alert time slots

See merge request artica/pandorafms!4711
 2022-02-24 09:55:40 +00:00
Daniel Barbero Martin 237a7feb98 remove procedure and retrocompatibility pandora_enterprise#3943 2022-02-22 13:20:53 +01:00
Daniel Rodriguez ffc7cb2b44 Merge branch 'ent-8455-ampliar-limite-comandos' into 'develop' 
Increased field size

Closes pandora_enterprise#8455

See merge request artica/pandorafms!4706
 2022-02-22 12:08:46 +00:00
Daniel Barbero Martin 93cad269c8 fixed json entities pandora_enterprise#3943 2022-02-22 12:03:22 +01:00
José González e2621f6230 Increased field size 2022-02-18 11:18:01 +01:00
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
fbsanchez 6bb754d5d2 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/pandoradb.sql
 2022-02-08 13:02:22 +01:00
José González fc4b702db0 Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs' 
# Conflicts:
#   pandora_console/godmode/alerts/configure_alert_template.php
 2022-02-08 11:35:01 +00:00
Daniel Barbero Martin ba6d6f9107 calendar not editable pandora_enterprise#3943 2022-02-08 09:38:42 +01:00
Daniel Barbero Martin 0e0e737283 calendar not editable pandora_enterprise#3943 2022-02-07 13:07:48 +01:00
Jose Gonzalez 1129a801c4 Fix alert commands 2022-02-03 13:49:26 +01:00
Jose Gonzalez 2f356541ea Fixed alert management log 2022-02-03 12:54:50 +01:00
Daniel Barbero Martin 3d951749f5 alert template schedule pandora_enterprise#3943 2022-02-02 13:03:52 +01:00
Daniel Barbero Martin 5060d0b8f7 alert template schedule pandora_enterprise#3943 2022-02-02 10:09:31 +01:00
Daniel Barbero Martin b62566af49 alert template schedule pandora_enterprise#3943 2022-02-01 16:50:53 +01:00
Jose Gonzalez d81e6571ec New audit logs 2022-02-01 13:39:18 +01:00
Daniel Barbero Martin 645257f9dc alert template schedule pandora_enterprise#3943 2022-02-01 11:29:25 +01:00
Daniel Barbero Martin 15ada66942 alert template schedule pandora_enterprise#3943 2022-01-31 16:50:48 +01:00
Daniel Barbero Martin c02abbc508 alert template schedule pandora_enterprise#3943 2022-01-31 13:45:44 +01:00
Daniel Barbero Martin 392a9223e8 alert template schedule pandora_enterprise#3943 2022-01-28 14:06:31 +01:00
Daniel Barbero Martin a4f092f0a0 alert template schedule pandora_enterprise#3943 2022-01-27 17:02:24 +01:00
Daniel Barbero Martin 89931ef564 alert template schedule #3943 2022-01-26 16:52:48 +01:00
Daniel Barbero Martin e6a4eb3059 alert template schedule 2022-01-26 10:30:38 +01:00
Daniel Barbero Martin 1a6127624e alert template schedule 2022-01-26 08:07:00 +01:00
fbsanchez 1207463f16 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/include/class/HTML.class.php
 2022-01-25 14:16:47 +01:00
Daniel Barbero Martin 2519335637 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 
Conflicts:
	pandora_console/include/styles/pandora.css
 2022-01-25 10:40:37 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
fbsanchez fee3f4ab96 php8 review + mdpf update 2022-01-12 14:22:16 +01:00
Daniel Rodriguez 4899d68ec2 Merge branch 'ent-8388-bug-en-eventos-generados-a-partir-alerta' into 'develop' 
fixed bugged selectors in action editor

See merge request artica/pandorafms!4618
 2022-01-11 10:10:59 +00:00
alejandro.campos@artica.es d04d127734 fixed bugged selectors in action editor 2022-01-07 13:01:23 +01:00
Calvo 64f29e5be6 Fix select2 action search on alert list 2022-01-04 14:47:51 +01:00
Daniel Rodriguez 31a90c4170 Merge branch 'ent-8255-Al-editar-una-acción-de-alerta-no-se-cargan-los-boxes-de-los-fields-creados-con-tags' into 'develop' 
Ent 8255 al editar una acción de alerta no se cargan los boxes de los fields creados con tags

See merge request artica/pandorafms!4561
 2021-12-23 11:59:58 +00:00
Daniel Rodriguez 04f06b13be Merge branch 'ent-8262-12695-Bug-en-paginación-de-accciones-de-alerta-META' into 'develop' 
Ent 8262 12695 bug en paginación de accciones de alerta meta

See merge request artica/pandorafms!4552
 2021-12-23 10:09:37 +00:00
Daniel Rodriguez b8a1602aaf Merge branch 'ent-8260-Bug-en-edición-de-acción-de-alerta-Create-Integria-IMS-ticket-metaconsola' into 'develop' 
Ent 8260 bug en edición de acción de alerta create integria ims ticket metaconsola

See merge request artica/pandorafms!4553
 2021-12-23 10:03:51 +00:00
Daniel Barbero Martin 0ae657e415 WIP #3943 2021-12-17 13:40:42 +01:00
Daniel Barbero Martin a803b5fa90 WIP #3943 2021-12-17 13:38:53 +01:00
Daniel Maya 44446673e4 #8255 Fixed select2 2021-11-30 09:56:42 +01:00
Daniel Rodriguez 8fac24a469 Merge branch 'ent-8277-12706-Lista-de-alertas-no-filtra-correctamente' into 'develop' 
Ent 8277 12706 lista de alertas no filtra correctamente

See merge request artica/pandorafms!4539
 2021-11-26 07:58:38 +00:00
Daniel Maya 4211327275 #8260 Fixed Integria IMS Ticket edit in metaconsole 2021-11-25 13:17:12 +01:00
Daniel Maya b3fcb689a8 #8262 Fixed pagination 2021-11-24 15:27:53 +01:00
Daniel Maya 3bfce928c4 #7902 Fixed add and update actions 2021-11-23 10:53:51 +01:00
Daniel Maya 131be55be1 #8277 Fixed search by agent 2021-11-22 16:18:53 +01:00
Daniel Rodriguez 13835582d2 Merge branch 'ent-8210-Bug-al-editar-acciones-ya-configuradas-en-alertas' into 'develop' 
Ent 8210 bug al editar acciones ya configuradas en alertas

See merge request artica/pandorafms!4536
 2021-11-22 12:44:51 +00:00
Daniel Maya 8ce1a500ea #8210 Fixed dialog 2021-11-19 14:57:56 +01:00
Daniel Barbero Martin c52e11e91a Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 08:12:22 +01:00
Daniel Maya 6f7b35a3b4 #8210 Fixed dropdown select2 2021-11-18 11:48:19 +01:00
Daniel Barbero Martin 93aad130cb wip special days alerts 2021-11-04 10:20:03 +01:00