tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-15 14:58:44 +02:00
Code Issues Packages Projects Releases Wiki Activity
38,458 Commits 34 Branches 30 Tags
Commit Graph

2176 Commits

Author SHA1 Message Date
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
marcos
353246f9f6 first changed to welcome window 2019-10-18 10:30:19 +02:00
Daniel Barbero Martin
4e56f6751a Continue work diagnostics 2019-10-17 15:17:28 +02:00
Tatiana Llorente
dd2ace99e1 Check permissions to reset a network map - #4728 2019-10-11 13:51:52 +02:00
fbsanchez
722ba58085 more comprehensible vc form display flow 2019-10-03 11:04:13 +02:00
fbsanchez
79dca2fe6b Php OO form load 2019-10-02 18:37:50 +02:00
Daniel Barbero Martin
c5022fc243 continue VC 2019-10-02 12:28:17 +02:00
marcos.alconada
a44e1feeb4 fixed error comments events 2019-10-01 16:24:02 +02:00
Daniel Barbero
d35a5d4f71 continue VC form create items 2019-09-27 15:44:39 +02:00
Daniel Barbero Martin
8258e1f446 add css form VC 2019-09-26 15:26:00 +02:00
Daniel Barbero Martin
cd5fd4782c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 
Conflicts:
	pandora_console/include/visual-console-client/vc.main.css
 2019-09-24 13:20:25 +02:00
Daniel Barbero Martin
c9f15e877d continue VC 2019-09-24 13:18:34 +02:00
fbsanchez
7d52614064 Ent 4615 implementar cifrado en los contenedores de credenciales usando el sistema de cifrado interno de pandora 2019-09-24 11:25:53 +02:00
Daniel Barbero Martin
50c37e56c9 continue VC 2019-09-23 19:16:36 +02:00
Daniel Barbero
fc024898ef continue VC 2019-09-22 20:35:51 +02:00
Daniel Barbero
034bbff2cf continue VC 2019-09-20 15:14:26 +02:00
Daniel Barbero Martin
716c79fc3e continue VC 2019-09-19 17:47:41 +02:00