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

2807 Commits

Author SHA1 Message Date
artica 95574adf80 Auto-updated build strings. 2019-06-05 00:01:08 +02:00
artica c584367c14 Auto-updated build strings. 2019-06-04 00:01:06 +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
artica a11b674467 Auto-updated build strings. 2019-06-03 00:01:06 +02:00
artica cfc8d7d177 Auto-updated build strings. 2019-06-02 00:01:05 +02:00
artica f06d160141 Auto-updated build strings. 2019-06-01 00:01:06 +02:00
artica 2f734f2454 Auto-updated build strings. 2019-05-31 00:01:07 +02:00
artica bfef8e61ea Auto-updated build strings. 2019-05-30 00:01:06 +02:00
Daniel Maya 552467286c Merge branch 'develop' into 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual' 
# Conflicts:
#   pandora_console/extras/mr/28.sql
 2019-05-29 11:10:31 +02:00
artica 8572a13319 Auto-updated build strings. 2019-05-29 00:01:07 +02:00
artica 11e5a4ce18 Auto-updated build strings. 2019-05-28 00:01:07 +02:00
Alejandro Gallardo Escobar ce8ba54e09 Merge remote-tracking branch 'origin/develop' into ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual 2019-05-27 11:31:24 +02:00
artica de3464bd02 Auto-updated build strings. 2019-05-27 00:01:05 +02:00
artica ba97da46c6 Auto-updated build strings. 2019-05-26 00:01:04 +02:00
artica a13701ed82 Auto-updated build strings. 2019-05-25 00:01:06 +02:00
artica cc09c257bc Auto-updated build strings. 2019-05-24 00:01:06 +02:00
Daniel Maya 4c874e152c Merge 2019-05-23 10:43:32 +02:00
Daniel Maya 2de2d1f482 Added expiration and deleted old cache data in pandora_db 2019-05-23 10:35:03 +02:00
artica 4c3dea3ba4 Auto-updated build strings. 2019-05-23 00:01:07 +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
artica 892dcc750f Updated version and build strings. 2019-05-22 15:29:49 +02:00
artica ba9edc0378 Auto-updated build strings. 2019-05-22 00:01:07 +02:00
artica 20e38ead81 Auto-updated build strings. 2019-05-21 00:01:08 +02:00
artica d82d178a0d Auto-updated build strings. 2019-05-20 00:01:08 +02:00
artica 2dc5fce6a6 Auto-updated build strings. 2019-05-19 00:01:06 +02:00
artica 509c476c33 Auto-updated build strings. 2019-05-18 00:01:08 +02:00
artica bf202496da Auto-updated build strings. 
Former-commit-id: ff3141fab3d61823cc7bf64e4e013ccda69ecffd
 2019-05-17 00:01:10 +02:00
artica f5f66fc144 Auto-updated build strings. 
Former-commit-id: dff1ba74fcb60ee0ba0278c8baf25614ce391c58
 2019-05-16 00:01:06 +02:00
artica 9c08aa7b57 Auto-updated build strings. 
Former-commit-id: 37439887da302715dff5aa9ba55f3dd11a27f2ca
 2019-05-15 00:01:11 +02:00
artica b7ebb44c48 Auto-updated build strings. 
Former-commit-id: 8ec4c48ebf34ee5d60ddb8b0b1579c47874e936f
 2019-05-14 00:01:09 +02:00
artica 40af2205b1 Auto-updated build strings. 
Former-commit-id: bde62e989e369e296a685f7d2050a92f4b8417e2
 2019-05-13 00:01:06 +02:00
artica 3fc5f183fd Auto-updated build strings. 
Former-commit-id: bcb6a01291e16430de319d27a04f21723e39a5c5
 2019-05-12 00:01:06 +02:00
artica 0008f57e35 Auto-updated build strings. 
Former-commit-id: 62f8df997289fe4c8e8e63eedbb8dcdb1a08da1f
 2019-05-11 00:01:09 +02:00
artica 3119278b26 Auto-updated build strings. 
Former-commit-id: 1dc55561e83817f91b38b437d57e479fb13f3ac3
 2019-05-10 00:01:14 +02:00
