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

522 Commits

Author SHA1 Message Date
Daniel Rodriguez c9cfbf0bf2 Merge branch 'ent-4461-Configuracion-integracion-integria' into 'develop' 
Ent 4461 configuracion integracion integria

See merge request artica/pandorafms!2732
 2019-09-26 14:34:50 +02:00
alejandro-campos f73cd80336 minor changes in integria integration 2019-09-23 15:16:31 +02:00
alejandro-campos 9bf2980f01 fix minor bugs in integria integration 2019-09-23 12:48:20 +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 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 Barbero Martin 84d1979c9e fixed error percentil label 2019-09-18 11:15:55 +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 027f9fd9d4 New view - List of Integria IMS tickets - #4642 2019-09-17 12:59:29 +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
alejandro-campos 11cb53582c backup changes 2019-09-02 17:01:41 +02:00
Daniel Rodriguez c46686981e Merge branch 'ent-4547-Entities-extrañas-en-el-CSV-del-Review-Logs' into 'develop' 
modified function to export audit csv to decode entities as separator

See merge request artica/pandorafms!2692
 2019-08-30 14:29:44 +02:00
alejandro-campos f423ddc42f modified function to export audit csv to decode entities as separator 2019-08-30 09:42:58 +02:00
Alejandro Fraguas fadccf0ff3 Merge branch 'ent-4509-AADCM-MCM-8206-Bug-en-consola-visual-link-a-consola-visual-publica' into 'develop' 
Fixed bug in public visual console view

See merge request artica/pandorafms!2672
 2019-08-26 13:12:31 +02:00
manuel e439e7349f Fixed bug in public visual console view 2019-08-21 09:22:13 +02:00
Jose Gonzalez 5ab2bfacbd Modified date formatting to avoid entities 2019-07-25 15:43:46 +02:00
Jose Gonzalez 5cdfb871a1 Modified the divider in print_audit_csv function 2019-07-25 15:35:57 +02:00
Daniel Barbero Martin 7fa95d3e43 PHP-FPM 2019-07-17 17:20:09 +02:00
fbsanchez fc0d9463d5 Fixed 2019-06-25 12:07:56 +02:00
Daniel Rodriguez 265202f1ed Merge branch 'ent-4136-button-styles' into 'develop' 
Review 1

See merge request artica/pandorafms!2470
 2019-06-20 16:35:12 +02:00
fbsanchez 4424189632 Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-06-19 10:51:34 +02:00
fbsanchez 24025ebb74 Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-18 17:48:03 +02:00
fbsanchez 419a90d69c wip event list 2019-06-07 17:35:13 +02:00
Daniel Maya 419b3f4fb1 Fixed module_manager with Agent limit surpassed or license expired 2019-06-03 10:47:54 +02:00
fbsanchez eb5ee75d33 Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-06-03 09:18:49 +02:00
fbsanchez 94153b823f Help links 2019-05-30 11:25:09 +02:00
fbsanchez 9eecc414dd cps changes - switch core touched - test this commit carefully 2019-05-27 14:12:53 +02:00
fbsanchez 4fe7680694 Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-05-22 15:33:13 +02:00
fbsanchez bd88cbd42d 1st approach simplifying MC management 2019-05-22 15:31:59 +02:00
manuel ada49966e0 Merge branch 'develop' into ent-3468-Ayudas_online 
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
 2019-05-21 10:05:06 +02:00
Alejandro Fraguas 3548070ec1 Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' into 'develop' 
Add new message to News board

See merge request artica/pandorafms!2415

Former-commit-id: b0adfc73ac247cda59dea01e83429e06ba5747ee
 2019-05-14 17:56:43 +02:00
marcos.alconada 35c7ea1f48 Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4020-cambiar-mensaje-de-bienvenida-tnews 
Former-commit-id: 3c10d8ecea2a6fdb44a6003d45ccf146972a92e1
 2019-05-14 17:14:02 +02:00
marcos.alconada bc849c16fb Only one image for welcome new board 
Former-commit-id: a8effda6019c394a9a2d15fbf4998490867b3b02
 2019-05-14 17:13:44 +02:00
manuel 827ebcfbc5 Fix helps 
Former-commit-id: c4c666d8552f153a8d29320d655d27da50fa4267
 2019-05-14 13:09:49 +02:00
manuel b89751e647 Merge branch 'develop' into ent-3468-Ayudas_online 
Conflicts:
pandora_console/godmode/alerts/configure_alert_command.php


Former-commit-id: 9051a95f31fd7163a0b326d7e513c5689c5b304f
 2019-05-14 11:50:07 +02:00
Alejandro Fraguas 8ff62a58ce Merge branch 'ent-3695-ipam-oids' into 'develop' 
IPAM vlan wizard ExtremeXOS

See merge request artica/pandorafms!2409

Former-commit-id: e3881101a9d529cf64241b24ed251eaafc45d6f5
 2019-05-14 11:30:55 +02:00
manuel 20dace7de8 Merge branch 'develop' into ent-3468-Ayudas_online 
Conflicts:
pandora_console/godmode/agentes/agent_manager.php


Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
 2019-05-13 16:20:12 +02:00
Daniel Barbero Martin ab2bf737d5 Merge remote-tracking branch 'origin/develop' into ent-3894-Bug-Feature-labels-weigh-en-graficas 
Conflicts:
	pandora_console/include/functions.php


Former-commit-id: 6c1ef8bcb15b9969b25082851fa39c8241398b29
 2019-05-10 12:18:10 +02:00
manuel 43ce4f9883 Added helps 2019-05-09 17:20:27 +02:00
manuel 143def5d87 Added helps 2019-05-09 13:43:53 +02:00
Daniel Rodriguez ac101af72f Merge branch '3631_Unidades_no_se_muestran_en_informes_de_graficas_combinadas' into 'develop' 
Added module units in module graphs

See merge request artica/pandorafms!2237
 2019-05-08 16:36:43 +02:00
fbsanchez 9bc5a2d346 IPAM vlan wizard ExtremeXOS 2019-05-08 14:17:40 +02:00
manuel b2b4372c9d Added helps 
Former-commit-id: 0f3894ec81918c25e33bfb67463f4709e156c374
 2019-05-07 11:34:09 +02:00
manuel 00b5fc0a2c Added helps 
Former-commit-id: 54292202ea50b6a15c909875853b52fe2f1a045a
 2019-05-06 16:59:31 +02:00
Daniel Barbero Martin 3fcd854ae6 fixed error labels graphs and weight in chart 
Former-commit-id: 52acfda4438417b711295ce8d335ea2748b1fa53
 2019-05-06 16:43:59 +02:00
manuel b1dd6edc64 Added changes in helps 
Former-commit-id: e63717665df7be9e2f00b5492ef77c8e93a4e9a4
 2019-04-30 12:28:11 +02:00
manuel 7045e59e87 Added changes in helps 
Former-commit-id: 863eec78c48a3a29b62326dc7ef2609b2990819c
 2019-04-30 10:44:53 +02:00
Daniel Barbero Martin 2aaeddd803 fixed errors IPAM subneting 
Former-commit-id: 58fb50dd594be993a1f17413ab9466d8588fa19a
 2019-04-29 16:42:26 +02:00
Daniel Barbero Martin ac41e9255f helpers 
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
 2019-04-24 13:53:18 +02:00