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

529 Commits

Author SHA1 Message Date
Rafael Ameijeiras e5237aafe1 Merge branch 'ent-12517-cambiar-nombre-al-token-allow-all-ips' into 'develop' 
Ent 12517 Cambiar nombre al token "Allow all IPs"

See merge request artica/pandorafms!6696
 2023-11-28 09:58:44 +00:00
Daniel Cebrian dde1146ccb #fixed delete allow ip when edit user 2023-11-27 17:54:05 +01:00
Daniel Cebrian ead68be05a Merge branch 'develop' into ent-12517-cambiar-nombre-al-token-allow-all-ips 2023-11-27 16:59:29 +01:00
Daniel Cebrian 139d884525 #12517 fixed permission 2023-11-27 16:59:21 +01:00
Rafael Ameijeiras 2fa8ed3c9e Merge branch 'ent-12219-error-al-eliminar-perfiles-en-edicion-de-usuario' into 'develop' 
Ent 12219 error al eliminar perfiles en edicion de usuario

See merge request artica/pandorafms!6555
 2023-11-27 14:38:14 +00:00
Daniel Cebrian afa6a7d415 #12517 allow ip limited to user admin 2023-11-27 13:55:08 +01:00
Matias Didier 7bc998d230 Merge branch 'ent-12206-limitacion-cambio-de-contrasena-de-usuarios' into 'develop' 
Ent 12206 limitacion cambio de contrasena de usuarios

See merge request artica/pandorafms!6542
 2023-11-27 12:12:10 +00:00
Rafael Ameijeiras 8865f0394e Merge branch 'ent-12218-bug-del-boton-show-hide-password-de-usuarios' into 'develop' 
Ent 12218 bug del boton show hide password de usuarios

See merge request artica/pandorafms!6553
 2023-11-27 12:00:28 +00:00
Daniel Cebrian c16992f69a #12517 hide allowlist if token is disabled 2023-11-23 15:29:26 +01:00
daniel 76721a9445 Fix home screen external link pandora_enterprise#12413 2023-11-07 13:20:08 +01:00
daniel 7b7370659e Fix home screen external link pandora_enterprise#12413 2023-11-07 11:11:08 +01:00
miguel angel rasteu d2390979aa #12219 Fix icons and metaconsole delete profile 2023-11-07 10:15:00 +01:00
miguel angel rasteu a7436efd8c #12219 Fix delete last user profile 2023-10-11 13:31:25 +02:00
miguel angel rasteu 3e20ff7eaa #12218 Fix show hide password button 2023-10-11 09:59:26 +02:00
miguel angel rasteu 133826b498 #12205 Fix ehorus conf interfaz 2023-10-10 09:57:09 +02:00
miguel angel rasteu 041a13cb49 #12206 User password change limitation to local 2023-10-09 16:03:04 +02:00
daniel 91393c9e39 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/include/styles/pandora.css
 2023-09-25 17:06:08 +02:00
Pablo Aragon bed83f1406 11839-Add max in User->Block size pagination 2023-09-18 08:23:05 +02:00
daniel 1a1087e311 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
 2023-09-04 08:16:48 +02:00
Pablo Aragon ba964dfb16 11817-Remove Network maps from autorefresh user list 2023-08-29 08:52:50 +02:00
daniel a63824d802 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/godmode/users/user_management.php
 2023-08-21 08:08:34 +02:00
Jorge Rincon 3b50481c28 Merge branch develop into ent-11543-pantalla-de-login-en-modo-blanco 2023-08-18 09:49:27 +02:00
daniel 7f82273dc4 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/65.sql
 2023-08-09 08:59:01 +02:00
Jonathan 84df4e1195 #11571 fix for firefox margin api token span 2023-08-01 11:11:24 +02:00
Jonathan 629f43c8f5 Merge branch 'develop' into ent-11571-contact-details 2023-08-01 10:27:40 +02:00
daniel 1bf7f1e36e ITSM pandora_enterprise#11471 2023-07-21 14:23:42 +02:00
daniel a3eefacc80 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-12 16:35:24 +02:00
daniel 524bb7fdbb Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-11 08:26:20 +02:00
Miguel Angel Rasteu 3001cc90ce Merge branch 'develop' into 'ent-11161-campo-innecesario-y-no-solicitado-al-cambiar-contrasena-de-usuario-3-errores-distintos' 
# Conflicts:
#   pandora_console/godmode/users/user_management.php
 2023-07-10 09:45:11 +00:00
Daniel Cebrian 496058e144 Merge branch 'develop' into ent-11437-automatic-logout-mechanism-has-been-disabled 2023-07-06 12:12:23 +02:00
Matias Didier add65eca5d Merge branch 'ent-9162-10821-modificar-columnas-widget-eventos' into 'develop' 
Ent 9162 10821 modificar columnas widget eventos

See merge request artica/pandorafms!5843
 2023-07-06 08:35:35 +00:00
Gorka Sanchez a4d6f29701 Merge branch 'ent-11383-cuando-se-crea-un-usuario-con-el-autorefresh-activado-este-no-se-habilita-correctamente' into 'develop' 
Ent 11383 cuando se crea un usuario con el autorefresh activado este no se habilita correctamente

See merge request artica/pandorafms!5997
 2023-07-04 08:40:15 +00:00
Jorge Rincon d25a5e2b89 #11543 Added login screen changes in white mode 2023-07-03 17:37:01 +02:00
miguel angel rasteu 2e110fb162 #11670 Fix home page 2023-06-28 15:08:09 +02:00
daniel 6e3eddff08 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-06-27 08:23:46 +02:00
Rafael Ameijeiras a3ef14c50b Merge branch 'ent-11347-15666-mensaje-del-visor-de-tokens-de-api-tiene-mojibake' into 'develop' 
Ent 11347 15666 mensaje del visor de tokens de api tiene mojibake

See merge request artica/pandorafms!6084
 2023-06-26 07:36:22 +00:00
Rafael Ameijeiras c5bd2819c3 Merge branch 'ent-11619-al-crear-nuevo-usuario-te-dice-que-estas-editando-el-tuyo' into 'develop' 
Ent 11619 al crear nuevo usuario te dice que estas editando el tuyo

See merge request artica/pandorafms!6165
 2023-06-26 07:29:39 +00:00
Jorge Rincon c5ad0309cf #11619 fixed the error in both node and metaconsole 2023-06-22 10:51:26 +02:00
Jonathan bc2bd68689 #11571 text QR 2023-06-21 13:49:34 +02:00
daniel d84299d3ab wip api integration pandora #1355 2023-06-20 08:43:10 +02:00
daniel e82c1e6881 wip integration integriaIMS pandora_enterprise#11471 2023-06-16 13:47:25 +02:00
miguel angel rasteu 2b2f9b983e #11347 Fix decode base 64 for japanese characters 2023-06-12 16:18:28 +02:00
Daniel Cebrian 1980458572 #11437 added new control session 2023-06-08 14:06:15 +02:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
Jorge Rincon 162c33733f #11430 Added a validation that checks if the User id already exists 2023-06-01 10:31:14 +02:00
miguel angel rasteu 202c9b5ea7 #11383 Add autorefresh_white_list value 2023-05-30 16:26:06 +02:00
Rafael Ameijeiras a43b013fb4 Merge branch 'ent-11300-perdida-de-node-access-al-actualizar-los-datos-de-usuario-propio-no-admin' into 'develop' 
Ent 11300 perdida de node access al actualizar los datos de usuario propio no admin

See merge request artica/pandorafms!5934
 2023-05-25 15:00:34 +00:00