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

10637 Commits

Author SHA1 Message Date
marcos.alconada 23b3d07f37 Merge remote-tracking branch 'origin/develop' into ent-3925-eliminar-custom-response-deprecated 2019-05-09 09:29:27 +02:00
artica 7da73afd08 Auto-updated build strings. 2019-05-09 00:01:10 +02:00
Daniel Rodriguez 8f6c8a9932 Merge branch 'ent-3613-Ventana-modal-de-vista-de-Eventos' into 'develop' 
Ent 3613 ventana modal de vista de eventos

See merge request artica/pandorafms!2387
 2019-05-08 19:07:39 +02:00
Daniel Rodriguez 0a7539cc3a Merge branch 'ent-3990-7999-colecciones-no-funcionan-no-se-puede-subir-ni-crear-archivos' into 'develop' 
fixed filemanager

See merge request artica/pandorafms!2408
 2019-05-08 18:26:23 +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
Alejandro Fraguas 4b7f9e4882 Merge branch 'ent-3884-Error-Superredes' into 'develop' 
fixed errors IPAM subneting

See merge request artica/pandorafms!2395
 2019-05-08 15:57:53 +02:00
Daniel Rodriguez 0ebf89a9eb Merge branch 'ent-3533-Mostrar-Contact-en-informacion-de-los-eventos' into 'develop' 
Show contact in events information

See merge request artica/pandorafms!2373
 2019-05-08 14:13:08 +02:00
Daniel Rodriguez f13162abf1 Merge branch 'ent-3802-visual-constole-warning-state-bug' into 'develop' 
Fixed select bug not selectig value

See merge request artica/pandorafms!2346
 2019-05-08 13:17:02 +02:00
Daniel Rodriguez 247605f308 Merge branch 'ent-3664-Al_aplicar_un_cambio_en_un_agente_se_muestra_que_se_ha_realizado_con_exito_pero_no_actualiza_campos_a_primera_vista' into 'develop' 
Eliminated the cache when update agents

See merge request artica/pandorafms!2242
 2019-05-08 12:50:40 +02:00
Luis Calvo ef1149d3bb Fixed get agent status on linked map 2019-05-08 12:39:53 +02:00
Luis Calvo 5b75b671aa Merge remote-tracking branch 'origin/develop' into ent-3802-visual-constole-warning-state-bug 2019-05-08 12:37:10 +02:00
Alejandro Fraguas 297f53b9de Merge branch 'ent-3608-Update-Manager-Online' into 'develop' 
Ent 3608 update manager online

See merge request artica/pandorafms!2379
 2019-05-08 11:20:12 +02:00
Daniel Barbero Martin 99f5cab83d fixed filemanager 2019-05-08 10:55:20 +02:00
artica f2873714a6 Auto-updated build strings. 2019-05-08 00:01:08 +02:00
Luis Calvo 954aac3aeb Merge remote-tracking branch 'origin/develop' into ent-3802-visual-constole-warning-state-bug 2019-05-07 17:13:54 +02:00
Alejandro Fraguas 0a96cfd696 Merge branch 'ent-3819-Bug-en-vista-monitor-details-con-tags' into 'develop' 
Fixed bug in monitor detail view

See merge request artica/pandorafms!2360

Former-commit-id: fcbe351e4a71b0827fa7e4919a3b4ae8ffa956bb
 2019-05-07 10:17:37 +02:00
artica 9116a72a2b Auto-updated build strings. 
Former-commit-id: dfb64d2cea90593ac4b70d6e4d9f6958f3b472d8
 2019-05-07 00:01:09 +02:00
Alejandro Fraguas 11a16e4c2a Merge branch 'ent-3408-snmp-component-creation-api' into 'develop' 
Fixed wrong array index for id_group

See merge request artica/pandorafms!2286

Former-commit-id: eaea4fc6551e34c2941e094c78099e07a5315df5
 2019-05-06 17:00:29 +02:00
Alejandro Fraguas 545afcb684 Merge branch 'ent-3866-7901-bug-en-busqueda-general-usuario-con-grupo-asignado' into 'develop' 
Added secondary groups in global search

See merge request artica/pandorafms!2351

Former-commit-id: c9202c576699e7cd4df19e5d7a28bda5fc36826c
 2019-05-06 10:33:30 +02:00
artica 6d7b748591 Auto-updated build strings. 
Former-commit-id: 0110fd44ff110c73a9bdb427e7a017258a48bfa8
 2019-05-06 00:01:06 +02:00
artica 83b6fe5a55 Auto-updated build strings. 
Former-commit-id: 24f76ce9d15cf44952fe148ff48f6017b5798942
 2019-05-05 00:01:07 +02:00
artica 168ee6cdc6 Auto-updated build strings. 
Former-commit-id: 0a99a82af6cebf9b798329e52e44819825c0bb05
 2019-05-04 00:01:07 +02:00
artica b88456f696 Auto-updated build strings. 
Former-commit-id: 21d8c77dbdf5653b73aed9a83b833ec8dc5cb243
 2019-05-03 00:01:06 +02:00
artica 828d7830a5 Auto-updated build strings. 
Former-commit-id: 646717be2ca7b947dc8acf0c9db4b8e4ab7762b0
 2019-05-02 00:01:06 +02:00
artica a9e0acd3e1 Auto-updated build strings. 
Former-commit-id: e2dcdd18fd18f75cff8c27ebd69b40940186166b
 2019-05-01 00:01:10 +02:00