artica 7da73afd08 Auto-updated build strings. 2019-05-09 00:01:10 +02:00
artica f2873714a6 Auto-updated build strings. 2019-05-08 00:01:08 +02:00
artica 9116a72a2b Auto-updated build strings. 
Former-commit-id: dfb64d2cea90593ac4b70d6e4d9f6958f3b472d8
 2019-05-07 00:01:09 +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
Alejandro Fraguas 39786e4d32 Merge branch 'ent-3395-Añadir-un-componente-de-red-por-CLI' into 'develop' 
Added new functionality in CLI create_network_component

See merge request artica/pandorafms!2275

Former-commit-id: ca972d681e20579a32a1847bf4bfdce35f4f3de4
 2019-04-30 13:42:23 +02:00
artica 310d217fb2 Auto-updated build strings. 
Former-commit-id: 0a9db145834a075fc587da6ed5e09fd3f24a2684
 2019-04-30 00:01:09 +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
artica 6de9b4f23e Auto-updated build strings. 
Former-commit-id: 2662fa51b6a4dc2cdb87c769480ed35df148cc62
 2019-04-26 00:01:06 +02:00
artica 7f7a727c21 Auto-updated build strings. 
Former-commit-id: ed16fd78100502c29d6310c2c259282c0b776d0e
 2019-04-25 00:01:10 +02:00
artica 8bba24e13a Updated version and build strings. 
Former-commit-id: 2a7a7c9475be0dc4d62e7d7471ed892bc5adecf4
 2019-04-24 10:14:40 +02:00
artica 4a699c2b75 Auto-updated build strings. 
Former-commit-id: d9c3cbb3cf9ddbd4d847aed58c79a3c8d795d7a5
 2019-04-24 00:01:09 +02:00
artica 883f3decb4 Auto-updated build strings. 
Former-commit-id: 49a78e90a71388c7fb6d4fb8beb36f909429a0c2
 2019-04-23 00:01:09 +02:00
artica ea7a8b2b90 Auto-updated build strings. 
Former-commit-id: 5dcf18be78871aec110bc23387eed631fc9b23f4
 2019-04-21 00:01:29 +02:00
artica 1dfda59ce6 Auto-updated build strings. 
Former-commit-id: cd5e2305d2b22765879068907dd042a36f1d1524
 2019-04-20 00:01:24 +02:00
artica 7283d87a17 Auto-updated build strings. 
Former-commit-id: 7661f94b50736f6ebf6b75fc79b2a0570431f424
 2019-04-19 00:01:25 +02:00
artica 9d8e2abd98 Auto-updated build strings. 
Former-commit-id: 9f2ce52207e981ede2c5be3bd52b7747612091d3
 2019-04-18 00:01:27 +02:00
artica ff5a33ba2c Auto-updated build strings. 
Former-commit-id: 20a5c2ce8013b740274a489a7afaa208a23b16e6
 2019-04-17 00:01:32 +02:00
artica 8bf92720ee Auto-updated build strings. 
Former-commit-id: 544097161030608395112a142ed341e26700a678
 2019-04-16 00:01:30 +02:00
artica 68258661b1 Auto-updated build strings. 
Former-commit-id: a45bf5f65399be38165be423f0b40a40e4468522
 2019-04-15 00:01:24 +02:00
artica d0f6726d00 Auto-updated build strings. 
Former-commit-id: b06d9487fb226c80a72020082f0b33ee2af854f7
 2019-04-14 00:01:23 +02:00
artica ef0f7cded8 Auto-updated build strings. 
Former-commit-id: c9f4339d4c39a14d446e1a3ea42c28d68398670d
 2019-04-13 00:01:31 +02:00
fbsanchez fa6529b652 Merge remote-tracking branch 'origin/develop' into ent-3792-spec_console_enterprise_for_rhel7 
Former-commit-id: 8c7e1f5f4aad250e01931a420f8da8819817152f
 2019-04-12 19:18:15 +02:00
artica f5088299f3 Auto-updated build strings. 
Former-commit-id: 3e8354494b7250c6bdcefbe8a961411bdfe5180a
 2019-04-12 00:01:24 +02:00
Rafael Ameijeiras c91893c948 spec console open and build_rpm for rhel7 
Former-commit-id: 324d90d95ea5757285e64ba3e28346ef007a815f
 2019-04-11 13:45:57 +02:00
