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

565 Commits

Author SHA1 Message Date
Daniel Rodriguez 5047f8afb9 Merge branch 'ent-8659-mostrar-nombre-completo-del-usuario-para-el-owner-de-un-evento' into 'develop' 
Ent 8659 mostrar nombre completo del usuario para el owner de un evento

See merge request artica/pandorafms!5114
 2022-09-27 10:50:17 +00:00
Diego Muñoz-Reja 10d97c8cfa Merge branch 'ent-9420-eventos-agrupados-no-muestran-estado-del-ultimo-elemento' into 'develop' 
fixed group by order event_get_all pandora_enterprise#9420

See merge request artica/pandorafms!5106
 2022-09-26 15:16:15 +00:00
alejandro.campos@artica.es 2852311cf7 fix 2022-09-19 15:42:43 +02:00
edu.corral af7ad37b50 ent 8659 fullname event owner 2022-09-16 11:04:01 +02:00
alejandro.campos@artica.es c49b4db32d fixed 500 2022-09-14 17:09:29 +02:00
Daniel Barbero 7771a96466 fixed group by order event_get_all pandora_enterprise#9420 2022-09-13 14:09:15 +02:00
alejandro.campos@artica.es 82bf0bd4f6 fixed event filter 2022-08-23 11:42:52 +02:00
Jimmy Olano 8d7b02069a Merge branch 'ent-8043-eventos-solo-se-agrupan-si-tienen-el-mismo-estado' into 'develop' 
not group by event status pandora_enterprise#8043

pandora_enterprise#8043

See merge request artica/pandorafms!5031
 2022-08-01 18:46:38 +00:00
Diego Muñoz-Reja 4cbd23d911 Merge branch 'ent-8836-post-macros-para-custom-data-de-eventos-no-funcionan-sin-base64' into 'develop' 
Ent 8836 post macros para custom data de eventos no funcionan sin base64

See merge request artica/pandorafms!4879
 2022-08-01 13:02:00 +00:00
Daniel Barbero e11d46ea60 Merge remote-tracking branch 'origin/develop' into ent-8043-eventos-solo-se-agrupan-si-tienen-el-mismo-estado 
Conflicts:
	pandora_console/include/ajax/events.php
 2022-08-01 07:08:00 +02:00
Daniel Barbero Martin fe1a2cd962 collation mysql8 pandora_enterprise#9290 2022-07-29 08:46:17 +02:00
Daniel Barbero Martin e3e9f86119 not group by event status pandora_enterprise#8043 2022-07-26 10:55:11 +02:00
Daniel Barbero Martin 9d33fa08fe fix error collation events pandora_enterprise#9290 2022-07-26 07:57:04 +02:00
Daniel Rodriguez 5d674b76b6 Merge branch 'ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos' into 'develop' 
new filter search eventspandora_enterprise#8942

See merge request artica/pandorafms!5007
 2022-07-21 10:15:49 +00:00
Daniel Barbero Martin 027f61daff Merge remote-tracking branch 'origin/develop' into ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos 
Conflicts:
	pandora_console/extras/mr/56.sql
 2022-07-19 10:18:04 +02:00
Daniel Barbero Martin 13832dcfa2 fix time api create event pandora_enterprise#9284 2022-07-18 17:06:12 +02:00
Diego Muñoz-Reja a257f43d49 Merge branch 'ent-8939-Cambiar-comportamiento-de-los-comentarios-en-eventos-rendimiento' into 'develop' 
Ent 8939 cambiar comportamiento de los comentarios en eventos rendimiento

See merge request artica/pandorafms!4889
 2022-07-05 15:44:24 +00:00
