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

848 Commits

Author SHA1 Message Date
Marcos Alconada de1407badc Update mysqlerr.php 2020-01-16 17:58:50 +01:00
Daniel Rodriguez 456fbc096e Merge branch 'ent-4572-Bugs-graficos-en-black-theme' into 'develop' 
Fixed visual bugs in black theme - #4572

See merge request artica/pandorafms!2713
 2020-01-07 09:43:45 +01:00
Alejandro Fraguas ebe6e1109c Merge branch 'ent-4467-barra-de-busqueda-como-interprete-de-ordenes' into 'develop' 
Ent 4467 barra de busqueda como interprete de ordenes

See merge request artica/pandorafms!2934
 2019-12-26 11:10:53 +01:00
marcos 43d08f354a Ajustes CSS 2019-12-19 16:53:45 +01:00
marcos 87405ba318 add message no resoult found 2019-12-19 14:20:31 +01:00
marcos 7217176a75 add acl's to order interpreter 2019-12-19 14:11:07 +01:00
marcos e06c974e67 add acl's to order interpreter 2019-12-19 14:10:43 +01:00
Jose Gonzalez d8f232d814 Added control for MS Edge and Internet Explorer browsers for disallow linear gradient 2019-12-16 16:39:13 +01:00
marcos 2139e0ef84 add 3 on key event 2019-12-13 14:11:12 +01:00
marcos 480673521c Can select with keyboard list items 2019-12-13 14:08:44 +01:00
marcos 8ca473b2a7 ajust search input 2019-12-11 18:42:46 +01:00
marcos 7eec91b946 Show result in normal window 2019-12-03 18:19:32 +01:00
marcos 14b8379ccb ajax call, controller, class, match result, return array inputs(example to return) 2019-12-03 15:11:16 +01:00
marcos d4720c2260 add firts changes 2019-12-03 13:59:03 +01:00
marcos e412516a64 add historical data fialure message 2019-12-02 11:20:25 +01:00
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
Tatiana Llorente 8340a8a121 Merge branch 'develop' into 'ent-4572-Bugs-graficos-en-black-theme' 
Conflicts:
   pandora_console/include/styles/pandora_black.css
 2019-09-10 10:34:47 +02:00
Tatiana Llorente 90b61533f8 Fixed visual bugs in black theme - #4572 2019-09-10 10:26:28 +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
Tatiana Llorente 56ffa6b056 Added button for close error popup - #4154 2019-08-21 12:44:19 +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
fbsanchez 30320b7897 Fixed login button style and removed help icons from agent_management 2019-05-30 11:12:37 +02:00
fbsanchez 30ce8f65e4 UM register, UM newsletter flow improved 2019-05-29 10:01:21 +02:00
marcos.alconada 41bc705c02 Image only for welcome message 2019-05-24 14:19:31 +02:00
marcos.alconada 9587b4cc44 Image only for welcome message 2019-05-24 14:18:39 +02:00
fbsanchez f46fdea220 Merge remote-tracking branch 'origin/develop' into fix/uno 2019-05-23 18:46:56 +02:00
fbsanchez 8f9c9fd156 removed trace from user_edit 2019-05-23 18:46:43 +02:00
fbsanchez 4fe7680694 Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-05-22 15:33:13 +02:00
fbsanchez bd88cbd42d 1st approach simplifying MC management 2019-05-22 15:31:59 +02:00
Daniel Rodriguez 979f11ca8f Merge branch 'ent-1668-update-manager' into 'develop' 
Ent 1668 update manager

See merge request artica/pandorafms!2420
 2019-05-22 15:25:49 +02:00
Luis Calvo e361c4243a Autorefresh bug fix 2019-05-21 12:16:06 +02:00
fbsanchez 5e9b2479eb Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager 2019-05-20 13:11:39 +02:00
fbsanchez 034480bf88 minor fixes 
Former-commit-id: ced1aad7a9835dab5b44817f191e33d2ca11cff3
 2019-05-16 12:28:46 +02:00