artica 29e1fc828c Auto-updated build strings. 
Former-commit-id: 180188c01ab9644d5672f1b984a1454402acc1cd
 2019-04-11 00:01:30 +02:00
artica 765ca945a0 Auto-updated build strings. 
Former-commit-id: d69449b4f4ca214bdd3e37e660e0c8d7f0dc9817
 2019-04-10 00:01:25 +02:00
artica 0d05d5c842 Auto-updated build strings. 
Former-commit-id: dc883b86ccb845e022637413e334d4886805bc6b
 2019-04-09 00:01:31 +02:00
artica 9fd5d3bf5a Auto-updated build strings. 
Former-commit-id: 0ec578931463f0c72468bd36a22842e1c3ada363
 2019-04-08 00:01:23 +02:00
artica d35e9dbaae Auto-updated build strings. 
Former-commit-id: 007ce79a077f515323355d6656c9e14dd9c99c73
 2019-04-07 00:01:25 +02:00
artica 1ddb5ebff4 Auto-updated build strings. 
Former-commit-id: 4b2eb28f3aa59b694fe9347111e626dc25d5b207
 2019-04-06 00:01:32 +02:00
artica 8d0e53924d Auto-updated build strings. 
Former-commit-id: 015143b34e644f24b26d36fba4b78525d39ff2e0
 2019-04-05 00:01:32 +02:00
artica f64835dca9 Auto-updated build strings. 
Former-commit-id: fd545daafd448831b9e29eff8629dc3b7c6a630b
 2019-04-04 00:01:27 +02:00
artica 30e9b67062 Auto-updated build strings. 
Former-commit-id: 64d58c7568e01fecd9c4c97a49eeb9df7d55c5dc
 2019-04-03 00:01:33 +02:00
artica f67c3d5fc0 Auto-updated build strings. 
Former-commit-id: 5e2eef78f8e98e69b43dd409c6ba0740c0e7a959
 2019-04-02 00:01:31 +02:00
artica 2d26a74f9e Auto-updated build strings. 
Former-commit-id: 8b0e13150ea9a6f7f482953aa07b57793359cad1
 2019-03-31 00:01:22 +01:00
artica 69df187ae5 Auto-updated build strings. 
Former-commit-id: 644e5f18004d4faf84b27558b3e3ada13a872dcc
 2019-03-30 00:01:27 +01:00
artica 2a96b610d9 Auto-updated build strings. 
Former-commit-id: eef26e4d622c8068249de564ee37638343f22dc0
 2019-03-29 00:01:24 +01:00
artica 98a9c62de9 Auto-updated build strings. 
Former-commit-id: 84db7098e01d25e6f503f49f9170215880e74088
 2019-03-28 00:01:30 +01:00
artica 74cb6970dc Updated version and build strings. 
Former-commit-id: f5c1433f1fcbc61ab069c275f72673b029b98af4
 2019-03-27 16:36:00 +01:00
fermin831 9ee095406b Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php

Former-commit-id: 7bdd1bfbcbc43410fb05465418979f4d085fa230
 2019-03-27 11:59:25 +01:00
artica 8160983e36 Auto-updated build strings. 
Former-commit-id: 00a94a2b9b56bbb245f3389855c734f7af14d874
 2019-03-27 00:01:24 +01:00
fermin831 a2f5b8502a Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/include/styles/pandora.css

Former-commit-id: ad45f5bd3f07d6ef7a6d8d6a291d6a2fd75fda78
 2019-03-26 10:11:13 +01:00
artica 90a2e28247 Auto-updated build strings. 
Former-commit-id: b835fca52692b4696092f9cd5c5737705b7c8153
 2019-03-26 00:01:25 +01:00
artica 3916bcf636 Auto-updated build strings. 
Former-commit-id: f5e0b2e0c54dddef282d78ddc279d689b1bf4a45
 2019-03-25 00:01:22 +01:00
artica 0e51cd0760 Auto-updated build strings. 
Former-commit-id: 54f84af77a2fdaaa8a11cef36b5ff91d614d2219
 2019-03-24 00:01:23 +01:00
artica 9efd962867 Auto-updated build strings. 
Former-commit-id: 37089ebb5e845ab42d62cb476e1cdc5d723904bb
 2019-03-23 00:01:24 +01:00