Daniel Barbero Martin 12f73d86fd new filter search eventspandora_enterprise#8942 2022-07-05 17:02:40 +02:00
Daniel Barbero Martin e009257d2f bugs events pandora_enterprise#9239 2022-06-30 11:56:25 +02:00
Daniel Maya 475524df04 #8939 conflict resolved 2022-06-28 10:58:17 +02:00
Daniel Maya 2049805de7 #9033 conflict resolved 2022-06-27 17:13:23 +02:00
Daniel Barbero Martin f89aaabc21 minor fixed events 2022-06-23 18:06:25 +02:00
Daniel Barbero Martin 58f5f4e9f1 refactor events meta pandora_enterprise#9086 2022-06-23 12:47:49 +02:00
Daniel Barbero Martin 0c09e7fc22 refactor events meta pandora_enterprise#9086 2022-06-22 14:05:21 +02:00
Daniel Barbero Martin f39d502108 refactor events meta pandora_enterprise#9086 2022-06-22 10:11:24 +02:00
Daniel Barbero Martin 4ca78ec00c refactor events meta pandora_enterprise#9086 2022-06-22 09:44:00 +02:00
Daniel Barbero Martin 9505206328 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-22 08:48:38 +02:00
José González b2b64ae014 Merge remote-tracking branch 'origin' into ent-9034-Alert-SNMP-como-agent-name-vista-tactica 2022-06-21 14:47:28 +02:00
José González 4480455258 Clean unnecesary message 2022-06-21 14:45:17 +02:00
Daniel Barbero Martin 9bb072a48a refactor events meta pandora_enterprise#9086 2022-06-21 14:10:08 +02:00
Daniel Barbero Martin 9d23b9af4a refactor events meta pandora_enterprise#9086 2022-06-21 11:17:18 +02:00
Daniel Barbero Martin 3e59093b0e refactor events meta pandora_enterprise#9086 2022-06-20 12:29:00 +02:00
Daniel Barbero Martin 7e25a86d52 refactor events meta pandora_enterprise#9086 2022-06-17 12:50:40 +02:00
Daniel Barbero Martin 8e7ed75b3e refactor events meta pandora_enterprise#9086 2022-06-16 11:31:07 +02:00
Daniel Barbero Martin 8ad6d350af refactor events meta pandora_enterprise#9086 2022-06-15 13:06:10 +02:00
Daniel Barbero Martin b82b3c3fb1 refactor events meta pandora_enterprise#9086 2022-06-14 18:47:09 +02:00
Daniel Barbero Martin 90013603a7 refactor events meta pandora_enterprise#9086 2022-06-13 17:06:09 +02:00
Daniel Maya 2cfb4e53c2 #9033 Fixed group events 2022-06-09 14:59:43 +02:00
Daniel Barbero Martin 8dbc860f4a refactor events meta pandora_enterprise#9086 2022-06-08 17:01:15 +02:00
Daniel Barbero Martin ee2810e680 refactor events meta pandora_enterprise#9086 2022-06-07 17:25:51 +02:00
Daniel Barbero Martin 1cd680a971 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/operation/events/events.php
 2022-06-03 09:28:18 +02:00
Daniel Barbero Martin 8dd9523b40 refactor events meta pandora_enterprise#9086 2022-06-03 09:20:51 +02:00
Daniel Rodriguez 98dd5b81ce Merge branch 'ent-8766-POST-Error-al-crear-eventos-con-comentarios-que-tienen-salto-de-línea' into 'develop' 
Ent 8766 post error al crear eventos con comentarios que tienen salto de línea

See merge request artica/pandorafms!4796
 2022-06-02 07:33:10 +00:00
Daniel Barbero Martin 0cda3d3613 refactor events meta pandora_enterprise#9086 2022-06-01 17:27:44 +02:00
Daniel Maya 4ae2df8ded #8939 comment optimization 2022-05-17 13:42:38 +02:00
Daniel Maya a2be858a7d #8836 remove base64 decode 2022-05-10 16:25:05 +02:00
Daniel Barbero Martin da0f1db288 8940 fix events view 2022-05-05 11:32:37 +02:00
Daniel Barbero Martin e46be28765 performance events view#8800 2022-04-19 09:30:27 +02:00
Daniel Maya 4a6ab6ce95 #8766 Fixed event comments 2022-04-04 16:02:26 +02:00
alejandro.campos@artica.es 3042755e70 Merge branch 'ent-8340-POST-Custom-data-en-vista-de-eventos' of brutus.artica.es:artica/pandorafms into ent-8340-POST-Custom-data-en-vista-de-eventos 2022-04-01 14:07:31 +02:00