artica
|
f5088299f3
|
Auto-updated build strings.
Former-commit-id: 3e8354494b7250c6bdcefbe8a961411bdfe5180a
|
2019-04-12 00:01:24 +02:00 |
|
artica
|
29e1fc828c
|
Auto-updated build strings.
Former-commit-id: 180188c01ab9644d5672f1b984a1454402acc1cd
|
2019-04-11 00:01:30 +02:00 |
Daniel Rodriguez
|
4ab7f2c56f
|
Merge branch 'ent-3791-7780-cron-en-modulos-no-funcionan-bien' into 'develop'
Ent 3791 7780 cron en modulos no funcionan bien
See merge request artica/pandorafms!2337
Former-commit-id: 2d7e13817fee6c23d271405d48198ab069357e2b
|
2019-04-10 10:20:35 +02:00 |
|
artica
|
765ca945a0
|
Auto-updated build strings.
Former-commit-id: d69449b4f4ca214bdd3e37e660e0c8d7f0dc9817
|
2019-04-10 00:01:25 +02:00 |
Daniel Barbero Martin
|
8404450458
|
Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
Former-commit-id: 2809d31ae616b11dc1a210415ecb1c54e201fada
|
2019-04-09 09:53:31 +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 |
|
Daniel Barbero
|
49d925d96a
|
Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
Conflicts:
pandora_console/extras/mr/27.sql
Former-commit-id: 67c41a5bd6a4c95647b097171578c5af67b491fa
|
2019-04-05 16:48:58 +02:00 |
fermin831
|
873525726e
|
Avoid infinite loops when the day of the week in cron is out of limits
Former-commit-id: 6c0a87a29818219364fb9c08c44b48cb79dd74a8
|
2019-04-05 12:32:43 +02:00 |
|
artica
|
8d0e53924d
|
Auto-updated build strings.
Former-commit-id: 015143b34e644f24b26d36fba4b78525d39ff2e0
|
2019-04-05 00:01:32 +02:00 |
|
fermin831
|
14ea1a4714
|
Fixed inverses intervals on server
Former-commit-id: 20f9e139bb3f40700e3081e4ce9ec134b70786a6
|
2019-04-04 17:47:40 +02:00 |
|
artica
|
f64835dca9
|
Auto-updated build strings.
Former-commit-id: fd545daafd448831b9e29eff8629dc3b7c6a630b
|
2019-04-04 00:01:27 +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 |
|
daniel
|
431c807f61
|
Merge branch 'develop' into 'ent-3445-Solucionar_problematica_flip_flop'
# Conflicts:
# pandora_console/extras/mr/27.sql
Former-commit-id: 4fcd03764bf959fb6b126df48e20bc29327105b2
|
2019-04-02 10:21:04 +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 |
|
Daniel Barbero Martin
|
5ca01b0294
|
add ff_type linux agent
Former-commit-id: 0e903a7e304c5a2ea4dcf8570e45663524777748
|
2019-04-01 10:27:24 +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 |
|
Daniel Barbero
|
b2e16848f9
|
add new ff type
Former-commit-id: b9ff391d6586e5844e78207d44cdf9b80c98ba7e
|
2019-03-29 14:59:31 +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 |
|
Daniel Barbero Martin
|
33197df731
|
add new functionality flipflop
Former-commit-id: 00a71df0d228833dbe7211504e11418d91622d93
|
2019-03-28 17:33:49 +01:00 |
|
Daniel Barbero Martin
|
626aacbf43
|
Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
Former-commit-id: 26e21338ea5e7578a4247771d19df75d01e6234e
|
2019-03-28 08:49:08 +01:00 |
|
artica
|
98a9c62de9
|
Auto-updated build strings.
Former-commit-id: 84db7098e01d25e6f503f49f9170215880e74088
|
2019-03-28 00:01:30 +01:00 |
|
Daniel Barbero Martin
|
a3865a3181
|
flip flop keep counters
Former-commit-id: 0d39875c7a78f4be07fdffcf76a686007333c626
|
2019-03-27 18:16:53 +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 |