Daniel Rodriguez 3b73ea95ae Merge branch 'ent-3940-No-salen-IPs-en-mapas-netflow' into 'develop' 
Fixed node name in netflow map

See merge request artica/pandorafms!2386

Former-commit-id: 14cf4f85a78b092fb7efe10a05e63702d4dbcbb2
 2019-04-30 17:53:48 +02:00
Daniel Rodriguez 5be813e210 Merge branch 'ent-3877-custom-field-view-faltan-los-enlaces-en-los-contadores' into 'develop' 
add links counters cfv

See merge request artica/pandorafms!2388

Former-commit-id: 8666427450be1b27f1c6b7ae08a3e9388e32aa97
 2019-04-30 17:50:33 +02:00
Daniel Maya c31948b7c2 Fixed netflow node name 
Former-commit-id: 0e134e7e70546aca26178336e4ff5ba2489d55ea
 2019-04-30 17:30:57 +02:00
artica 310d217fb2 Auto-updated build strings. 
Former-commit-id: 0a9db145834a075fc587da6ed5e09fd3f24a2684
 2019-04-30 00:01:09 +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 94932d23ac fixed error cfv status 
Former-commit-id: cccd14ea5d2e202124233372e3db47564b2d8475
 2019-04-29 15:43:51 +02:00
Daniel Rodriguez 9788a9f6d5 Merge branch 'visual-console-refactor' into 'develop' 
Visual console refactor: hotfixes

See merge request artica/pandorafms!2384

Former-commit-id: 59e435071a8cf94f4628ce04a77c00b42c65e4eb
 2019-04-29 12:43:42 +02:00
Alejandro Gallardo Escobar 5f986e2390 Visual Console Refactor: bugfix 
Former-commit-id: 2afef18813cc2a2d51a40bdf0a5c619bd0900b59
 2019-04-29 11:53:21 +02:00
Alejandro Gallardo Escobar 7f6ec7a501 Visual Console Refactor: bugfix 
Former-commit-id: 10f2a2199275475b7674364bb5f3d595b65f12c9
 2019-04-29 11:03:56 +02:00
Alejandro Gallardo Escobar e5c17f660b Visual Console Refactor: fixed the label position 
Former-commit-id: d39b91f86c43e6e90f9287409635d331667d9551
 2019-04-29 10:56:06 +02:00
Alejandro Gallardo Escobar c09fbf4ddb Visual Console Refactor: fixed the links 
Former-commit-id: c37373329350c8b1ed421ae91f2a3c1e7d7f577a
 2019-04-29 10:45:12 +02:00
marcos.alconada 24e8d81b43 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 
Former-commit-id: c15ebac07056c99c3c79ae57fa1396ea66d00c04
 2019-04-29 09:26:48 +02:00
artica 5d6bd31786 Auto-updated build strings. 
Former-commit-id: 90534253be4245eaeca6b5994e861ac7f96d3b09
 2019-04-29 00:01:06 +02:00
artica 141a042ee2 Auto-updated build strings. 
Former-commit-id: 64644bc78a4b14adc5d7d76e1dc669788f06944f
 2019-04-28 00:01:06 +02:00
artica 29b7ddeb6d Auto-updated build strings. 
Former-commit-id: 48f05c5d685e8d6897e3eb490f5d4543feefcbb7
 2019-04-27 00:01:09 +02:00
Daniel Maya 504457f9a6 Fixed decimal in percentil 
Former-commit-id: ad964b4e4e2fa59eae959d5107b63d3c6f96766c
 2019-04-26 14:37:35 +02:00
Daniel Barbero e54112641d add links counters cfv 
Former-commit-id: 5a1bdfc376db32f94d06330c2e498c473361e710
 2019-04-26 14:25:51 +02:00
Tatiana Llorente 77941953a2 New style for modal window Show More. Tabs: Responses, Related, Custom data. - #3613 
Former-commit-id: 48ed0a69416232a9016b6aaff76378954ddacdc1
 2019-04-26 11:57:41 +02:00
Daniel Maya 4b73518804 Fixed node name in netflow map 
Former-commit-id: 4805505ff44d05ea9fd4aaa8b1cb1b699c2e90f8
 2019-04-26 09:54:38 +02:00
marcos.alconada cffb469334 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 
Former-commit-id: 2883dbe057d3c6063a1d1784c64c85dc49c0713b
 2019-04-26 09:44:54 +02:00
artica 6de9b4f23e Auto-updated build strings. 
Former-commit-id: 2662fa51b6a4dc2cdb87c769480ed35df148cc62
 2019-04-26 00:01:06 +02:00
Alejandro Gallardo Escobar 6feaba0b9d Visual Console: changed the default orientation of the items 
Former-commit-id: 121e71236369303385a4579b49b2129c1a0f62d0
 2019-04-25 18:23:28 +02:00
Alejandro Gallardo Escobar f3f5bcecd8 Visual Console Refactor: fixed the module graph element 
Former-commit-id: baee256acdbc28c3b2d0364b97f301f776121e36
 2019-04-25 16:59:24 +02:00
Alejandro Gallardo Escobar af69804708 Improved the background size and the elements order of the Visual Console 
Former-commit-id: 6c6c7f332062dd0b405387730e06f29cf1d328d8
 2019-04-25 16:36:17 +02:00
marcos.alconada da8507c4b4 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 
Former-commit-id: 56da7f09fa90543ae4b07af79da5dd308a4aa395
 2019-04-25 16:05:27 +02:00