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

678 Commits

Author SHA1 Message Date
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
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
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