Commit Graph

511 Commits

Author SHA1 Message Date
Rafael Ameijeiras dbd90d79a7 Merge branch 'ent-10344-conexion-con-el-servidor-se-ha-perdido' into 'develop'
Ent 10344 Conexion con el servidor se ha perdido

See merge request artica/pandorafms!6228
2023-08-21 05:58:32 +00:00
Rafael Ameijeiras 976f07c1e9 Merge branch 'ent-11459-Mientras-dura-el-mergeo-en-Metaconsola-en-nodos-no-aparece-el-mensaje-indicando-que-no-estan-disponibles' into 'develop'
limited access to nodes when merging

See merge request artica/pandorafms!6129
2023-08-18 06:48:25 +00:00
Daniel Maya 858a6230b3 resolved conflict 2023-07-31 09:02:58 +02:00
Daniel Maya bee65bc575 #11739 Fixed deprecated functions 2023-07-26 14:18:20 +02:00
Rafael Ameijeiras 06d3664b2f Merge branch 'ent-10254-15114-anadir-timeout-y-secondary-server-a-ad' into 'develop'
Ent 10254 [#15114]Añadir timeout y secondary server a AD

See merge request artica/pandorafms!6091
2023-07-18 10:14:29 +00:00
Daniel Cebrian 8aaa98a741 #10254 added message timeout 2023-07-17 14:10:08 +02:00
Daniel Cebrian c2e0a02f9d #10344 changed translate in popup conexion check in js 2023-07-11 12:21:03 +02:00
Daniel Cebrian 0a34d06603 #10344 changed message in popup conexion check 2023-07-11 11:35:57 +02:00
miguel angel rasteu 444dbb4599 #11386 Fix modal event sound 2023-07-06 13:15:45 +02:00
Daniel Cebrian 496058e144 Merge branch 'develop' into ent-11437-automatic-logout-mechanism-has-been-disabled 2023-07-06 12:12:23 +02:00
Gorka Sanchez 7170dc5d1e Merge branch 'ent-11670-15842-problemas-con-idioma-en-espanol-y-la-seleccion-la-pagina-de-incicio' into 'develop'
Ent 11670 15842 problemas con idioma en espanol y la seleccion la pagina de incicio

See merge request artica/pandorafms!6189
2023-07-03 09:14:01 +00:00
Rafael Ameijeiras d082687c44 Merge branch 'ent-10020-Eliminar-login-hash-de-vistas-metaconsola' into 'develop'
Ent 10020 eliminar login hash de vistas metaconsola

See merge request artica/pandorafms!5839
2023-06-29 09:55:53 +00:00
miguel angel rasteu 9b917e3207 #11670 Fix hhome page index 2023-06-28 15:09:21 +02:00
Matias Didier fde3857674 Merge branch 'ent-11476-cambiar-headers-de-copyright' into 'develop'
Ent 11476 cambiar headers de copyright

See merge request artica/pandorafms!6069
2023-06-22 13:24:47 +00:00
alejandro.campos@artica.es c208df980e limited access to nodes when merging 2023-06-16 11:50:52 +02:00
Daniel Cebrian e483c255e0 #11437 regenerate timeout when login user 2023-06-08 14:46:01 +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
Daniel Cebrian 9269ef85d3 #11473 fixed redirect installer when config.php not exist 2023-06-06 12:18:35 +02:00
Daniel Rodriguez 589e8d535a Merge branch 'ent-11232-vulnerabilidad-usuario-no-autenticado-puede-resetear-pass-de-otros-usuarios' into 'develop'
Ent 11232 vulnerabilidad usuario no autenticado puede resetear pass de otros usuarios

See merge request artica/pandorafms!5903
2023-05-23 10:49:55 +00:00
miguel angel rasteu 90c3ccccd8 #11222 Fix url to home screen visual console 2023-05-18 12:53:45 +02:00
miguel angel rasteu a637959eb5 #11222 Fix switch. Repared install 2023-05-16 13:31:45 +02:00
Daniel Cebrian 64f8113506 #11232 fixed vulnerability when user reset password 2023-05-16 12:51:03 +02:00
alejandro.campos@artica.es 4cac880eca send login hash info in post body in meta links to node 2023-05-05 13:04:02 +02:00
Jonathan 9dd9c3eaaa #10915 fix open noaccess mesagge 2023-04-12 11:46:26 +02:00
Jonathan f98303b3ba #10891 Local components for enterprise menu 2023-04-11 12:14:18 +02:00
Daniel Rodriguez ca16c5dd61 Merge branch 'ent-10441-control-de-cache-en-actualizaciones' into 'develop'
Ent 10441 control de cache en actualizaciones

See merge request artica/pandorafms!5623
2023-03-31 07:33:26 +00:00
Daniel Cebrian b9fc352578 merge develop into ent-10633-pantalla-de-timeout 2023-03-30 09:15:10 +02:00
Daniel Cebrian e463024eb6 #10441 added version file in css in events 2023-03-24 12:34:53 +01:00
daniel 3f09fd16a7 fixed styles 2023-03-16 18:51:54 +01:00
daniel a22b5479d9 fixed styles 2023-03-16 16:48:03 +01:00
Daniel Cebrian d315d4cda7 #10633 added token for control check conexion interval 2023-03-14 13:16:58 +01:00
daniel d092495482 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-13 19:31:26 +01:00
daniel c96ac79726 fixed styles 2023-03-13 19:30:51 +01:00
daniel cf7e5b7ad9 Merge remote-tracking branch 'origin/develop' into ent-9895-mensaje-de-error-con-ldap-login-poco-explicativo 2023-03-13 09:34:11 +01:00
daniel 63d83b3f97 fixed styles 2023-03-09 11:25:43 +01:00
daniel e21d9968e8 fixed styles 2023-03-08 19:25:25 +01:00
daniel 1ba420a9ce fixed styles 2023-03-07 16:22:13 +01:00
daniel 95df525cb2 fixed styles 2023-03-03 14:16:06 +01:00
daniel 8230ae616b Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/godmode/users/user_list.php
	pandora_console/operation/events/events.php
2023-02-22 12:35:34 +01:00
Jose Gonzalez 49fc725cdc Cog animations 2023-02-20 15:16:27 +01:00
Jose Gonzalez 8f21229246 Ticket 10467 Improve External Tools view 2023-02-20 14:50:17 +01:00
Pablo Aragon bf307adb01 10483-Fixed csrf token on login after logout 2023-02-20 10:47:00 +01:00
Jose Gonzalez 4a535b14a2 Fully integrated principal action-buttons 2023-02-15 13:43:42 +01:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Jose Gonzalez deb69a0659 Fix issue with info box messages 2023-01-26 16:00:08 +01:00
daniel 08c902ed60 fix performance tactical view with admin pandora_enterprise#10087 2023-01-25 16:46:13 +01:00
Jonathan a2d9aa81d0 #9895 Add description error login ldap 2023-01-19 14:44:30 +01:00