fbsanchez e7dbb55392 Minor fixes 
Former-commit-id: 51e446b36a4ad2b93a1a2e3ff76e89ea2a21db9b
 2019-05-16 12:00:49 +02:00
fbsanchez d871b599ef General fixes and UM comm updates 
Former-commit-id: b4c58f467f195627f96afe7f06b59004adeb83be
 2019-05-14 23:49:01 +02:00
fbsanchez 53e9113b7e UM notifications MR update 
Former-commit-id: d2aad195cb9bab4e1efa504cb4b4a583f262f0e3
 2019-05-14 17:15:28 +02:00
marcos.alconada bc849c16fb Only one image for welcome new board 
Former-commit-id: a8effda6019c394a9a2d15fbf4998490867b3b02
 2019-05-14 17:13:44 +02:00
marcos.alconada bad2a330fd Se muestra en la pantalla mediante html la imganen 
Former-commit-id: ddd86fc0b4768ed5c3750c304fded70de3389864
 2019-05-14 09:48:41 +02:00
fbsanchez ced1b32915 Configuration, Registration and newsletter wizards 
Former-commit-id: bbd367a10fd01c229c848b15572c4b1d6ccb75cf
 2019-05-13 17:55:41 +02:00
marcos.alconada ac60e296c1 Add new message to News board 
Former-commit-id: ad9170857d95fa2c211d09a5f59f6012739177c5
 2019-05-10 11:17:46 +02:00
marcos.alconada dcfb9c9b61 se actualiza en mensaje en la meta 
Former-commit-id: b20edf93845577c1fdd551211907a25888c6543a
 2019-04-24 17:45:01 +02:00
marcos.alconada de4ea8434a Se ajusta la ventana de usuario bloqueado 
Former-commit-id: dca9700142a5f4b539892f8727d8e5c83222312b
 2019-04-24 17:11:02 +02:00
marcos.alconada d7ca0f1134 Add strong 
Former-commit-id: 68b08a3a6f7dbdd4365b88faf9bfb678e506a5ac
 2019-04-24 16:51:41 +02:00
marcos.alconada 43d8a25c39 Add remaning attemps 
Former-commit-id: 07960eaa4b3281ee13f14b0fc5249b94ac0626fa
 2019-04-24 16:49:04 +02:00
Alejandro Fraguas 6594095de7 Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas' into 'develop' 
Ent 3707 nuevo diseño para las tablas

See merge request artica/pandorafms!2352

Former-commit-id: 684daf476bf288e294b67f97fc80fdf6a6ddcce4
 2019-04-17 10:19:42 +02:00
Tatiana Llorente 29c282dc79 Changed popup no access - #3625 
Former-commit-id: 0798f53d9074a580309aeb9f9577ec518efd9264
 2019-04-15 14:42:58 +02:00
Tatiana Llorente 6a9c972ed6 Changed popup no access - #3625 
Former-commit-id: c58c9f47bab666985ed4cfe0c9c5edf1ed057e76
 2019-04-12 13:54:48 +02:00
Luis Calvo 5998b30a16 Added css hint to discovery tasks when task list is empty 
Former-commit-id: 1da71cda1b1ed376bb6bae0281b0dd882dbfbeff
 2019-04-10 17:30:35 +02:00
Tatiana Llorente 3da2f267a2 New design for the tables - #3707 
Former-commit-id: 6b2550344a7748e210fdb81a26751e9e94cbbfa4
 2019-04-05 13:51:35 +02:00
Tatiana Llorente aa640efc44 Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas 
Former-commit-id: 43e5f9f044a351f1c6cf1c192b9f92cba6d1b0b3
 2019-04-05 13:19:42 +02:00
Daniel Maya 8923c53ec4 Fixed problem with fixed header 
Former-commit-id: 9bf6d824b94f301a804511c106f6465ce9dff0fa
 2019-04-03 16:48:28 +02: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