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

780 Commits

Author SHA1 Message Date
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
Luis 41e818334e Ent 4954 urls documentacion soporte al fallar base datos 2019-11-21 11:14:50 +01:00
Daniel Barbero Martin 6bf9ceac3e fixed minor error 2019-11-20 10:00:57 +01:00
fbsanchez b11dbc639f Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF 
Conflicts:
	pandora_console/general/header.php
 2019-11-13 12:20:29 +01:00
Daniel Barbero Martin 7103317bc2 Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico 
Conflicts:
	pandora_console/general/header.php
	pandora_console/include/styles/pandora.css
 2019-11-13 12:12:17 +01:00
Tatiana Llorente 484ec9ea60 Ent 4845 revision de skins 2019-11-12 18:10:58 +01:00
Daniel Barbero Martin fa6bc254a1 Fixed errors 2019-11-12 16:22:58 +01:00
Luis f57f87b50b Ent 4834 pandora custom logo text on conf 2019-11-11 13:33:37 +01:00
fbsanchez 98237a8d34 Merge remote-tracking branch 'origin/develop' into ent-EDF 
Conflicts:
	pandora_console/general/header.php
 2019-11-06 15:36:53 +01:00
Luis b707ebd4a4 Added docs and support urls in console. Fixed bugs 2019-11-05 17:09:29 +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
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 c07baa614f Merge remote-tracking branch 'origin/ent-4766-feedback-de-ayudas' into ent-EDF 2019-10-29 17:00:57 +01:00
fbsanchez 383967f68a Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF 2019-10-29 16:56:01 +01:00
Daniel Barbero Martin f6fd5cc21f Add image feedback 2019-10-29 09:13:48 +01:00
marcos 57bfc364ae add modal confirmation window 2019-10-28 18:57:10 +01:00
marcos e725a0185b cambios semi finales 2019-10-24 16:56:13 +02:00
Daniel Barbero Martin f06a55c6bb continue feedback mail 2019-10-23 19:50:57 +02:00
Luis Calvo 33d26144f1 Fixed planned downtime acl 2019-10-22 16:00:01 +02:00
marcos ee97ed8a5e segunda ronda 2019-10-21 18:36:02 +02:00
Daniel Barbero e37af1598a continue feedback diagnostics 2019-10-21 18:11:04 +02:00
marcos 353246f9f6 first changed to welcome window 2019-10-18 10:30:19 +02:00
marcos a31e66a9bd add feedback 2019-10-15 12:16:50 +02:00
Daniel Barbero 8af72c1c9d add Remote CMD 2019-10-09 17:26:06 +02:00
fbsanchez 9868462d43 Merge remote-tracking branch 'origin/develop' into ent-4190-mejoras-para-el-menu-de-gestionar-ha 2019-09-02 09:57:45 +02:00
Daniel Rodriguez aa383e3f56 Merge branch 'ent-4513-bugs-en-password-policy' into 'develop' 
fixed visual error

See merge request artica/pandorafms!2678
 2019-08-30 14:35:57 +02:00
marcos.alconada d650ff6959 fixed error 2019-08-30 11:28:24 +02:00
marcos.alconada 30f7a48d7b Fixed error with news modal windows 2019-08-12 09:36:16 +02:00
fbsanchez adbb48ab87 pandora HA review 2019-08-10 02:13:01 +02:00
Daniel Rodriguez bfb4cb19a0 Merge branch 'ent-4330-Bug-con-autorefresh-en-eventos' into 'develop' 
Added feature to autorefresh in events view with datatables - #4330

See merge request artica/pandorafms!2605
 2019-07-18 12:22:44 +02:00
Tatiana Llorente 0316c55d39 Added feature to autorefresh in events view with datatables - #4330 2019-07-16 16:46:36 +02:00
Tatiana Llorente 9ad4c98268 Added feature to autorefresh in events view with datatables - #4330 2019-07-16 15:43:52 +02:00
Alejandro Fraguas 1320e76d3d Merge branch 'ent-3927-contador-de-intentos-fallidos-en-la-pantalla-de-error-de-login' into 'develop' 
Ent 3927 contador de intentos fallidos en la pantalla de error de login

See merge request artica/pandorafms!2383
 2019-07-16 09:54:02 +02:00
Tatiana Llorente cb14a9f2e8 Added feature to autorefresh in events view with datatables - #4330 2019-07-16 09:38:52 +02:00
Tatiana Llorente 7d119bfe5a Added feature to autorefresh in events view with datatables - #4330 2019-07-15 17:41:20 +02:00
Daniel Barbero Martin bd070b706b fixed minor error 2019-07-11 12:45:52 +02:00
marcos.alconada 09e5feef05 add message no acces saml without saml.php file 2019-07-08 17:02:28 +02:00
Alejandro Fraguas 8242bf34b8 Revert "Merge branch 'ent-3693-pete-php-pantalla-en-blanco-con-auth-saml' into 'develop'" 
This reverts merge request !2562
 2019-07-05 14:55:22 +02:00
marcos.alconada 6349c29eb5 Add message for autenticaition error SAML 2019-07-01 13:45:42 +02:00
Daniel Rodriguez 6976ba9c8e Merge branch 'ent-3800-mal-enrutamiento-discovery' into 'develop' 
Ent 3800 mal enrutamiento discovery

See merge request artica/pandorafms!2350
 2019-06-26 12:02:43 +02:00
Daniel Rodriguez 265202f1ed Merge branch 'ent-4136-button-styles' into 'develop' 
Review 1

See merge request artica/pandorafms!2470
 2019-06-20 16:35:12 +02:00
fbsanchez 4bb300889d Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-12 13:17:36 +02:00
fbsanchez c741020538 styles review 2019-06-04 13:57:55 +02:00
fbsanchez b4dcf4a6f1 style review 2019-06-03 11:55:56 +02:00
fbsanchez 9de5dadbf2 style review 2019-06-03 11:16:51 +02:00
fbsanchez eb5ee75d33 Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-06-03 09:18:49 +02:00
fbsanchez 40cca5e1e3 BIG style change, erased all important flags 2019-05-30 18:21:13 +02:00
Daniel Rodriguez 2c36631130 Merge branch 'ent-3518-password-recovery-email-bad-message' into 'develop' 
Fixed the error message of the password recovery

See merge request artica/pandorafms!2172
 2019-05-30 15:35:18 +02:00