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 |
|
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 |