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

356 Commits

Author SHA1 Message Date
Jonathan b1ddaecccc #12997 remove skins from every site 2024-03-19 10:50:24 +01:00
daniel 9771639318 Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 
Conflicts:
	pandora_console/extras/mr/68.sql
	pandora_console/pandoradb.sql
 2024-02-27 17:27:10 +01:00
Jonathan 7f580cc388 Merge branch 'develop' into ent-12695-16818-eliminar-warnings-en-console-log 2024-02-13 09:42:00 +01:00
daniel 851b046add Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-02-12 08:05:36 +01:00
Rafael Ameijeiras 4cdea9d8ef Merge branch 'ent-12460-cientos-de-errores-en-el-log-de-apache' into 'develop' 
Ent 12460 Cientos de errores en el log de apache

See merge request artica/pandorafms!6748
 2024-02-09 09:22:48 +00:00
Jonathan 9084a34514 #12695 wip removing warnings 2024-02-08 12:31:55 +01:00
Daniel Cebrian 0d235f3b6d #12460 fixed deprecated 2024-02-07 13:17:39 +01:00
daniel 8cfb04d243 new api 2.0 2024-02-07 08:53:54 +01:00
Daniel Cebrian 60d2733066 #12794 fixed login when user use external login 2024-01-30 18:22:20 +01:00
Diego Muñoz-Reja 6352243e64 Merge branch 'ent-12386-16541-Implementar-autorefresh-en-la-vista-de-modulos-del-agente' into 'develop' 
add autorefresh to agent view

See merge request artica/pandorafms!6786
 2024-01-23 14:22:22 +00:00
Rafael Ameijeiras e7ee0ef6b8 Merge branch 'ent-12747-Home-Screen-no-actualiza-en-nodo-cuando-mergeamos-nodo-y-meta-2' into 'develop' 
fix home screen

See merge request artica/pandorafms!6850
 2024-01-18 11:13:04 +00:00
alejandro.campos@artica.es f52700f392 fix home screen 2024-01-15 17:42:41 +01:00
Daniel Cebrian 3044ef4823 #12419 fixed external url and changed size field 2024-01-02 10:26:36 +01:00
alejandro.campos@artica.es 315d1a3223 add autorefresh to agent view 2023-12-18 13:50:54 +01:00
Matias Didier 9511d82692 Merge branch 'ent-11714-15928-pantalla-personalizada-del-usuario-error-al-establecer-link-externo-como-homescreen' into 'develop' 
Ent 11714 15928 pantalla personalizada del usuario error al establecer link externo como homescreen

See merge request artica/pandorafms!6250
 2023-11-29 09:29:43 +00:00
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
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
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
miguel angel rasteu 167be52f5f #11714 Resolve conflict 2023-11-27 13:11:38 +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 041a13cb49 #12206 User password change limitation to local 2023-10-09 16:03:04 +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 1bf7f1e36e ITSM pandora_enterprise#11471 2023-07-21 14:23:42 +02:00
miguel angel rasteu 10a5cd496f #11714 Fix external link 2023-07-14 13:53:52 +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
miguel angel rasteu 2e110fb162 #11670 Fix home page 2023-06-28 15:08:09 +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
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
Rafael Ameijeiras 16336a5cde Merge branch 'ent-11242-error-500-al-intentar-editar-un-usuario-en-metaconsola-tyr' into 'develop' 
Ent 11242 error 500 al intentar editar un usuario en metaconsola tyr

See merge request artica/pandorafms!5933
 2023-05-24 15:41:56 +00:00
Daniel Cebrian 0f9384326e #11300 fixed access metaconsole when user not admin update her config 2023-05-22 17:12:35 +02:00
Daniel Cebrian 761feed0dd #11300 fixed node access token in users not admin, meta 2023-05-22 15:01:04 +02:00
miguel angel rasteu 33d95ef00e #11117 Add new field in tusuario for metaconsole event default and fix selectors 2023-05-22 12:08:27 +02:00
Jorge Rincon 0def9b252e #11242 validate autorefresh_list field that allows to load the view, edit user 2023-05-22 11:54:43 +02:00