fermin831
|
14ea1a4714
|
Fixed inverses intervals on server
Former-commit-id: 20f9e139bb3f40700e3081e4ce9ec134b70786a6
|
2019-04-04 17:47:40 +02:00 |
|
fermin831
|
e642907215
|
Merge remote-tracking branch 'origin/develop' into ent-3791-7780-cron-en-modulos-no-funcionan-bien
Former-commit-id: 46844dc1e44569be828ae90bfb22c669d4eb352a
|
2019-04-03 12:00:48 +02:00 |
Alejandro Fraguas
|
ee59f4678e
|
Merge branch 'ent-3801-no-funciona-event-storm-protection' into 'develop'
Add a missing configuration option.
See merge request artica/pandorafms!2322
Former-commit-id: 6ccc3926eb2d4fe76e2a60f6f74a242ce7e84051
|
2019-04-03 10:57:26 +02:00 |
artica
|
30e9b67062
|
Auto-updated build strings.
Former-commit-id: 64d58c7568e01fecd9c4c97a49eeb9df7d55c5dc
|
2019-04-03 00:01:33 +02:00 |
Ramon Novoa
|
7af141258e
|
Add a missing configuration option.
Former-commit-id: 4a516f1507cba486defb0c6be7b63b12cebc383e
|
2019-04-02 10:30:53 +02:00 |
|
Fermin
|
4957bd763a
|
Merge branch 'ent-3791-7780-cron-en-modulos-no-funcionan-bien' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3791-7780-cron-en-modulos-no-funcionan-bien
Former-commit-id: e9a9619b767208a7249e44a1fb98623f2ff93c11
|
2019-04-02 09:04:34 +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 |
|
Fermin
|
05ce178854
|
Fixed week day cron in server
Former-commit-id: cfbd3601904c85fa1112eaf0f2310edb53f9afe8
|
2019-03-29 11:51:51 +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
|
b2f046e4d6
|
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/include/class/ConsoleSupervisor.php
pandora_console/include/class/NetworkMap.class.php
pandora_console/include/styles/pandora.css
pandora_console/operation/menu.php
Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
|
2019-03-27 12:11:23 +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 |
fbsanchez
|
c717baafc0
|
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 70601a390ebca2a1530b77c86a83c19e29e98261
|
2019-03-27 10:53:46 +01:00 |
|
artica
|
8160983e36
|
Auto-updated build strings.
Former-commit-id: 00a94a2b9b56bbb245f3389855c734f7af14d874
|
2019-03-27 00:01:24 +01:00 |
|
fbsanchez
|
511295f1c6
|
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: f43d6ace220a8058f91d115386bdf56e59550cbe
|
2019-03-26 16:32:19 +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 |
|
fbsanchez
|
1238f15190
|
discovery task advanced summary support
Former-commit-id: f9be116dbc2d9b07119794374319ea79a3343a81
|
2019-03-25 17:32:18 +01:00 |
|
fbsanchez
|
040f942c9f
|
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 9affd1c5f658a8c24c92f7e3b9868fc35868bd32
|
2019-03-25 10:29:49 +01:00 |
|
fermin831
|
2711eb59ea
|
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb.sql
Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395
|
2019-03-25 09:20:06 +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 |
|
fbsanchez
|
da3602fbc5
|
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 7867c83c3571bcd27c19f4c1dcdc6e8b95eb2715
|
2019-03-21 18:38:41 +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 |
|
fbsanchez
|
6fb6963501
|
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 9df9a4c3a4a50e191af5167129df1352e712171e
|
2019-03-20 17:40:08 +01:00 |
|
fbsanchez
|
9b68e7d04e
|
Switch extended events to standard events in host creation (recon)
Former-commit-id: 74ee131b3b4083fd50cc37e1a7854ad159afa13a
|
2019-03-20 14:15:33 +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 |
Daniel Rodriguez
|
eac346daf4
|
Merge branch 'ent-3598-cambio-en-plugin-dynamic-snmp' into 'develop'
minor updates in plugintools
See merge request artica/pandorafms!2211
Former-commit-id: 30806fc6b073af4607cb4cdf1c3222d930a66d58
|
2019-03-15 14:07:31 +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
|
750c64fbd7
|
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7
|
2019-03-13 09:52:00 +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 |
|
Daniel Rodriguez
|
3b2d72308e
|
Merge branch 'ent-1800-Cambiar-informacion-de-los-instaladores' into 'develop'
Changed Maintainer in pandorafms-agent-unix
See merge request artica/pandorafms!2228
Former-commit-id: 861dfec496f2040810d0962e03cca41b2f180462
|
2019-03-11 14:23:00 +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 |