fbsanchez
4bb300889d
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-12 13:17:36 +02:00
fbsanchez
48e6fef0b7
Event filters
2019-06-11 12:58:18 +02:00
Tatiana Llorente
334e66aaf1
Export csv from custom field view meta - #3474
2019-06-06 10:39:09 +02:00
fbsanchez
6ed2a0636e
styles review
2019-06-04 22:34:17 +02:00
fbsanchez
a1be1e7332
styles review
2019-06-04 22:16:58 +02:00
fbsanchez
974db824a8
style review
2019-06-03 19:13:29 +02:00
fbsanchez
7a09a80ace
style review
2019-06-03 14:30:23 +02:00
Alejandro Fraguas
bc279e99b0
Merge branch 'fix/styles' into 'develop'
...
Fix/styles
See merge request artica/pandorafms!2461
2019-05-29 18:31:43 +02:00
Daniel Maya
76e6588b7a
fixed cache in label, icon, clock, box and line
2019-05-29 13:54:14 +02:00
fbsanchez
37af0ad612
Styles
2019-05-29 12:06:05 +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
fbsanchez
22de7964c2
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-29 08:52:34 +02:00
Alejandro Gallardo Escobar
f5d5cbf5b8
VC item cache improvements.
...
-Added a default value to the configuration.
-Changed the control to edit the cache expiration.
- Added the cache to more items.
2019-05-28 18:34:07 +02:00
fbsanchez
445db7c43b
module list agent view
2019-05-28 16:20:24 +02:00
fbsanchez
9a12b34847
Updates styling
2019-05-28 12:13:29 +02:00
fbsanchez
f57915285f
review styles agent view
2019-05-27 22:36:55 +02:00
fbsanchez
5be124f315
Styles review
2019-05-27 19:00:48 +02:00
Alejandro Gallardo Escobar
fb8bc48d64
Now the vc item's cache expires when the item is updated
2019-05-27 16:40:09 +02:00
Tatiana Llorente
1eb1120c6e
Rename class events_show_more_table to table_modal_alternate - #4102
2019-05-27 16:18:10 +02:00
Tatiana Llorente
0b4a076798
Changed image for severity in modal events window - #4102
2019-05-27 15:49:10 +02:00
Daniel Maya
4c874e152c
Merge
2019-05-23 10:43:32 +02:00
manuel
20dace7de8
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/agentes/agent_manager.php
Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
2019-05-13 16:20:12 +02:00
Daniel Maya
c2b8ad22d3
Added cache_expiration in builder items
2019-05-09 12:44:58 +02:00
Tatiana Llorente
ef45fc3ca6
Merge remote-tracking branch 'origin/develop' into ent-3617-Gráfica-de-módulos
2019-05-09 10:44:31 +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
manuel
f5759abcad
Merge branch 'develop' into ent-3468-Ayudas_online
2019-05-08 09:35:32 +02:00
Tatiana Llorente
283be8f632
New menu module graph - #3617
2019-05-07 16:07:07 +02:00
Daniel Barbero Martin
94932d23ac
fixed error cfv status
...
Former-commit-id: cccd14ea5d2e202124233372e3db47564b2d8475
2019-04-29 15:43:51 +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 Barbero Martin
ac41e9255f
helpers
...
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +02:00
Alejandro Fraguas
194f4400f7
Merge branch 'ent-3647-Revision-estilos-discovery-con-la-nueva-linea-de-estilos' into 'develop'
...
Ent 3647 revision estilos discovery con la nueva linea de estilos
See merge request artica/pandorafms!2370
Former-commit-id: 0f46544f8b05ee464c4dd85301f7a23a4067267a
2019-04-23 17:48:00 +02:00
alejandro-campos
92da84c47f
fix bug in discovery progress popups
...
Former-commit-id: 756f4b002db192794a09d0b15f5b6e3a2daf8731
2019-04-23 16:40:08 +02:00
alejandro-campos
4f6a81dc5b
visual changes to discovery
...
Former-commit-id: fd606abb997aa4f3144d072f610915524b5358db
2019-04-22 17:46:04 +02:00
Tatiana Llorente
0b352860cf
New style for modal window Show More - #3613
...
Former-commit-id: 61cb4c99ef4f586cfdf07df5262c789cdee75915
2019-04-15 13:11:58 +02:00
Tatiana Llorente
fd7cbf14cd
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 91bbd1dac954b151482546b3a75065ab80f19687
2019-04-10 10:15:15 +02:00
Tatiana Llorente
d91631e0e1
New design for the tables - #3707
...
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
2019-04-05 13:18:38 +02:00
Daniel Barbero
b2e16848f9
add new ff type
...
Former-commit-id: b9ff391d6586e5844e78207d44cdf9b80c98ba7e
2019-03-29 14:59:31 +01:00
Tatiana Llorente
1572949875
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 817d48af3803bd81f0cd3128b7b783c5b5bcc26b
2019-03-28 09:09:57 +01:00
fbsanchez
144cf1177d
fix tasklist map
...
Former-commit-id: 4f1195c265f4298b7303597be43b3399fa32f4e3
2019-03-27 17:12:38 +01:00
Tatiana Llorente
34598f391b
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 8b576f68f26c1fe2b0d6c1f9029eac599f7a377f
2019-03-27 17:05:50 +01:00
Tatiana Llorente
845cb85c55
New design for tables - #3707
...
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
2019-03-27 17:03:55 +01:00
Daniel Barbero Martin
db39c3921b
fixed minor error tasklist
...
Former-commit-id: 1ee10794b09e17c3b8403dfe5540195047595577
2019-03-26 17:22:14 +01:00
Daniel Barbero Martin
e3b0b7ad11
fixed update progress bars task for 3 second
...
Former-commit-id: 7558c33e8540007608f7afd97ebf03e193a08def
2019-03-26 15:38:47 +01:00
fbsanchez
d05b78520f
minor style fix tasklist popup
...
Former-commit-id: 628e94f56a92558e3af648520ca13d4fb658d184
2019-03-26 11:09:17 +01:00
fbsanchez
3d0f25cd6e
discovery task status overview
...
Former-commit-id: 5eeb3a3220c05f30f0559d50620aa29389fb145c
2019-03-25 20:00:05 +01:00
fbsanchez
6cc6f6f125
discovery task status overview
...
Former-commit-id: 329d03c109b9e09788302212752f372647b19c56
2019-03-25 19:58:01 +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
Daniel Barbero Martin
daf72a4bac
fixed errors delete files update manager open and metaconsole
...
Former-commit-id: 1ebff30c092290b3e65e639d94c6920afed960c0
2019-03-20 13:35:24 +01:00
Daniel Barbero
d5108efb0d
fixed error update manager delete files
...
Former-commit-id: 88b915f9278eba5949c867ae514a104ce796aec1
2019-03-15 12:19:02 +01:00
Daniel Barbero
7e345035e1
add height and round border in d3 graph progress
...
Former-commit-id: 8eacfe068c1ae744fd04a752f65ed44f747d6158
2019-03-15 10:22:55 +01:00
Daniel Barbero Martin
a1aa480421
add delete files in update manager
...
Former-commit-id: 880dfc8079e7e85fa1fcba4746927caf1a2d2c06
2019-03-14 18:04:28 +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
fbsanchez
663c1e0841
NetworkMap class rc1
...
Former-commit-id: 871da4e80cd5909f6bb1da567e3fbe55709690a5
2019-03-12 18:32:55 +01:00
fbsanchez
d7983bec4e
WIP NetworkMap class
...
Former-commit-id: ae987e5f6f3ec0997746093d20f7dbd5758c9ff1
2019-03-12 12:05:54 +01:00
daniel
00283a5c6a
progress task list
...
Former-commit-id: 5b8a10cdc792e74538784ae27367bc1ca2c7bed0
2019-03-07 14:45:26 +01:00
daniel
798567bf8e
fixed minor errors change word command for parameters
...
Former-commit-id: 6e6e56bded99331c606f7a9f6179826afee22d16
2019-03-07 09:05:38 +01:00
daniel
f79400ecfb
Merge remote-tracking branch 'origin/develop' into ent-3498-Anadir_parametros_manualmente_en_respuestas_de_eventos_masiva
...
Former-commit-id: 76e5afc943bd05e89a82efbe091db42d1e0a4e8d
2019-03-07 08:32:40 +01:00
daniel
8780571a74
add new functionality in event response
...
Former-commit-id: 2cf28b95c068c40e79b8f05b212aad0f720de79b
2019-02-27 10:59:44 +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
fbsanchez
0e7c498e1a
Comment updates
...
Former-commit-id: a711916af981c065d26def1943fc526d936de5d3
2019-02-26 17:53:58 +01:00
Alejandro Fraguas
441fb979e1
Merge branch 'ent-3210-Nueva-vista-de-servicios' into 'develop'
...
Ent 3210 nueva vista de servicios
See merge request artica/pandorafms!2195
Former-commit-id: f29cb46b83ff0fde722f3c5e3eaf26aedf5cf327
2019-02-26 16:32:34 +01:00
alejandro-campos
eb56fd566c
implemented services treeview
...
Former-commit-id: d5d71442d0c6122ba91b160647559cdf03f55625
2019-02-22 13:07:47 +01:00
fbsanchez
b1aa0fe2f2
Merge from develop
...
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
Alejandro Gallardo Escobar
d554dcc7db
Added the _current_user_ macro to the event responses
...
Former-commit-id: 1a5860bc7a62efecba44d467df9eb9cf7e25070b
2019-02-19 11:37:44 +01:00
alejandro-campos
46de260573
Merge branch 'develop' into 2536-Error-login-hash-al-editar-una-custom-graph-desde-la-meta
...
Former-commit-id: 36cdf03e3debabc0a079f08a457c8d2c0ac1c165
2019-02-15 15:55:31 +01:00
fbsanchez
332c53b098
change behaviour to avoid mr slow updates. Event extended
...
Former-commit-id: c5a6d5448a14b10b6851f59c5f688f360d747606
2019-02-11 19:46:46 +01:00
fbsanchez
e1d87ce0c8
minor fix falsse => false
...
Former-commit-id: 938e161b179736a3b72cad3f35db90a02e5d632c
2019-02-08 19:09:36 +01:00
fbsanchez
49cf9d5db0
Extended events
...
Former-commit-id: f2e0925ce58042dc9c9505a0d0fcf1a424c8a0bb
2019-02-08 19:07:49 +01:00
fbsanchez
091f6ace96
minor fixes and revised code style
...
Former-commit-id: aad587c578de99432dd759d6c82b622f6cd6c6e7
2019-02-08 17:30:47 +01:00
artica
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
alejandro-campos
5a8e46d608
modify the way event responses are executed in event list
...
Former-commit-id: 14ef545eef10427d95f96484e8d6b8d9656bd53c
2019-01-14 12:10:43 +01:00
alejandro-campos
471c01a4c5
fixed bad link to node in metaconsole's custom graph item editor
...
Former-commit-id: 22fb4302de980d8b3e16fb90d087b71c218598a1
2019-01-09 10:20:17 +01:00
vgilc
1b4cd37d5f
Merge branch 'ent-2997-color-cloud-vc-items' into 'develop'
...
Add the Color Cloud item to the Visual Console
See merge request artica/pandorafms!2075
Former-commit-id: e40e442631628db94c8f21c52cd8c04a0adbb6d6
2018-12-12 17:43:39 +01:00
Alejandro Gallardo Escobar
47a547367d
Added a new item to the visual console
...
Former-commit-id: 6dcb8c9500e12932775d929646f7fdc676ee94fa
2018-12-11 19:14:14 +01:00
daniel
c72d0dd0d4
fixed error status agent in custom field view
...
Former-commit-id: 3516b02e27b28c856b665bc896d076867827f85a
2018-12-11 10:00:05 +01:00
daniel
ffb6b47106
fixed minor error custom field view
...
Former-commit-id: deaa026e2f44273657ff8d76c4f4e212b46c04fe
2018-12-10 13:22:51 +01:00
daniel
222da4ee40
group filter custom field view
2018-12-04 09:36:48 +01:00
daniel
a03adb1762
add field group filter
2018-12-03 18:00:41 +01:00
daniel
0c27534ca3
fixed refresh status agents
2018-12-03 12:53:41 +01:00
daniel
01a9621eb5
Custom fields view add new filters
2018-12-03 11:36:34 +01:00
vgilc
3f02447271
Merge branch 'ent-2886-consolas-visuales-static-graphs-en-metaconsola-carrefour' into 'develop'
...
Removed unused code (meta static graphs)
See merge request artica/pandorafms!1953
2018-11-30 13:13:58 +01:00
vgilc
3cbb75b551
Merge branch '3044-Visualización-rara-en-agent-view' into 'develop'
...
Changed ORDER BY in SQL query - #3044
See merge request artica/pandorafms!1938
2018-11-30 11:02:14 +01:00
daniel
2078014406
fixed minor error
2018-11-20 09:14:36 +01:00
daniel
9d80e940bf
fixed minor error cfv
2018-11-19 16:17:20 +01:00
daniel
2eb47c1251
fixed errors in custom fields view
2018-11-16 15:00:09 +01:00
daniel
0a097d185d
fixed errors in custom fields view
2018-11-16 11:58:49 +01:00
daniel
e21fde537a
fixed css errors custom field view and new features
2018-11-15 19:16:49 +01:00
daniel
60212dae50
fixed errors cv
2018-11-14 16:38:44 +01:00
daniel
4dbcecb951
WIP custom fields view
2018-11-13 15:46:44 +01:00
tatiana.llorente@artica.es
ea9cbb6973
Changed visual styles - #2784
2018-11-13 11:20:27 +01:00
tatiana.llorente@artica.es
406bf08e2e
Changed images for status modules and agents - #2784
2018-11-12 15:43:23 +01:00
fermin831
80d3299b2b
Removed unused code (meta static graphs)
2018-11-08 16:46:34 +01:00
daniel
bb15c39ef5
WIP Custom view fields
2018-11-08 15:03:40 +01:00
daniel
218bf81fa1
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-07 13:30:19 +01:00
daniel
3f78f15499
WIP View custom fields data
2018-11-07 13:28:00 +01:00
tatiana.llorente@artica.es
aa19640497
Changed ORDER BY in SQL query - #3044
2018-11-07 10:34:14 +01:00
tatiana.llorente@artica.es
9448111927
Fixed SQL query - #2973
2018-11-06 11:14:12 +01:00
daniel
ec194208f5
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-02 08:20:39 +01:00