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

764 Commits

Author SHA1 Message Date
Jonathan 9819c3a5ff Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos 2023-11-28 08:30:23 +01:00
Rafael Ameijeiras e5c708298b Merge branch 'ent-11760-15978-anadir-el-filtro-en-el-estado-de-eventos-not-acknowledged' into 'develop' 
add new type search status events not in process pandora_enterprise#11760

See merge request artica/pandorafms!6491
 2023-11-27 10:41:28 +00:00
Diego Muñoz-Reja 59bed70175 Merge branch 'ent-12153-grafica-de-eventos-a-lo-largo-del-tiempo-en-vista-de-eventos' into 'develop' 
Ent 12153 grafica de eventos a lo largo del tiempo en vista de eventos

See merge request artica/pandorafms!6532
 2023-11-27 10:32:34 +00:00
Daniel Cebrian 4c475239c9 #12513 fixed bug in alert triggered 2023-11-23 17:15:44 +01:00
Jonathan 11cc31c0ad #11705 Event custom id edit by EW only 2023-11-23 10:23:57 +01:00
Jonathan 4f707a5a1b Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos 2023-11-23 09:27:46 +01:00
Jonathan 63b069d739 #11705 fix for id as array 2023-11-22 11:20:46 +01:00
daniel 161b0e8a34 Add filter eventcardboard pandora_enterprise#11760 2023-11-08 10:31:42 +01:00
daniel 5bc1cb1862 Merge remote-tracking branch 'origin/develop' into ent-11760-15978-anadir-el-filtro-en-el-estado-de-eventos-not-acknowledged 2023-11-08 09:48:46 +01:00
Daniel Maya 287b983ce9 #12371 Fixed events 2023-11-02 15:39:55 +01:00
miguel angel rasteu 84ab19119b #12175 Fix recovery alert icon 2023-11-02 15:11:53 +01:00
daniel fa39a97518 Module histogram only events pandora_enterprise#12209 2023-10-27 10:18:10 +02:00
daniel db6f53760e Merge remote-tracking branch 'origin/develop' into ent-11760-15978-anadir-el-filtro-en-el-estado-de-eventos-not-acknowledged 2023-10-06 13:04:04 +02:00
miguel angel rasteu 6312804386 #12153 Fix graph height 2023-10-05 09:52:52 +02:00
miguel angel rasteu 87aa79b176 #12153 Fix graph 2023-10-05 09:45:17 +02:00
miguel angel rasteu 09cae778c5 #12153 Create event list graph 2023-10-04 16:28:40 +02:00
miguel angel rasteu 874cb9c52a #12153 Create button and ajax request 2023-10-04 12:41:23 +02:00
Rafael Ameijeiras 439d5b54aa Merge branch 'ent-11961-16159-activar-show-all-events-24h-por-defecto-en-vista-de-ultimos-eventos-de-agente' into 'develop' 
Agents show events 24h switch checked default

See merge request artica/pandorafms!6405
 2023-10-02 07:08:52 +00:00
Jonathan 6db13cc55a merge conflict solution 2023-09-28 13:14:49 +02:00
Calvo 0b4ee35780 Fix query agent events 2023-09-27 11:01:21 +02:00
daniel 91393c9e39 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/include/styles/pandora.css
 2023-09-25 17:06:08 +02:00
Jonathan 70e3707b64 #11705 group extra id heredity event custom id 2023-09-25 12:22:10 +02:00
daniel 2e63546550 add new type search status events not in process pandora_enterprise#11760 2023-09-25 11:29:38 +02:00
Jonathan e5c5f91576 #11705 change name event_custom_id 2023-09-25 10:32:23 +02:00
Jonathan 79fe89c3c5 #11705 new custom_field tevento 2023-09-22 12:24:15 +02:00
Jorge Rincon 08fe98a8ba fixed filter display permissions in modal 2023-09-15 13:57:14 +02:00
Jorge Rincon 764d5908bb Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados 2023-09-11 10:58:37 +02:00
daniel 5a61f074d7 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-22 09:22:11 +02:00
Daniel Cebrian dd5a4887a2 #10870 fixed change status from event 2023-08-18 14:14:51 +02:00
Daniel Cebrian fa04db27a7 Merge branch 'develop' into ent-10870-15385-limpiar-eventos-desde-la-vista-detallada-de-evento 2023-08-18 10:40:29 +02:00
Jorge Rincon 3e4178c490 Merge branch develop into ent-10065-post-filtros-de-eventos-privados 2023-08-18 09:19:57 +02:00
daniel 8bc65474f0 ITSM pandora_enterprise#11471 2023-08-16 16:52:57 +02:00
daniel 133eef456a Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 08:14:34 +02:00
daniel dbf98689c2 ITSM pandora_enterprise#11471 2023-08-11 14:30:18 +02:00
Rafael Ameijeiras 0d316c0d27 Merge branch 'ent-11583-iconos-de-tipos-de-eventos-en-informes' into 'develop' 
Ent 11583 iconos de tipos de eventos en informes

See merge request artica/pandorafms!6156
 2023-08-11 09:43:46 +00:00
