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

200 Commits

Author SHA1 Message Date
Alejandro Campos fd01375efe Merge branch 'develop' into 'ent-8247-Integracion-con-Integria-Bug-en-selector-de-status-en-creacion-edicion-de-tickets' 
# Conflicts:
#   pandora_console/operation/incidents/configure_integriaims_incident.php
 2021-11-17 09:48:16 +00:00
alejandro.campos@artica.es a842381754 minor change 2021-11-17 10:32:04 +01:00
alejandro.campos@artica.es 3f0fd30eb8 added resolution field in creation and update operations 2021-11-16 14:13:45 +01:00
Daniel Rodriguez eb39636c16 Merge branch 'ent-4710-Posibilidad-de-anadir-archivos-adjuntos-en-creacion-de-ticket-en-integracion-con-Integria' into 'develop' 
Ent 4710 posibilidad de anadir archivos adjuntos en creacion de ticket en integracion con integria

See merge request artica/pandorafms!4483
 2021-11-15 11:23:34 +00:00
Daniel Rodriguez 6b68203811 Merge branch 'ent-4711-Posibilidad-de-ordenar-tickets-en-integracion-con-Integria' into 'develop' 
add sorting capability to integriaims ticket list

See merge request artica/pandorafms!4474
 2021-11-15 10:04:01 +00:00
alejandro.campos@artica.es 406a8b702b visual fixes 2021-11-12 13:30:33 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
alejandro.campos@artica.es 0b033dae74 add capability to upload files in ticket creation and update on Integria integration system 2021-10-19 15:32:22 +02:00
alejandro.campos@artica.es 8db66c7e0e add sorting capability to integriaims ticket list 2021-10-18 11:45:48 +02:00
marcos 85037693b2 fixed visual black theme error 2021-10-07 16:45:56 +02:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Luis 6681d9fd67 Integria tickets table visual fix 2021-05-27 16:21:17 +00:00
alejandro.campos@artica.es 663d1dcf75 minor fix 2021-05-17 13:43:20 +02:00
alejandro.campos@artica.es 172afc9070 minor change 2021-05-13 13:40:09 +02:00
Alejandro Campos caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' 
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
 2021-05-13 11:39:24 +00:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
Daniel Rodriguez fb539be410 Merge branch 'ent-7479-Integracion-Integria-IMS-falla-subida-de-adjuntos' into 'develop' 
fixed bug in file attachment

See merge request artica/pandorafms!4102
 2021-05-11 07:40:54 +00:00
Daniel Rodriguez b6169575a9 Merge branch 'ent-7155-bug-edicion-tickets-integria' into 'develop' 
Ent 7155 bug edicion tickets integria

See merge request artica/pandorafms!3991
 2021-05-10 09:17:14 +00:00
Luis a94c70551d Ent 7155 bug edicion tickets integria 2021-05-10 09:17:14 +00:00
alejandro.campos@artica.es fdeaf52912 implemented user level authentication for integria ims integration 2021-05-07 14:29:29 +02:00
alejandro.campos@artica.es 256750bcb0 fixed bug in file attachment 2021-05-05 09:51:21 +02:00
alejandro.campos@artica.es 2732c6db1c fixed bug in api call 2021-04-16 11:22:29 +02:00
alejandro.campos@artica.es 8021b53763 fixed bug on integria api calls 2021-04-15 13:46:28 +02:00
Marcos Alconada dafa88c27d Ent 7266 black theme mala implementacion de vista de ticket integracion integria 2021-04-09 10:00:11 +00:00
marcos 03cb6ef913 fixed visual error 2021-03-15 17:05:34 +01:00
alejandro.campos@artica.es 3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
alejandro.campos@artica.es 901d12fec0 Integration with Integria 2021-02-25 13:18:04 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
fbsanchez 95f58776c8 fixes group selection 2020-09-30 17:47:44 +02:00
fbsanchez 5d63bc547e Group selection review 2020-09-29 14:22:58 +02:00
marcos 41249220df fixed vilnerability with filename incidents 2020-08-11 09:11:37 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
alejandro-campos 96622933fc added new section in integria setup to configure different options for event responses and alert created tickets 2019-09-26 13:22:10 +02:00
alejandro-campos 0fdf3874d4 Add ACL in integria ticket dashboard 2019-09-26 11:05:27 +02:00
alejandro-campos 93b176269c remove acl check in integria ticket dashboard 2019-09-26 10:38:12 +02:00
alejandro-campos ca184faaa0 minor visual fix in integria ticket creation 2019-09-26 10:10:55 +02:00
alejandro-campos ad01cd0303 Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-26 09:48:13 +02:00
alejandro-campos 91f90d07d6 minor fixes in integria integration 2019-09-26 09:44:58 +02:00
Tatiana Llorente 5436df5575 Changed the word incident for ticket - #4461 2019-09-25 16:13:37 +02:00
Tatiana Llorente 84ae4a8391 Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria 
Conflicts:
	pandora_console/extras/mr/32.sql
 2019-09-25 10:50:31 +02:00
alejandro-campos b8e1caba9d minor fixes 2019-09-23 16:59:16 +02:00
alejandro-campos 8d2820df37 Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-23 15:17:22 +02:00
alejandro-campos f73cd80336 minor changes in integria integration 2019-09-23 15:16:31 +02:00
Tatiana Llorente 59eed5f1af Minor fixes - #4644 2019-09-23 15:09:52 +02:00
alejandro-campos 637700422e Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-23 14:47:23 +02:00
alejandro-campos 9153330832 minor changes in integria integration 2019-09-23 14:47:08 +02:00
Tatiana Llorente 51a1d7c0b7 Merge branch 'ent-4461-Configuracion-integracion-integria' of brutus.artica.lan:artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-23 13:18:08 +02:00