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

638 Commits

Author SHA1 Message Date
Pablo Aragon ae6159c7a1 Events 2023-03-10 08:40:38 +01:00
daniel 5d7738a05e Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/operation/events/events.php
 2023-03-03 08:20:44 +01:00
Daniel Rodriguez 7e9abf01dd Merge branch 'ent-9805-14513-14958-problema-timestamp-vs-utimestamp-en-tevento-al-crear-eventos-por-api' into 'develop' 
Unified event timestamp and utimestamp

See merge request artica/pandorafms!5561
 2023-03-02 16:32:01 +00:00
daniel a5e6e569e8 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 08:04:00 +01:00
Diego Muñoz-Reja 2057cf8d47 Merge branch 'ent-9666-nuevo-widget-event-cardboard' into 'develop' 
Ent 9666 nuevo widget event cardboard

See merge request artica/pandorafms!5533
 2023-03-01 15:49:47 +00:00
daniel 7602ec1bd8 fixed styles 2023-02-24 14:28:07 +01:00
Jose Gonzalez a6f1037c9a Minor fixes or improvements 2023-02-24 13:37:47 +01:00
Calvo dfa63378ff Unified event timestamp and utimestamp 2023-02-23 11:19:17 +01:00
Jose Gonzalez 0380e8a10c Ticket 10394 Black theme fixes 2023-02-22 16:24:11 +01:00
Jonathan 64f79b87c9 Event OS bug image 2023-02-16 16:35:13 +01:00
Pablo Aragon 87c3bee756 9666-New widget Event cardboard 2023-02-15 11:23:36 +01:00
Jose Gonzalez d6eedf07aa Merge 2023-02-13 10:03:09 +01:00
Jose Gonzalez 175d4b7341 Fixes in Event view and other fixes 2023-02-09 16:13:30 +01:00
Jose Gonzalez dfdcb688d4 Improve code 2023-02-06 23:10:28 +01:00
Daniel Cebrian e5a18f67a7 #10307 added user info in in progress status event 2023-02-06 16:51:36 +01:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
daniel 81ae7fdb08 fix filter events sounds pandora_enterprise#10188 2023-01-27 12:41:06 +01:00
Rafael Ameijeiras 8215067a1c Merge branch 'ent-9799-derivado-del-trabajo-q-a-766-error-al-cambiar-al-dueno-de-un-evento' into 'develop' 
Ent 9799 derivado del trabajo q a 766 error al cambiar al dueno de un evento

See merge request artica/pandorafms!5410
 2023-01-27 08:25:16 +00:00
daniel ddebce7a3c fix validate events pandora_enterprise#10175 2023-01-25 11:25:20 +01:00
Daniel Cebrian 930fd719ff #9799 fixed show value -1 in Owner value 2023-01-13 09:31:19 +01:00
Daniel Cebrian 05b8418249 #9799 fixed default value -1 in Owner value 2023-01-13 09:02:40 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Jose Gonzalez 60685cdccc Table fixes 2023-01-10 10:18:37 +01:00
Jonathan e55d4f3019 #9787 Alert general Acknowledged recovery 2023-01-05 10:36:14 +01:00
Jose Gonzalez 8421fb49ca Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-01-04 15:54:16 +01:00
daniel 5907d55ec1 phpchartjs pandora_enterprise#9554 2022-12-22 23:03:52 +01:00
Daniel Barbero b4d306b9b1 Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-19 09:38:21 +01:00
Daniel Barbero a0ddad63b8 Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos 
Conflicts:
	pandora_console/extras/mr/59.sql
 2022-12-13 09:17:39 +01:00
Daniel Barbero 01d14ae3b8 new chart chartjs pandora_enterprise#9554 2022-12-13 09:10:13 +01:00
Rafael Ameijeiras 884e07d11e Merge branch 'ent-9747-14463-faltan-eventos-en-la-consola-cuando-se-seleccionan-todos' into 'develop' 
Ent 9747 14463 faltan eventos en la consola cuando se seleccionan todos

See merge request artica/pandorafms!5251
 2022-12-12 22:54:27 +00:00
Rafael Ameijeiras d3a079765d Merge branch 'ent-9246-13884-habilitar-_groupcontact_-en-las-respuestas-de-eventos' into 'develop' 
add new macro event response group_contact pandora_enterprise#9246

See merge request artica/pandorafms!5240
 2022-12-12 22:53:21 +00:00
jose.gonzalez@pandorafms.com 445a8161cf Merge 2022-12-05 09:44:35 +01:00
Daniel Rodriguez ba4112907d Merge branch 'ent-9494-post-busqueda-de-eventos-por-custom_data-no-permite-espacios-ni-mayusculas' into 'develop' 
Ent 9494 post busqueda de eventos por custom data no permite espacios ni mayusculas

See merge request artica/pandorafms!5208
 2022-11-23 09:47:55 +00:00
Daniel Rodriguez 0fb90e3383 Merge branch 'ent-9861-stored-cross-site-scripting-vulnerability-in-create-event-section' into 'develop' 
Fix events view XSS vulnerabilities

See merge request artica/pandorafms!5284
 2022-11-23 09:46:52 +00:00
jose.gonzalez@pandorafms.com a688182062 Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2022-11-22 17:47:02 +01:00
Calvo 5aa51f28de Fix events view XSS vulnerabilities 2022-11-22 15:54:19 +01:00
Daniel Rodriguez 833032763d Merge branch 'ent-9822-14530-Problemas-en-Widgets-de-Dashboard' into 'develop' 
minor fix

See merge request artica/pandorafms!5273
 2022-11-22 12:29:37 +00:00
Daniel Maya 4e94976b9d #9494 Fixed custom data search 2022-11-22 13:24:26 +01:00
Daniel Rodriguez 1a77ee9ce4 Merge branch 'ent-9716-14429-no-se-ve-primer-ultimo-evento-al-agrupar-por-extra-id' into 'develop' 
fix timestamp modal event grouped by extra id pandora_enterprise#9716

See merge request artica/pandorafms!5229
 2022-11-22 09:20:47 +00:00
Daniel Barbero 4118a46b9f add new filter search events pandora_enterprise#9135 2022-11-18 14:04:54 +01:00
Daniel Barbero a31733ffef Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos 2022-11-18 07:51:26 +01:00
alejandro.campos@artica.es 635eb692d1 minor fix 2022-11-16 16:43:21 +01:00
Daniel Rodriguez 65ea42d8f7 Merge branch 'ent-9723-bug-con-el-get_events-de-la-api-14390' into 'develop' 
fix api get events pandora_enterprise#9723

See merge request artica/pandorafms!5239
 2022-11-14 11:33:59 +00:00
Daniel Barbero 4385442690 fixed acl error in events list pandora_enterprise#9794 2022-11-10 13:13:44 +01:00
Daniel Barbero c16901a5e2 fixed get events API pandora_enterprise#9723 2022-11-10 09:19:32 +01:00
Daniel Barbero b8939cb624 fix api get agent criticity pandora_enterprise#9723 2022-11-08 09:00:25 +01:00
Luis Calvo a40f1909e7 Fix events view coun with no pagination 2022-11-07 16:19:18 +01:00
= 58e5f7180d Fix events view coun with no pagination 2022-11-07 15:59:56 +01:00
jose.gonzalez@pandorafms.com f99a7dc511 Adaptations 2022-11-07 14:04:07 +01:00
Daniel Barbero 33b1c0ab8f add new filter pandora_enterprise#9135 2022-11-03 12:00:58 +01:00