Pablo Aragon
|
220dfb3ad3
|
Merge branch 'develop' into ent-13185-ligera-modificacion-en-el-header
|
2024-04-10 14:37:10 +02:00 |
Daniel Rodriguez
|
9b4d33ce77
|
Merge branch 'ent-12721-nuevo-modo-de-licencia-trial' into 'develop'
Ent 12721 nuevo modo de licencia trial
See merge request artica/pandorafms!6846
|
2024-04-08 08:12:41 +00:00 |
|
Pablo Aragon
|
f8ca5501d6
|
13185-Change header and menu. WIP
|
2024-03-26 10:21:51 +01:00 |
Daniel Maya
|
30769852be
|
#12721 free licence change 4
|
2024-03-01 13:04:28 +01:00 |
Jonathan
|
9084a34514
|
#12695 wip removing warnings
|
2024-02-08 12:31:55 +01:00 |
|
Jonathan
|
2246fd8049
|
#12695 WIP warnings
|
2024-02-07 16:39:33 +01:00 |
daniel
|
e07f66885d
|
Merge remote-tracking branch 'origin/develop' into ent-12067-huevo-de-pascua-piensa-en-verde
Conflicts:
pandora_console/index.php
|
2023-12-19 14:56:04 +01:00 |
Rafael Ameijeiras
|
a4eed65758
|
Merge branch 'ent-12200-huevo-de-pascua-efecto-nieve' into 'develop'
Ent 12200 huevo de pascua efecto nieve
See merge request artica/pandorafms!6675
|
2023-12-19 07:56:55 +00:00 |
|
Daniel Maya
|
0ac20717f1
|
#12200 resolved conflict
|
2023-12-18 13:15:42 +01:00 |
|
Jonathan
|
7ae77773e6
|
#12597 popup open
|
2023-12-18 11:28:09 +01:00 |
Jorge Rincon
|
9f72dd7d6e
|
#12200 Added setup flag for easter egg
|
2023-11-24 14:01:17 +01:00 |
|
Jorge Rincon
|
1f51b0475e
|
#12201 Added configuration in the setup for easter egg
|
2023-11-24 13:12:12 +01:00 |
|
Jorge Rincon
|
5213462334
|
#12067 Aggregated Agents Modules and module group
|
2023-11-24 12:54:19 +01:00 |
|
Jorge Rincon
|
b4e07c8ce7
|
#12067 Added easter egg, think green
|
2023-11-23 17:31:11 +01:00 |
|
daniel
|
ee93c86982
|
fix update manager pandora_enterprise#12479
|
2023-11-20 17:19:39 +01:00 |
|
Jorge Rincon
|
8635617815
|
#12200 The Christmas effect is added after 25 clicks on the about image
|
2023-11-16 10:24:03 +01:00 |
|
Jorge Rincon
|
811363cbec
|
#12200 snow effect added
|
2023-11-15 17:07:47 +01:00 |
|
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 |