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

1292 Commits

Author SHA1 Message Date
marcos 8cd1c0b83f add body message on confirmation modal 2020-04-28 10:12:20 +02:00
marcos ccd58897ee Add confirmation window 2020-04-27 16:40:50 +02:00
Daniel Maya 8ae8ac45f5 Ent 5690 vulnerabilidad critica inyeccion de comandos en llamada a event response 2020-04-15 15:50:08 +02:00
fbsanchez 72d20a6e57 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 
Conflicts:
	pandora_console/godmode/wizards/DiscoveryTaskList.class.php
 2020-04-07 12:55:27 +02:00
marcos 3a688c6b3d update task list dialog 2020-04-06 12:29:37 +02:00
marcos ad4781eb3c fixed error with dialog task list 2020-04-03 12:48:52 +02:00
fbsanchez acabe543c4 csv recon0 2020-03-30 19:44:44 +02:00
fbsanchez 3a74e25068 PEN management 2020-03-27 11:41:56 +01:00
alejandro-campos 26c16adbf9 fix accessing wrong index after deletion of node 2020-03-27 11:37:10 +01:00
fbsanchez e48ef76f35 merge 2020-03-26 14:38:23 +01:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
fbsanchez 6504fe49b5 intentation to spaces (2) and minor fix 2020-03-18 10:28:50 +01:00
fbsanchez b860c49383 target selections 2020-03-17 18:34:30 +01:00
fbsanchez f3da919abc WIP multiple changes 2020-03-16 23:52:20 +01:00
fbsanchez ce11d89953 Frontent changes 2020-03-13 14:03:50 +01:00
Luis 82fe47cfd9 Ent 5312 snmp browser enchancements 2020-02-27 16:31:09 +01:00
Tatiana Llorente ec57540fb0 Ent 5432 libreria de modulos de pandora integrada en consola 2020-02-27 11:20:24 +01:00
Daniel Barbero Martin a55e431b46 Fixed error cache build link VC 2020-02-20 13:25:56 +01:00
Alejandro Fraguas 1acfaa9cdc Merge branch 'ent-5429-Cambios-en-el-editor-de-modulos' into 'develop' 
Ent 5429 cambios en el editor de modulos

See merge request artica/pandorafms!3052
 2020-02-18 14:03:36 +01:00
alejandro-campos 526ba37151 minor visual change in threshold graph 2020-02-11 10:10:03 +01:00
alejandro-campos 58364f90d5 visual changes in module creation 2020-02-07 14:01:59 +01:00
alejandro-campos bc96e0b32a visual changes in module creation 2020-02-07 13:59:50 +01:00
Luis 56a2970755 Ent 5112 error nodos ficticios widget mapa red 2020-02-06 14:32:43 +01:00
Daniel Barbero Martin e49ed85d03 fixed errors VC 2020-01-28 18:29:32 +01:00
Daniel Barbero Martin 570ebd9a0a fixed errors VC 2020-01-27 13:16:01 +01:00
Daniel Barbero Martin 5ff10ac514 fixed errors VC 2020-01-25 11:57:04 +01:00
Daniel Barbero Martin fe697a98ec fixed errors VC 2020-01-23 19:54:47 +01:00
Daniel Barbero Martin 481f08bd5f fixed errors VC 2020-01-23 16:21:31 +01:00
Daniel Barbero Martin 3124e09c12 fixed errors VC 2020-01-23 09:20:40 +01:00
Daniel Barbero Martin 6c6403336f Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-23 08:14:24 +01:00
Daniel Barbero f3dbf6391f Add confirm dialog remove item VC 2020-01-22 13:00:19 +01:00
Daniel Barbero 69e750da13 Fixed error Color cloud VC 2020-01-22 12:48:31 +01:00
Daniel Maya 32b28bea0c Added warning in update manager offline 2020-01-22 11:10:02 +01:00
Daniel Barbero Martin ac4c091c9e Fixed errors VC 2020-01-21 17:43:41 +01:00
Daniel Barbero Martin a557c25c31 Fixed errors VC 2020-01-21 12:55:54 +01:00
Daniel Barbero Martin 578400aa92 change load modal ?????? 2020-01-21 08:37:30 +01:00
Daniel Barbero Martin 89e83e38e0 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2020-01-21 08:28:00 +01:00
Daniel Barbero Martin 98ddf3c6ee Fixed errors VC 2020-01-20 17:46:52 +01:00
Daniel Barbero Martin 3545e28581 Fixed errors VC 2020-01-20 16:01:53 +01:00
Alejandro Campos e7769b8bf4 Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' 
# Conflicts:
#   pandora_console/extras/mr/35.sql
 2020-01-20 12:00:42 +01:00
