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

717 Commits

Author SHA1 Message Date
Luis aeb7a7e9c6 Add decimal separator to all pandora csv 2020-12-01 11:56:15 +01:00
marcos 1ce48c812f updated 2fa all user 2020-11-26 18:11:30 +01:00
marcos af863a45de updates 2020-11-26 16:25:21 +01:00
marcos c824972c8c updates 2020-11-26 11:02:48 +01:00
marcos 5476c96941 update fix 2020-11-25 13:40:37 +01:00
marcos e3e9736fc5 show and hide 2020-11-25 13:07:38 +01:00
marcos 06475d21ce Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario 2020-11-25 11:08:09 +01:00
marcos 73f931d516 show and hide 2fa swtich 2020-11-25 10:50:06 +01:00
Marcos Alconada 481dd07e1b requiered subject on create news 2020-11-25 10:38:38 +01:00
marcos 51322b48d7 Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario 2020-11-25 09:31:14 +01:00
José González 32dcd8a7ca Merge branch 'develop' into 'ent-6398-Poner-ojito-mostrar-passwords' 
# Conflicts:
#   pandora_console/include/javascript/pandora_ui.js
 2020-11-19 15:21:58 +01:00
marcos 13d90bb1c5 Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario 2020-11-18 12:05:57 +01:00
marcos 53362f6424 update branch 2020-10-13 15:04:33 +02:00
Daniel Rodriguez b6ee1a9434 Merge branch 'ent-6432-No-funciona-el-envio-de-mails-by-default' into 'develop' 
fixed email test

See merge request artica/pandorafms!3504
 2020-10-08 20:01:33 +02:00
marcos 848f60229a updates on 2FA all users feature 2020-10-06 17:02:58 +02:00
alejandro-campos 2915a3bd35 fixed email test 2020-10-06 11:07:46 +02:00
daniel 1b5ccfb20a Add new token chart fit to content 2020-10-05 17:03:30 +02:00
marcos e5fe9d5c29 feature 2FA_all_users 2020-10-05 12:29:51 +02:00
fbsanchez 2187f9d0c9 Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
 2020-10-02 14:56:07 +02:00
daniel a5d5a45cac add render graph to reports 2020-10-02 14:16:55 +02:00
fbsanchez b07d24ed25 Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos 
Conflicts:
	pandora_console/include/functions_api.php
	pandora_console/operation/events/events.php
 2020-09-30 18:38:27 +02:00
marcos f8666adf0f F2 feature 2020-09-30 14:20:57 +02:00
fbsanchez 5f4893ef1a Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-29 12:47:11 +02:00
Jose Gonzalez 9d0becc012 Added other password fields 2020-09-29 10:12:49 +02:00
Jose Gonzalez 6a21a668bf Added control for reveal passwords 2020-09-29 09:44:20 +02:00
fbsanchez f69166bd53 Updates style width group selector 2020-09-28 18:04:46 +02:00
Luis ef043a169a Increased number of max macro data fields from 15 to 20 2020-09-25 10:47:36 +02:00
Daniel Rodriguez 422b0ac71d Merge branch 'ent-6050-tamano-de-la-ventana-de-front-page-for-custom-reports-muy-pequeno-en-los-visual-styles' into 'develop' 
Ent 6050 tamano de la ventana de front page for custom reports muy pequeno en los visual styles

See merge request artica/pandorafms!3446
 2020-09-22 11:11:26 +02:00
fbsanchez 5c511bb88e Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos 2020-09-17 16:57:56 +02:00
Daniel Rodriguez 4c8414cda5 Merge branch 'ent-4292-TinyMCE-status-bar' into 'develop' 
Solved issue with TinyMCE status bar. Now can view it properly

See merge request artica/pandorafms!2910
 2020-09-17 15:14:33 +02:00
fbsanchez 867fccf604 Custom id improvements 2020-09-17 14:38:01 +02:00
Jose Gonzalez 0e3c10a698 Merge 2020-09-17 10:35:18 +02:00
Jose Gonzalez b97014f577 Cleaned traces 2020-09-16 17:40:18 +02:00
Jose Gonzalez 9ac9a75658 Fixed mistake with update in os list 2020-09-16 14:47:33 +02:00
manuel.montes eaa4924a0f Fixed visual bug 2020-09-09 17:16:25 +02:00
Jose Gonzalez 58f521e8b5 Avoid XSS in Edit OS form. 2020-09-09 15:28:11 +02:00
José González 85d8e1f796 Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' 
# Conflicts:
#   pandora_console/extras/mr/40.sql
#   pandora_console/godmode/alerts/configure_alert_template.php
 2020-08-07 13:17:41 +02:00
Daniel Maya cbc8630dfc Ent 5206 9287 exportacion a csv con dato con muchos decimales y miles trae confusion 2020-07-23 16:52:24 +02:00
daniel 2c535bb747 Fixed labels mode classic 2020-07-21 15:06:41 +02:00
Jose Gonzalez 5e039adb26 Solve the issue for alerts, os names and tags 2020-07-07 11:05:19 +02:00
fbsanchez 534aa8c7c5 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 2020-07-06 14:31:55 +02:00
alejandro-campos 63df6c15f0 Merge branch 'develop' into ent-6030-Problema-codificacion 2020-07-01 16:39:00 +02:00
fbsanchez faaf14bfd4 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/extras/mr/39.sql
	pandora_console/include/lib/Module.php
 2020-06-30 17:04:33 +02:00
Alejandro Fraguas 02bffc7e0d Merge branch 'ent-5935-Logs-de-la-consola-refactorizacion' into 'develop' 
changed console and audit log locations

See merge request artica/pandorafms!3278
 2020-06-25 15:28:13 +02:00
fbsanchez a8671078f1 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/install.php
 2020-06-25 11:25:43 +02:00
Daniel Rodriguez 5aef38dd72 Merge branch 'ent-5186-Texto-HTML-plano-en-apartado-de-los-reports-en-visual-styles' into 'develop' 
fixes in reports front page default setup

See merge request artica/pandorafms!3250
 2020-06-24 12:43:23 +02:00
Manuel Montes 549a17a428 Ent 5470 se duplican los sistemas operativos 2020-06-23 14:45:04 +02:00
Alejandro Campos 9ce4c90456 Merge branch 'develop' into 'ent-5186-Texto-HTML-plano-en-apartado-de-los-reports-en-visual-styles' 
# Conflicts:
#   pandora_console/godmode/setup/setup_visuals.php
 2020-06-23 10:04:24 +02:00
alejandro-campos 6520ad2107 Added setup token 2020-06-23 09:21:15 +02:00
alejandro-campos ab61cf1fc5 changed console and audit log locations 2020-06-08 10:48:48 +02:00