Commit Graph

569 Commits

Author SHA1 Message Date
Jonathan 5769a412a8 #13344 fix date tokens 2024-04-16 15:22:02 +02:00
Jonathan ba1c013381 #13344 minor fix 2024-04-15 09:42:05 +02:00
Jonathan 776cfb7350 #13344 change message 2024-04-12 13:10:49 +02:00
Jonathan b942f8e66b #13344 fix hour time and date time tokens 2024-04-12 12:46:13 +02:00
Jonathan ab6199640b #13344 minor fix 2024-04-12 11:53:24 +02:00
Jonathan 8b7125fd59 #13344 change bigger for later 2024-04-12 11:35:45 +02:00
Jonathan 5605b06809 #13344 fix minor error 2024-04-12 11:13:44 +02:00
Jonathan 8bea6c8ba1 #13344 jquery control date token 2024-04-11 17:19:15 +02:00
Jonathan 06e7740234 #13344 no enable create tokens when date is older than today 2024-04-11 15:47:00 +02:00
Jonathan 346292fb54 #13344 expiration date no under today 2024-04-10 14:53:43 +02:00
Jonathan 06fb4b419b #13344 expiration date no under today 2024-04-10 14:51:06 +02:00
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
Rafael Ameijeiras bfee610b4f Merge branch 'ent-12621-meter-tips-de-ayuda-en-la-interfaz' into 'develop'
Ent 12621 meter tips de ayuda en la interfaz

See merge request artica/pandorafms!6904
2024-02-26 11:51:37 +00:00
Jonathan b22ad532b2 #12621 new tips 2024-02-19 12:07:31 +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 5ff79dc550 new api 2.0 2024-02-08 12:23:56 +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
Jonathan f43279acc3 #12777 qr name remove entities 2024-01-22 09:27:02 +01:00
Rafael Ameijeiras 0c73dab521 Merge branch 'ent-12366-bug-al-asignar-5-o-mas-perfiles-a-un-usuario' into 'develop'
Ent 12366 bug al asignar 5 o mas perfiles a un usuario

See merge request artica/pandorafms!6771
2024-01-19 08:36:45 +00:00
Rafael Ameijeiras 2dad4fcf0b Merge branch 'ent-12435-metaconsola-external-links-recorta-enlaces-muy-largos' into 'develop'
Ent 12435 metaconsola external links recorta enlaces muy largos

See merge request artica/pandorafms!6775
2024-01-18 12:57:53 +00:00
Rafael Ameijeiras d98c264640 Merge branch 'ent-11900-16100-contador-de-items-en-distintas-vistas' into 'develop'
Ent 11900 16100 contador de items en distintas vistas

See merge request artica/pandorafms!6792
2024-01-18 12:53:43 +00:00
Jonathan 3d1492b6a3 Merge branch 'develop' into ent-12435-metaconsola-external-links-recorta-enlaces-muy-largos 2024-01-18 13:50:27 +01: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
Jonathan 706426471e #12366 fix for spaces on users 2024-01-08 10:57:32 +01:00
Daniel Cebrian 3044ef4823 #12419 fixed external url and changed size field 2024-01-02 10:26:36 +01:00
Jonathan d68daca985 #11900 counter items 2023-12-19 16:50:36 +01:00
alejandro.campos@artica.es 315d1a3223 add autorefresh to agent view 2023-12-18 13:50:54 +01:00
Jonathan c6d29ea60e #12435 external link users fix 2023-12-14 16:59:39 +01:00
Jonathan 065b096f14 #12366 user list 5 users bug styles 2023-12-14 10:03:58 +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
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
miguel angel rasteu 167be52f5f #11714 Resolve conflict 2023-11-27 13:11:38 +01: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