artica cb8cd37ee7 Auto-updated build strings. 
Former-commit-id: 0224100a1d5a485cd88ebbfdef94e84904e248b9
 2019-03-22 00:01:32 +01:00
fermin831 af9936c78f Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/install.php

Former-commit-id: 13c6146ea07be2c0d1bb571e70c644f1f68ae2bc
 2019-03-21 13:26:55 +01:00
artica dfadf48b4e Auto-updated build strings. 
Former-commit-id: 1a3a90e08e144bc8eea361bef1a69cd14d8f4830
 2019-03-21 00:02:00 +01:00
samucarc d7e5858050 Added new functionality in CLI create_network_component 
Former-commit-id: 89e2bf6002da2f68c09d06e6756f8a7be7c4c241
 2019-03-20 12:48:44 +01:00
artica c598eb60fb Auto-updated build strings. 
Former-commit-id: 35d392b59c07d74a3a8fb8f9291b8835a669c0f2
 2019-03-20 00:01:24 +01:00
fermin831 bc9192b98a [Netflow] Merge three reports in one 
Former-commit-id: 1a7fb1aaacda5009ba2ab911dc69594133517f91
 2019-03-19 17:33:39 +01:00
artica 392c0d0bff Auto-updated build strings. 
Former-commit-id: 143536a35d2458e1a118a4772803afd4a075a26f
 2019-03-19 00:01:25 +01:00
fermin831 e91335ae21 Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/install.php

Former-commit-id: 3d8ef5634d3c1b87e09db11180047bedc0518028
 2019-03-18 08:21:25 +01:00
artica 4772f84850 Auto-updated build strings. 
Former-commit-id: d3bb4e970fb058410a3f4889b4706f4a79aef09c
 2019-03-18 00:01:24 +01:00
artica 093404eedc Auto-updated build strings. 
Former-commit-id: d2bb79b1e176c0047307b57816022ab1834c7da0
 2019-03-17 00:01:29 +01:00
artica 16d5bf5f66 Auto-updated build strings. 
Former-commit-id: 34092826c1d38aedddf8c660c527ebcec3816c18
 2019-03-16 00:01:30 +01:00
artica be08d76e6c Auto-updated build strings. 
Former-commit-id: b661529d620964e946ecb4973030f2518f332458
 2019-03-15 00:01:22 +01:00
fermin831 b660da6e84 Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/extras/mr/26.sql
	pandora_console/install.php

Former-commit-id: dda11929acf5f741e0a4d290b4607ae72683284b
 2019-03-14 10:49:16 +01:00
artica 0ccbb1198a Auto-updated build strings. 
Former-commit-id: 9f80809f181718d9c5fe97439b4d23c856bf9c93
 2019-03-14 00:01:25 +01:00
fbsanchez 83fc35c0c8 DNS plugin updated 
Former-commit-id: c9b9da2c19eeeae743691b6d250ee2bbe09179cb
 2019-03-13 12:42:17 +01:00
artica 99afea22cb Auto-updated build strings. 
Former-commit-id: 9d92b8845f144366f2d7ed521fefbea0ce7e8eac
 2019-03-13 00:01:24 +01:00
artica 67080c72d9 Auto-updated build strings. 
Former-commit-id: d5c1d195e9648fa5b091c533b57a6e234275787c
 2019-03-12 00:01:23 +01:00
artica 0210c2381d Auto-updated build strings. 
Former-commit-id: 7f83037f89edf17156828a793fa1ae3a5920d818
 2019-03-11 00:01:58 +01:00
artica b79815bb06 Auto-updated build strings. 
Former-commit-id: e002aa51a4e0ad634ed459dcccd4444cb1d0081c
 2019-03-10 00:01:25 +01:00
artica fd68b49710 Auto-updated build strings. 
Former-commit-id: 6b07eeeea7577d37282399b23c8b409ab7253507
 2019-03-09 00:01:32 +01:00
Fermin dd8265f65e Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Former-commit-id: 65d43e483dc23616c44da3b26b73c94cbf10d3fe
 2019-03-08 09:02:22 +01:00
