ecfba2e00c
Merge branch 'ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual
...
Former-commit-id: e064684c8e12e7a9cf09fad9e56eccd4e52e6fe8
2019-03-26 09:49:34 +01:00
d6707d2747
Visual Console Refactor: minor name changes
...
Former-commit-id: 10973b070a566568dfc7f9236b184abee1f26c7a
2019-03-26 09:49:00 +01:00
7d66d0b0fe
Fixed Group class (VisualConsole)
...
Former-commit-id: 6a241cdc76935f92f99b9cc31b66acd3082571ca
2019-03-26 09:48:50 +01:00
5b0555e7cb
Merge branch 'ent-3754-Ajustes-menú-lateral' into 'develop'
...
Ent 3754 ajustes menú lateral
See merge request artica/pandorafms!2291
Former-commit-id: 2cfa456d9e49aa262f08c690426bcbabb180392b
2019-03-26 09:42:29 +01:00
c3f7dd38d0
Merge branch 'ent-3342-SLA-status-transalation-error-fail' into 'develop'
...
Added translation files with string Fail
See merge request artica/pandorafms!2290
Former-commit-id: 0ba45f1aad523dcf45585a2bb44becd3e92b2747
2019-03-26 09:33:39 +01:00
189d4864dc
[Network usage map] Refactorized some code
...
Former-commit-id: 83fe7cedef01b4d4d38045b15c6b37ec936d5fb3
2019-03-26 09:10:28 +01:00
205c95bcb8
Added Group, Icon and line
...
Former-commit-id: d13c4cdfd03f299812c588aa41685296d35675f9
2019-03-26 08:46:29 +01:00
58e74c1db1
Fixed minor warning
...
Former-commit-id: 38278d285faa6aea5f61d0933543b7e24926ae79
2019-03-26 08:40:22 +01:00
90a2e28247
Auto-updated build strings.
...
Former-commit-id: b835fca52692b4696092f9cd5c5737705b7c8153
2019-03-26 00:01:25 +01:00
4031ae9bf7
minor update in notification viewer
...
Former-commit-id: 990993ee0c2df7d9fb39a358b94c27b7df968426
2019-03-25 20:23:07 +01:00
436e60c736
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 49dc95bbeca973fe13b0c82dc205778294c6066f
2019-03-25 20:14:24 +01:00
3d0f25cd6e
discovery task status overview
...
Former-commit-id: 5eeb3a3220c05f30f0559d50620aa29389fb145c
2019-03-25 20:00:05 +01:00
6cc6f6f125
discovery task status overview
...
Former-commit-id: 329d03c109b9e09788302212752f372647b19c56
2019-03-25 19:58:01 +01:00
9947fb8f34
remove console.log
...
Former-commit-id: 12feadfc9094d8507e5e7df595e7667a67964362
2019-03-25 19:42:12 +01:00
079f578830
fix bad behavior of pandoras side menu on page load
...
Former-commit-id: b1d4eb3e2464fa441f16190d29b2d57cfaa9e3c5
2019-03-25 19:37:45 +01:00
5a38be13ea
Added translation files with string Fail
...
Former-commit-id: a0176a1fd734b7bdc1d5ffa49d29c059eb96acda
2019-03-25 18:22:42 +01:00
dcf40fed3d
Merge branch 'ent-3610-Vista-Edicion-de-Usuario' into 'develop'
...
Ent 3610 vista edicion de usuario
See merge request artica/pandorafms!2278
Former-commit-id: bf55b5206e79b5747b4215a05569b58ae70a35b0
2019-03-25 18:16:07 +01:00
c942242652
Changed map image size
...
Former-commit-id: 8e3757addb1c81bc4a5cdcff0fb45e396626d6b8
2019-03-25 17:59:02 +01:00
3ef49d14f9
Merge branch 'ent-3669-Cambios-en-cabecera' into 'develop'
...
Ent 3669 cambios en cabecera
See merge request artica/pandorafms!2287
Former-commit-id: 8fd555ba5167fe268dccf0801366e6ad4fb58cd0
2019-03-25 17:57:47 +01:00
1238f15190
discovery task advanced summary support
...
Former-commit-id: f9be116dbc2d9b07119794374319ea79a3343a81
2019-03-25 17:32:18 +01:00
448a5e64ea
Fixed disabled custom logo in open version
...
Former-commit-id: 4b5cd56af623bd6485111240be0bb0e11a0a3162
2019-03-25 16:46:17 +01:00
85474c6037
[Network usage map] Minor changes
...
Former-commit-id: 0dcbfaa911fad7d6ca6179689695d6829fd3822d
2019-03-25 16:40:07 +01:00
d3fe2908d6
Visual Console Refactor: added functions to extract and fetch linked agents and modules
...
Former-commit-id: 6b5f3327922d8abca80bae8fd8392b25a7ca50d8
2019-03-25 16:37:36 +01:00
f78cb1ed81
Visual Console Refactor: docs and other minor improvements
...
Former-commit-id: 0b7340e06f045ad223988adfb02e40c3c16eb70f
2019-03-25 16:36:38 +01:00
c682e5f326
Remove new font in edit user
...
Former-commit-id: dc7da7f1fe9df0abacfb267fb7b5c6773f35df2c
2019-03-25 16:27:25 +01:00
4a201bc74b
[Network usage map] Fixed menus and added header.
...
Former-commit-id: 1cdfc4f7f388f0705b32a362ce8c5f3ac1fb49b2
2019-03-25 16:00:57 +01:00
f9744ca8c8
Added Others node
...
Former-commit-id: 64179fd7b2520e3378d188438f8bc846edb56004
2019-03-25 15:57:04 +01:00
0cdf8a16cf
removed debug trace
...
Former-commit-id: c9be9dfa635e45d50fdc908134e6f5cc65383c7e
2019-03-25 15:53:52 +01:00
dad791b887
relationship management JS
...
Former-commit-id: 82216265dece0e5d9f77a82b1b22d6ff00265ee1
2019-03-25 15:52:15 +01:00
99463938d1
Visual Console Refactor: improved the documentation and other minor changes
...
Former-commit-id: 0734d290caf2309905ce727d2f20ede7f89e8516
2019-03-25 15:19:13 +01:00
74e86768f8
Fixed no data message
...
Former-commit-id: 46b0c055d05a4c3309840fdb0eb697d78f1f6acd
2019-03-25 14:56:42 +01:00
93d8cfc2f5
Merge branch 'ent-3566_No_refresca_eventos_cuando_pasan_X_cosas' into 'develop'
...
fixed reload page twice
See merge request artica/pandorafms!2288
Former-commit-id: b4055e5d62da01bbb031de68317ce4ee3308a97d
2019-03-25 13:49:43 +01:00
2ddf0a0201
Merge branch 'ent-3491-rworks-acl-enterprise' into 'develop'
...
Fixed enterprise acl in extensions(tool)
See merge request artica/pandorafms!2285
Former-commit-id: bd696e945d5b298fcbfe61cb412424770d1c4193
2019-03-25 13:13:24 +01:00
d37acbb159
[Netflow usage map] Added data to show
...
Former-commit-id: ca4db091b4c0f40061b9f7b8f13c4fe915ce022e
2019-03-25 13:10:47 +01:00
4ea17bb0c6
fixed reload page twice
...
Former-commit-id: 5944f47d1e0d2e5997deb6afcab6744a514216f7
2019-03-25 12:53:50 +01:00
a841472bff
Changes in header
...
Former-commit-id: 6ef8f7fc6513562e782e7d89dc5a13a4369480c4
2019-03-25 12:50:43 +01:00
cd63f38150
Merge remote-tracking branch 'origin/develop' into ent-3669-Cambios-en-cabecera
...
Former-commit-id: c07797dfa3a30d4379bf2b4c32fee7d6bb53639d
2019-03-25 12:43:38 +01:00
fe7103ba9c
Changes in header
...
Former-commit-id: 3c69b91277f0078a65764c297126d3ebb0dfc11c
2019-03-25 12:41:39 +01:00
1dceb93a76
Added some docs
...
Former-commit-id: 22d2aeda5c16a4fcf4414760affb77a6d5c0c375
2019-03-25 12:40:49 +01:00
eba858d6c1
[Network usage map] Fixed timepickers
...
Former-commit-id: d5803cea0443eae7a0dca2846dfba199a5e35f3c
2019-03-25 12:32:39 +01:00
f6f868ddfe
Visual Console Refactor: added DB fetching and fixed a context problem
...
Former-commit-id: 44889e60cb6f45ab8245da93746c4ca688de97a7
2019-03-25 12:32:06 +01:00
ddc01f9a4e
Added data from NTA to networl_usage_map
...
Former-commit-id: 9f6192faa1698959ce1ba44e13b974b8470a6a3c
2019-03-25 12:30:51 +01:00
24309e9582
Fixed enterprise acl in extensions(tool)
...
Former-commit-id: 966614e5214713c94ed40e0df86d6061695667f1
2019-03-25 12:22:18 +01:00
6a1bf2fbce
Added first version of live map
...
Former-commit-id: c440a0d0785d83c17560438986b7b394223e4779
2019-03-25 11:34:03 +01:00
e1a4250d01
NetworkClass RC1
...
Former-commit-id: bd30ce824e0f50e9684e32268bea396a84ff6744
2019-03-25 11:09:22 +01:00
b5401a500c
minor fixes
...
Former-commit-id: 30e4d5dffa78834088d8644168d4d64b13cf8b08
2019-03-25 11:02:16 +01:00
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
5411eb9d17
Merge branch 'ent-3735-Buguete-filtrado-de-eventos-por-grupo' into 'develop'
...
fix bug in event filter by group when not using secondary groups
See merge request artica/pandorafms!2276
Former-commit-id: e414c5033fbcde1d97a28190170454080531ef34
2019-03-25 10:22:45 +01:00
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
3916bcf636
Auto-updated build strings.
...
Former-commit-id: f5e0b2e0c54dddef282d78ddc279d689b1bf4a45
2019-03-25 00:01:22 +01:00
Alejandro Gallardo Escobar
Daniel Maya
Daniel Rodriguez
fermin831
artica
fbsanchez
alejandro-campos
Luis Calvo
Tatiana Llorente
Daniel Barbero Martin
Alejandro Fraguas