Jorge Rincon 7b9aae83ca #11583 Fixed agent icon in firefox and chrome browser 2023-08-11 10:47:15 +02:00
Jorge Rincon 3429e0d190 #10065 Added the option to create-edit a private event filter. 2023-08-07 14:43:50 +02:00
miguel angel rasteu ded7bb1017 #11751 Fix reset 2023-07-31 11:49:29 +02:00
miguel angel rasteu 63923e3599 Merge branch 'develop' into ent-11751-15966-metaconsola-no-se-exportan-los-eventos-a-csv 2023-07-31 11:28:59 +02:00
alejandro.campos@artica.es 8029125929 fix inherit ack timestamp feature 2023-07-27 15:04:22 +02:00
miguel angel rasteu ed77e042e1 #11751 Fix node CSV 2023-07-20 13:16:25 +02:00
daniel a10412872b alerts user comment pandora_enterprise#11387 2023-07-19 15:04:37 +02:00
daniel c520375c61 ack utimestamp pandora_enterprise#11387 2023-07-19 13:28:53 +02:00
daniel d3412a7ad1 add filter events comments pandora_enterprise#11387 2023-07-10 16:26:33 +02:00
daniel 200750f90b change events user_comment new table tevent_comment pandora_enterprise#11387 2023-07-07 12:53:14 +02:00
Jorge Rincon 2aaa21ebff #11583 Fixed the warning module icon in the node 2023-07-04 17:34:08 +02:00
Jorge Rincon 8eb11f2b5b Fixed icons in node and meta for warning status 2023-07-04 15:55:54 +02:00
Jonathan 5f8c2f1653 #11628 merge conflict solution 2023-07-03 09:34:04 +02:00
Rafael Ameijeiras d082687c44 Merge branch 'ent-10020-Eliminar-login-hash-de-vistas-metaconsola' into 'develop' 
Ent 10020 eliminar login hash de vistas metaconsola

See merge request artica/pandorafms!5839
 2023-06-29 09:55:53 +00:00
Daniel Cebrian adb7c33863 #10870 changed status from view details views when is agruped by extraid 2023-06-26 17:05:46 +02:00
Jorge Rincon db590f2367 #11583 Icons in event view for reports have been adjusted. 2023-06-21 10:08:29 +02:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
alejandro.campos@artica.es 4cac880eca send login hash info in post body in meta links to node 2023-05-05 13:04:02 +02:00
miguel angel rasteu 8e9bc5d0bb Fix style class invert_filter 2023-04-20 11:13:47 +02:00
Diego Muñoz-Reja b8569af77c Merge branch 'ent-10727-fechas-incorrectas-en-el-informe-de-tipo-agent-event-y-otros-fallos-menores-de-informes-de' into 'develop' 
Ent 10727 fechas incorrectas en el informe de tipo agent event y otros fallos menores de informes de

See merge request artica/pandorafms!5659
 2023-04-18 11:04:46 +00:00
Daniel Maya 837092d17e #10002 Fixed comments 2023-04-10 16:57:22 +02:00
Jonathan 2d3c3b70e6 #10727 PDF correction agent event module 2023-04-04 14:27:47 +02:00
daniel 1262fee2e8 fixed styles 2023-03-30 08:43:23 +02:00
Jonathan 3057e67d1f Merge conflict solution 2023-03-27 12:11:53 +02:00
Rafael Ameijeiras f14be9c523 Merge branch 'ent-10311-14988-comentarios-de-eventos-se-muestran-en-evento-no-relacionado' into 'develop' 
Ent 10311 14988 comentarios de eventos se muestran en evento no relacionado

See merge request artica/pandorafms!5582
 2023-03-24 09:03:37 +00:00
Rafael Ameijeiras 361ecf4019 Merge branch 'ent-10411-15079-error-event-replication-en-vista-de-comentarios' into 'develop' 
Fix events comment tags acl

See merge request artica/pandorafms!5544
 2023-03-21 09:00:45 +00:00
daniel 594d34931c fixed styles 2023-03-17 13:20:58 +01:00
Calvo 13f52c18bc Merge remote-tracking branch 'origin/develop' into ent-10411-15079-error-event-replication-en-vista-de-comentarios 2023-03-17 08:44:59 +01:00
Jonathan 3aba51d0ed Borders and colors PDFS 2023-03-16 10:42:39 +01:00
Jonathan d323ab7fe5 Timezonevisual correction and fix conflict 2023-03-15 09:06:07 +01:00
Pablo Aragon 6e4fe7bc48 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-14 14:56:52 +01:00
Pablo Aragon 658f2853f7 Dashboards widgets 2023-03-14 14:56:33 +01:00
Jonathan 00ba02e23e Visual changes PDFs slicebar 2023-03-14 13:26:21 +01:00
Pablo Aragon ae6159c7a1 Events 2023-03-10 08:40:38 +01:00
Daniel Cebrian 031c8a8db1 #10311 ignore extraid in sql when is empty 2023-03-07 09:10:18 +01:00
Jonathan cf29caedcd Conflict solution 2023-03-06 11:04:05 +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
Calvo f70ab4c44d Fix misspell 2023-02-16 16:57:11 +01:00
Jonathan 64f79b87c9 Event OS bug image 2023-02-16 16:35:13 +01:00
Calvo d447b621de Fix events comment tags acl 2023-02-16 13:16:41 +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
Jonathan 181b172ba8 #9529 timezone visual for new users 2023-02-01 16:57:48 +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