tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-23 02:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity
34,376 Commits 34 Branches 30 Tags
Commit Graph

5147 Commits

Author SHA1 Message Date
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
a5ea095734 Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria 2019-09-24 15:16:22 +02:00
Kike
4ae14e0888 Fixed issue with instructions in events view 2019-09-24 15:14:17 +02:00
Daniel Barbero Martin
cd5fd4782c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 
Conflicts:
	pandora_console/include/visual-console-client/vc.main.css
 2019-09-24 13:20:25 +02:00
Daniel Barbero Martin
50c37e56c9 continue VC 2019-09-23 19:16:36 +02:00
Alejandro Campos
20cebbe988 Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria' 
# Conflicts:
#   pandora_console/extras/mr/32.sql
 2019-09-23 17:16:15 +02:00
alejandro-campos
b8e1caba9d minor fixes 2019-09-23 16:59:16 +02:00
manuel
b7ff7bc121 Fixed bug in report items 2019-09-23 15:27:06 +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
Tatiana Llorente
f9a903319c Adding tabs and new functions - #4644 2019-09-23 13:14:20 +02:00
alejandro-campos
9bf2980f01 fix minor bugs in integria integration 2019-09-23 12:48:20 +02:00
alejandro-campos
be3de8dcfb Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-20 12:45:22 +02:00
alejandro-campos
0df2447770 added comment management and fixed some errors in incident edition 2019-09-20 12:37:47 +02:00
Tatiana Llorente
375bfca6ff New view - Dashboard details of Integria IMS tickets - #4644 2019-09-20 12:27:36 +02:00
Jose Gonzalez
aa345b168d Upload of forgot file 2019-09-20 11:04:12 +02:00
Jose Gonzalez
d7ca703c99 Cleaned the javascript call 2019-09-20 10:53:09 +02:00
Kike
279b360236 Fixed open and enterprise network map migration 2019-09-20 10:13:09 +02:00
Jose Gonzalez
3c609b4d6d Changed the mode of obtain the title 2019-09-19 13:17:29 +02:00
alejandro-campos
e09db0b9a9 Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-19 10:24:58 +02:00
alejandro-campos
1177cce25f added attached files section to incident edition 2019-09-19 10:24:43 +02:00
Daniel Barbero Martin
0c59c89d8f Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-09-19 09:35:52 +02:00
Tatiana Llorente
8acdde9f3a Added date filter - #4642 2019-09-18 18:19:29 +02:00
Tatiana Llorente
eb271a93eb Added button for export to csv - #4642 2019-09-18 15:32:36 +02:00
Daniel Rodriguez
c81cb1d222 Merge branch 'ent-3878-Report-type-summation-not-working-properly' into 'develop' 
Ent 3878 report type summation not working properly

See merge request artica/pandorafms!2599
 2019-09-18 14:41:35 +02:00
Luis Calvo
0c60f13ccd Event column instructions maked unsortabe 2019-09-17 19:54:34 +02:00
alejandro-campos
f2a6dbb60e Merge remote-tracking branch 'origin/ent-4642-Listado-de-tickets-integración-Integria' into ent-4461-Configuracion-integracion-integria 2019-09-17 14:56:54 +02:00
alejandro-campos
87f8badc18 completed integria setup and incident creation and update 2019-09-17 13:38:17 +02:00
Tatiana Llorente
326b053f23 New view - List of Integria IMS tickets - #4642 2019-09-17 13:03:36 +02:00
Tatiana Llorente
027f9fd9d4 New view - List of Integria IMS tickets - #4642 2019-09-17 12:59:29 +02:00
marcos.alconada
53850a8c1f add gis maps to autorefresh list 2019-09-16 15:51:04 +02:00
Luis Calvo
a04268b33c Merge remote-tracking branch 'origin/develop' into ent-3878-Report-type-summation-not-working-properly 2019-09-16 11:02:18 +02:00
Daniel Maya
a4a84c154f Fixed refresh 2019-09-13 12:04:30 +02:00
Tatiana Llorente
ca6fe42298 Merge remote-tracking branch 'origin/ent-4461-Configuracion-integracion-integria' into ent-4642-Listado-de-tickets-integración-Integria 2019-09-13 12:00:04 +02:00
Tatiana Llorente
770ac250d8 Merge branch 'develop' into 'ent-4567-Habilitar-borrado-masivo-de-traps-con-permisos-AW' 
Conflicts:
   pandora_console/operation/snmpconsole/snmp_view.php
 2019-09-11 18:17:39 +02:00
Daniel Rodriguez
566b7ec7bd Merge branch 'ent-3898-name-alias-statistics-SNMP' into 'develop' 
Changed name for alias when identify an agent in SNMP statistics

See merge request artica/pandorafms!2698
 2019-09-06 12:51:19 +02:00
Daniel Rodriguez
64fc679d89 Merge branch 'ent-4599-no-se-muestran-items-vista-de-consola-visual-de-meta' into 'develop' 
Fixed some errors in visual console

See merge request artica/pandorafms!2708
 2019-09-05 15:27:41 +02:00
marcos.alconada
9e4b5ca5c8 Merge remote-tracking branch 'origin/develop' into ent-4457-bug-visual-style-font 2019-09-05 12:03:37 +02:00
marcos.alconada
c12d672109 Add visual condition for JA and CH Lenguage 2019-09-05 12:01:25 +02:00
Daniel Maya
86cf025317 Fixed some errors in visual console 2019-09-05 11:58:15 +02:00