Daniel Rodriguez 738361d237 Merge branch 'ent-4876-pandora_ui.js' into 'develop' 
first changes pandora.js to pandora_ui.js

See merge request artica/pandorafms!2909
 2020-01-20 09:54:20 +01:00
Daniel Barbero Martin 861011257d Fixed errors VC 2020-01-19 22:57:31 +01:00
Daniel Barbero Martin d5e21499c2 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-16 14:08:07 +01:00
Tatiana Llorente 0980c9a74a Ent 5261 cambio de control de intervalo en alertas 2020-01-16 13:50:39 +01:00
Daniel Barbero Martin d8a09bf359 Fixed errors VC 2020-01-15 17:37:24 +01:00
alejandro-campos d9062def99 Merge branch 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' of https://brutus.artica.es:8081/artica/pandorafms into ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024 2020-01-15 16:01:11 +01:00
alejandro-campos 3f26f2ef6f fix bug when deleting custom units and changed default value for byte multiplier 2020-01-15 16:00:33 +01:00
Daniel Barbero 89b43f1aee loading on resize and update elements VC 2020-01-14 15:52:47 +01:00
Daniel Barbero ed53399c3c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-14 09:34:31 +01:00
Tatiana Llorente 7c928b8100 Ent 4795 check seleccionar todos queda marcado 2020-01-14 08:37:04 +01:00
Daniel Barbero Martin 602ce39907 Fixed clock item VC 2020-01-13 17:13:52 +01:00
Daniel Barbero Martin 09f1e2b733 fixed errors in resize and move item percentile and value 2020-01-13 09:53:00 +01:00
Daniel Barbero Martin d4b92a6913 Fixed errors in VC 2020-01-10 13:48:07 +01:00
Daniel Barbero Martin f34387b24e Fixed modal send more forms 2020-01-10 08:41:07 +01:00
Daniel Barbero Martin d97cdfbc7a fix element line 2020-01-08 17:28:03 +01:00
Daniel Barbero Martin c4f0305f9b Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-08 08:29:59 +01:00
Daniel Barbero Martin da01883902 Fixed items vc line 2020-01-07 18:07:07 +01:00
Daniel Barbero Martin b49dd76ce4 Add images input 2020-01-07 15:43:44 +01:00
vgilc 996d322d5d Merge branch 'ent-5176-metaconsola-informes-tipo-texto' into 'develop' 
Fixed visual bug in text report item

See merge request artica/pandorafms!2991
 2020-01-07 10:17:10 +01:00
Daniel Rodriguez 0c2c7d9f3b Merge branch 'ent-2813-Muestra-de-información-en-el-tree-view' into 'develop' 
Added stopPropagation

See merge request artica/pandorafms!2940
 2020-01-07 09:24:38 +01:00
manuel 4214a32fb7 Fixed visual bug in text report item 2019-12-24 10:11:27 +01:00
Daniel Barbero d4207ef67c Fixed form php VC 2019-12-20 13:58:47 +01:00
Daniel Barbero 14984faaaa Fixed errors Form VC 2019-12-19 20:42:29 +01:00
Daniel Barbero 7d60287018 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-19 08:02:47 +01:00
Daniel Barbero 9b4f12a875 Fixed forms VC 2019-12-18 17:36:01 +01:00
Daniel Maya 7f1245e09d Fixed mceLast class 2019-12-18 10:23:27 +01:00
Daniel Barbero 2a92c9d38d Fixed errors VC forms 2019-12-17 10:57:19 +01:00
Daniel Barbero 9e01cb097c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-13 13:02:04 +01:00
Daniel Barbero 603b4e71eb Fix gauge pdf reports 2019-12-13 09:06:54 +01:00
Daniel Barbero 319b3e604f Merge remote-tracking branch 'origin' into new-vc-line-element 2019-12-13 08:15:23 +01:00
Manuel Montes a2162948b4 Fixed minor bugs in metaconsole reports 2019-12-12 18:12:42 +01:00
Daniel Barbero 63dd3c48f8 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2019-12-12 16:32:32 +01:00
manuel 2504a3dc09 Fixed bug in module creation view 2019-12-12 13:50:35 +01:00
vgilc 1b2d4e233a Merge branch 'ent-5006-Bug-al-eliminar-un-nodo-de-un-mapa-de-red-y-mover-otro-elemento' into 'develop' 
Ent 5006 bug al eliminar un nodo de un mapa de red y mover otro elemento

