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

1205 Commits

Author SHA1 Message Date
Jose Gonzalez 54f287f754 Added missed icons in DB 2023-02-10 14:54:50 +01:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Calvo 54e9559f3b Deleted sample visual consoles 2023-01-16 11:07:56 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Jose Gonzalez 8421fb49ca Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-01-04 15:54:16 +01:00
Calvo 6d9149e11b Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-29 17:39:12 +01:00
daniel 69e3203317 Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-27 09:06:20 +01:00
daniel 47c503bdab Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-21 12:51:18 +01:00
alejandro.campos@artica.es 5520daead9 Merge branch 'ent-8297-Mejoras-en-gestion-de-acceso-a-pandora-MD5-SHA256-y-Salt-opcional' of brutus.artica.es:artica/pandorafms into ent-8297-Mejoras-en-gestion-de-acceso-a-pandora-MD5-SHA256-y-Salt-opcional 2022-12-20 13:41:44 +01:00
alejandro.campos@artica.es 90e5205b16 changed admin pass encryption 2022-12-20 13:41:25 +01:00
Daniel Barbero 2e48d51714 change version 768-MR60 pandora_enterprise#9554 2022-12-20 12:32:41 +01:00
Calvo f84f9733e3 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-20 12:15:10 +01:00
alejandro c6637d59e4 added also the updates in the mr and updated the inserts in pandoradb_data.sql for the motherboards, monitors, printers, product_key, product_id inventory plugins. 2022-12-16 12:19:30 +01:00
alejandro 5c41b88ed2 added updates to mr with new code to update the scripts and changed the code of the windows tmodule_inventory inserts in pandoradb_data.sql 2022-12-16 09:00:01 +01:00
jose.gonzalez@pandorafms.com d43ae677a3 Changed icons and minor fixes 2022-12-15 12:41:38 +01:00
Rafael Ameijeiras f9bb893aae Merge branch 'ent-8849-13468-Anadir-links-web-en-los-custom-fileds-de-agente' into 'develop' 
implemented custom field

See merge request artica/pandorafms!5271
 2022-12-12 08:20:08 +00:00
Rafael Ameijeiras 1b3535da58 Merge branch 'ent-9709-crear-el-usuario-admin-como-local-por-defecto' into 'develop' 
Ent 9709 crear el usuario admin como local por defecto

See merge request artica/pandorafms!5256
 2022-12-12 08:12:42 +00:00
jose.gonzalez@pandorafms.com 445a8161cf Merge 2022-12-05 09:44:35 +01:00
jose.gonzalez@pandorafms.com dccd950e9e Changes 2022-11-30 10:14:42 +01:00
Daniel Maya 306d0f0cf2 #9927 changed lts_name 2022-11-28 09:24:50 +01:00
alejandro.campos@artica.es 767624b0c3 implemented link type custom field 2022-11-22 11:50:07 +01:00
alejandro.campos@artica.es 5e510e7e12 implemented custom field 2022-11-16 10:28:50 +01:00
alejandro.campos@artica.es e7bf53ee40 minor fix 2022-11-10 18:15:41 +01:00
edu.corral 5e224bb825 ent 9709 admin as local user 2022-11-08 11:38:45 +01:00
Daniel Rodriguez 4f99d94dc0 Merge branch 'ent-9714-traducciones' into 'develop' 
translates pandora_enterprise#9714

See merge request artica/pandorafms!5228
 2022-11-07 13:27:51 +00:00
Daniel Barbero 39df7fe13a Merge remote-tracking branch 'origin/develop' into ent-9714-traducciones 
Conflicts:
	pandora_console/include/visual-console-client/maintenanceMode.png
	visual_console_client/src/lib/maintenanceMode.png
 2022-11-04 11:14:20 +01:00
edu.corral 6a9e30ae6d ent 7914 status scaling 2022-11-02 12:53:14 +01:00
Daniel Barbero 10750e2464 translates pandora_enterprise#9714 2022-10-28 08:35:21 +02:00
edu.corral 47521e7e3c ent 7914 database adjustements 2022-10-26 09:07:48 +02:00
edu.corral 4ed96e4a6e ent 7914 warning scaling 2022-10-21 13:53:25 +02:00
Daniel Barbero 3099ffa7cb add mode maintenance VC pandora_enterprise#4822 2022-10-13 13:44:39 +02:00
Daniel Maya c1b4501da5 resolved conflict 2022-10-03 14:41:14 +02:00
Daniel Barbero 81ed331688 translates pandora_enterprise#9572 2022-09-29 15:19:11 +02:00
Alejandro Campos b11839dde5 Merge branch 'develop' into 'ent-9395-14081-Politicas-no-aplican-a-grupos-secundarios' 
# Conflicts:
#   pandora_console/extras/mr/57.sql
 2022-09-27 15:24:28 +00:00
alejandro.campos@artica.es 3bf2dd1b5c make policy group application optional 2022-09-23 09:50:38 +02:00
alejandro.campos@artica.es d1cc2458b6 implemented alert commands and actions to send report by email 2022-09-13 12:16:53 +02:00
Daniel Maya d53ee55663 #9331 Fixed wizard wmi 2022-09-08 15:18:48 +02:00
José González b07a161fb0 Added control for clean not initialized modules 2022-08-29 14:05:30 +02:00
Daniel Barbero Martin 12f73d86fd new filter search eventspandora_enterprise#8942 2022-07-05 17:02:40 +02:00
José González b175ffbd3a Fixed db change 2022-06-28 17:22:09 +02:00
vanessa gil 653226d45b Clean version. 2022-06-23 19:54:26 +02:00
Daniel Barbero Martin bf28b44339 mr 2022-06-23 14:35:38 +02:00
Daniel Rodriguez 416021bca6 Merge branch 'ent-8822-enlace-web-en-metaconsola-para-nuevas-sugerencias' into 'develop' 
Changed link to Suggest new feature on new installation

See merge request artica/pandorafms!4874
 2022-06-06 08:45:20 +00:00
Daniel Maya 0d3b14da40 #9005 Added lts_name 2022-05-23 13:00:01 +02:00
Calvo 752a716c21 Changed link to Suggest new feature on new installation 2022-05-09 08:58:14 +02:00
Luis 4b743d64c9 Change event list fields order on new install 2022-04-27 11:20:37 +02:00
alejandro.campos@artica.es 69e0bf2697 fixed error during merge process 2022-04-20 15:58:26 +02:00
alejandro.campos@artica.es 7ec1784429 Merge remote-tracking branch 'origin/develop' into ent-8817-Falla-proceso-de-merge-en-metaconsola 2022-04-20 15:53:20 +02:00
Daniel Rodriguez f36a89d41d Merge branch 'ent-8557-Disenar-nuevas-plantillas-de-alertas-de-correo-para-Pandora' into 'develop' 
change email alert templates

See merge request artica/pandorafms!4808
 2022-04-18 11:51:42 +00:00
alejandro.campos@artica.es 903e2ae34c minor fix 2022-04-12 11:24:31 +02:00