artica e43d1aa356 Auto-updated build strings. 
Former-commit-id: d9a712a382713bbbbb82849a2be70991acd7e72f
 2019-03-08 00:01:31 +01:00
artica 4eb6c16339 Auto-updated build strings. 
Former-commit-id: 4c22b36dac2410ec75f5cae1c0e6ec7b81e5d78f
 2019-03-07 00:01:27 +01:00
artica 88f1f16a5a Auto-updated build strings. 
Former-commit-id: 4e42c790d0cc4e621a9cd231c77b3d04fc8443c4
 2019-03-06 00:01:33 +01:00
artica 930c527ad2 Auto-updated build strings. 
Former-commit-id: 2bf7188690fce3ac4ff2b8d124b552f6a6f7d608
 2019-03-05 00:01:26 +01:00
artica 3ed6a2b089 Auto-updated build strings. 
Former-commit-id: d8e95284d6eded43b5d1af26b172a034a06d3bed
 2019-03-04 00:01:22 +01:00
artica 62c7e8dffc Auto-updated build strings. 
Former-commit-id: dd2dc5dcc124d58611076b2e38dd65a596c23f3b
 2019-03-03 00:01:24 +01:00
artica b194d439d2 Auto-updated build strings. 
Former-commit-id: 8081bea8a9b82eca462bc1ae7b600162a08faea6
 2019-03-02 00:01:29 +01:00
Fermin 3eef1b3dbe Minor fix 
Former-commit-id: 5e0e476822261c99c4c6e14d4be3b87880cce4a2
 2019-03-01 13:26:15 +01:00
Fermin f0a3f4e9d7 Added configurable purge tnetwork_matrix 
Former-commit-id: e5869879c2445c15c8332d245ac2dd0d3f8de5d5
 2019-03-01 12:39:55 +01:00
artica 8fc432b934 Auto-updated build strings. 
Former-commit-id: 818dfe6138fe1837c87d96d607b15e51e06336cb
 2019-03-01 00:01:32 +01:00
Fermin 511c5e3d10 Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/extras/mr/25.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/agentes/configurar_agente.php
	pandora_console/install.php
	pandora_server/util/pandora_db.pl

Former-commit-id: 634d25e1ada208d27ba283506161682a9aa45949
 2019-02-28 17:13:48 +01:00
artica a8a9a9d620 Auto-updated build strings. 
Former-commit-id: 2c0ee9351e5f306085921bde697a1b10de102b2e
 2019-02-28 00:01:32 +01:00
artica 26560c734c Updated version and build strings. 
Former-commit-id: 39df6ee0aee9f29c9afb8729f9e95b316ca8cd67
 2019-02-27 11:25:50 +01:00
samucarc 9f92f3f010 Fixed 
Former-commit-id: 4fc7d9a22dd2a59501cd7ffc7539c431d37512a8
 2019-02-27 10:35:40 +01:00
samucarc 8f24c0cb18 Fixed conflict in CLI apply_policy 
Former-commit-id: ab512d9c2b88cd7042d6ae065251cd116b2ea5af
 2019-02-27 10:28:36 +01:00
artica 65b89f6688 Auto-updated build strings. 
Former-commit-id: 59e3d47f8cc8c9fedb86f0ba6fd7fe183cb908b8
 2019-02-27 00:01:47 +01:00
artica 88202977fa Auto-updated build strings. 
Former-commit-id: e3e3a3aba908a64a4743bd8b18337510e0c6e609
 2019-02-26 00:01:57 +01:00
fbsanchez 510833eaf1 Merge remote-tracking branch 'origin/develop' into ent-3430-discovery 
Former-commit-id: 418593106602da6aa270905e478e25b50a8f5ebd
 2019-02-25 10:47:46 +01:00
artica 9753faa17a Auto-updated build strings. 
Former-commit-id: 01fee147745dfd638487449f20211abd8e83b71e
 2019-02-25 00:01:36 +01:00
artica a49f68e96b Auto-updated build strings. 
Former-commit-id: ee007a4042fe893b73e088abd7a7b6cd0bdc45d2
 2019-02-24 00:01:50 +01:00
artica febe2cc3a6 Auto-updated build strings. 
Former-commit-id: 4f687af81ee7ab9541649e5f395c2e2aaf359609
 2019-02-23 00:02:37 +01:00