See merge request artica/pandorafms!2907
 2019-12-10 11:30:28 +01:00
Daniel Maya 2b8e9995ce Added stopPropagation 2019-12-04 17:14:45 +01:00
marcos a67b0a9978 update pandora.js pandora_ui.js 2019-11-28 18:27:05 +01:00
marcos e84610120b Add coments in pandora_ui.js 2019-11-27 11:43:50 +01:00
Marcos Alconada 888988572a Merge branch 'develop' into 'ent-4876-pandora_ui.js' 
# Conflicts:
#   pandora_console/include/javascript/pandora.js
 2019-11-27 11:39:11 +01:00
Jose Gonzalez d181d5357b Created function for initialize TinyMCE 2019-11-26 13:19:28 +01:00
Jose Gonzalez b65200fde6 Solved issue with TinyMCE status bar. Now can view it properly 2019-11-22 10:17:16 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
Tatiana Llorente d392978a70 Fixed bug when deleting nodes in network maps 2019-11-21 17:28:58 +01:00
marcos 1640c03fc3 first changes pandora.js to pandora_ui.js 2019-11-21 16:42:39 +01:00
Daniel Barbero Martin 67fb2216d4 Fix 2019-11-20 09:48:35 +01:00
fbsanchez 53954ec853 Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF 2019-11-11 14:26:23 +01:00
fbsanchez 65f5223698 validation alerts 2019-11-11 14:26:04 +01:00
fbsanchez ed6dd2983f Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2019-11-05 15:21:21 +01:00
fbsanchez 58cbc3c738 Merge remote-tracking branch 'origin/develop' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/pandoradb_data.sql
 2019-11-05 15:17:09 +01:00
Daniel Barbero Martin ebb7cbfe6c Fix styles css 2019-11-05 15:12:24 +01:00
Daniel Rodriguez a1b879d065 Merge branch 'ent-4728-Desactivar-Restart-Map-para-usuarios-sin-permisos' into 'develop' 
Ent 4728 desactivar restart map para usuarios sin permisos

See merge request artica/pandorafms!2805
 2019-11-04 18:45:57 +01:00
fbsanchez 3eb0a6bb95 minor fixes after internal meeting 2019-10-30 18:33:33 +01:00
fbsanchez 72b1fb2b16 Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF 
Conflicts:
	pandora_console/include/javascript/pandora.js

	modified:   pandora_console/general/register.php
	modified:   pandora_console/godmode/agentes/configurar_agente.php
	modified:   pandora_console/godmode/agentes/module_manager_editor.php
	new file:   pandora_console/include/ajax/welcome_window.php
	new file:   pandora_console/include/class/WelcomeWindow.class.php
	modified:   pandora_console/include/constants.php
	modified:   pandora_console/include/functions_config.php
	modified:   pandora_console/include/javascript/pandora.js
	new file:   pandora_console/include/styles/new_installation_welcome_window.css
 2019-10-30 16:56:44 +01:00
fbsanchez 383967f68a Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF 2019-10-29 16:56:01 +01:00
marcos 57bfc364ae add modal confirmation window 2019-10-28 18:57:10 +01:00
fbsanchez 7d5b845e1f minor fixes 2019-10-28 18:37:01 +01:00
Daniel Barbero c4aea1ac59 add styles validation form of modal 2019-10-25 13:28:01 +02:00
Daniel Barbero Martin 3dee6888d6 fix 2019-10-24 17:42:37 +02:00
Daniel Barbero Martin de22fb70e3 Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico 2019-10-23 19:51:49 +02:00
Daniel Barbero Martin f06a55c6bb continue feedback mail 2019-10-23 19:50:57 +02:00
Daniel Maya c01a856826 Changed color 2019-10-23 11:17:16 +02:00