Daniel Rodriguez bd6ac21595 Merge branch 'ent-3554-7588-apply_policy-no-funciona' into 'develop' 
Added new parameter in pandora_add_policy_queue

See merge request artica/pandorafms!2176

Former-commit-id: 65ceb6b0fe1bf2c81bcfb1ce946f7d73d2c68df2
 2019-02-22 13:09:34 +01:00
fbsanchez b1aa0fe2f2 Merge from develop 
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
 2019-02-22 12:30:27 +01:00
artica b1149a053b Auto-updated build strings. 
Former-commit-id: f642e8fe029c7df7a017abe433d7768acd8577fd
 2019-02-22 00:01:38 +01:00
fermin831 4930968ec9 Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/godmode/reporting/reporting_builder.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/functions_reports.php

Former-commit-id: 0d4a8390a47b61520aca2637bb500ff8013495fa
 2019-02-21 17:21:42 +01:00
artica 1156b29743 Auto-updated build strings. 
Former-commit-id: f760ca3d8b53ad47017d82e6bc2fbb298a69312b
 2019-02-21 00:01:55 +01:00
artica 53a41a7a56 Auto-updated build strings. 
Former-commit-id: f44eb5d91d85be5ebfaf5fe25cea0fdb40b874f3
 2019-02-20 00:01:26 +01:00
artica 2b3a72e938 Auto-updated build strings. 
Former-commit-id: cf3f4af9caa5c9c435adf672e8c620b4b173f3cc
 2019-02-19 00:01:28 +01:00
Daniel Maya 28e5ff0bc2 Added new parameter in pandora_add_policy_queue 
Former-commit-id: 0a257538c31f86c572d6bfa4fb480035e302364f
 2019-02-18 16:58:04 +01:00
artica 0ef118f401 Auto-updated build strings. 
Former-commit-id: 2e217d82f2119ffdca6218a233fa8eeb743c3fb0
 2019-02-18 00:01:24 +01:00
artica 1fafda8502 Auto-updated build strings. 
Former-commit-id: affb7e6fc134d1ae80be0450f759a30960b177fd
 2019-02-17 00:01:24 +01:00
artica 0d93ccc094 Auto-updated build strings. 
Former-commit-id: 8789c127ad23a066317bd86d0bfe456dd4a3ec38
 2019-02-16 00:01:31 +01:00
samucarc 442e0306ea Merge branch 'develop' into ent-3108-Aplicar_una_politica_a_un_solo_agente_con_API_CLI 
Former-commit-id: 496f7fa859c5745dcd22d73afe9426a46e772a9a
 2019-02-15 11:15:58 +01:00
artica cd83f324a1 Auto-updated build strings. 
Former-commit-id: 3efb9b48fb3cc1021d0b3e7752c3cd1607e863a5
 2019-02-15 00:01:26 +01:00
artica f0338cd08e Auto-updated build strings. 
Former-commit-id: d0d40baca6720eb12b085a1968d827b8e9e767b0
 2019-02-14 00:01:26 +01:00
fermin831 0ecf2bb9c4 Added pandora db messages purgue 
Former-commit-id: 23d1f55ac6b7d6d5470fa25860b9bbb1575875df
 2019-02-13 14:43:55 +01:00
artica 0e39e3fef7 Auto-updated build strings. 
Former-commit-id: 7c2aabad85c99a55d80b3dc856c931f160cb35d7
 2019-02-13 00:01:37 +01:00
Ramon Novoa 6e236c404b Merge remote-tracking branch 'origin' into ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente 
Former-commit-id: fa717670f0b841f81f0f8ee566be36203cd7eba6
 2019-02-12 13:47:44 +01:00
artica bbd3cb79ce Auto-updated build strings. 
Former-commit-id: ca52afd38b1d242e4823639dd6c1e8cbc265ef04
 2019-02-12 00:01:37 +01:00
artica 3acd6b8d31 Auto-updated build strings. 
Former-commit-id: bb603dd63396712b8a649e3c08320653021c1289
 2019-02-11 00:01:26 +01:00
artica 56797e717b Auto-updated build strings. 
Former-commit-id: 728a4013a020328735f2e76b4ecb49e87d815d10
 2019-02-10 00:01:25 +01:00