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

804 Commits

Author SHA1 Message Date
fbsanchez eec373e896 Added link to MC place where user must manage the stuff when in centralised environment and ui_get_meta_url 2021-06-24 19:48:07 +02:00
fbsanchez 4c2ac234b8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
	pandora_console/godmode/servers/plugin.php
 2021-06-24 14:37:30 +02:00
Luis 497ecb329d Changed new wiki url on helps 2021-06-24 12:31:15 +00:00
fbsanchez faa9fee273 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_agents/unix/Darwin/dmg/resources/text/conclusion.html
	pandora_agents/unix/Darwin/dmg/resources/text/license.html
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/48.sql
 2021-06-21 17:33:45 +02:00
Daniel Rodriguez 7dfae672d5 Merge branch 'ent-7673-scroll-horizontal-en-moda-test' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4199
 2021-06-21 14:06:29 +00:00
Marcos Alconada d6ecce1ce9 fixed visual error 2021-06-21 14:06:29 +00:00
fbsanchez 94cd4c96dd Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/javascript/pandora_ui.js
 2021-06-14 17:37:01 +02:00
fbsanchez cdad04f9cd Update the DB schema when upgrading from RPMs. 
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
 2021-06-14 11:56:42 +00:00
fbsanchez ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00
Marcos Alconada 665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
Daniel Barbero Martin 9e27843b19 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 08:51:48 +02:00
Daniel Rodriguez 4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'" 
This reverts merge request !4132
 2021-06-09 18:09:43 +02:00
Daniel Rodriguez d58e9f634a Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop' 
Ent 7519 cambio de fuentes en la consola a nivel global

See merge request artica/pandorafms!4132
 2021-06-09 13:59:29 +00:00
Marcos Alconada 2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
Marcos Alconada 8814b1f971 changed icons for black theme 2021-06-09 13:12:47 +00:00
Daniel Barbero Martin ca59034cf3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-04 08:13:20 +02:00
Daniel Rodriguez b5802d41c7 Merge branch 'ent-7604-Vulnerabilidad-file-manager-images' into 'develop' 
Fix vulnerability with directories created in upper levels

Closes pandora_enterprise#7604

See merge request artica/pandorafms!4158
 2021-06-03 11:36:22 +00:00
Jose Gonzalez 897a98eab6 Handle directory paths for file upload 2021-06-02 13:17:34 +02:00
Daniel Barbero Martin 3a85c69043 Wip command center 2021-05-31 14:58:36 +02:00
Daniel Barbero Martin 8c7654cd2d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/godmode/setup/os.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/users/user_edit.php
 2021-05-28 08:26:19 +02:00
Daniel Rodriguez 3f8d3a883f Merge branch 'ent-7002-Revision-cabeceras-tabs' into 'develop' 
Ent 7002 revision cabeceras tabs

Closes pandora_enterprise#7002

See merge request artica/pandorafms!4094
 2021-05-27 16:21:48 +00:00
José González 57eeb9a1db Fix vulnerability with directories created in upper levels 2021-05-27 16:19:51 +02:00
Daniel Barbero Martin a1ca4abe8f Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-27 08:22:43 +02:00
Daniel Rodriguez 44ea35bb69 Merge branch 'ent-7300-email-test-solo-envia-datos-guardados' into 'develop' 
Email test working with data in text fields

See merge request artica/pandorafms!4090
 2021-05-26 13:30:36 +00:00
José González 76628117fa Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs' 
# Conflicts:
#   pandora_console/operation/messages/message_edit.php
 2021-05-25 13:50:17 +00:00
Daniel Barbero Martin 5d70226b13 fix category, Os, tags, user_edit synch 2021-05-18 11:02:00 +02:00
Daniel Barbero Martin ec6cb4d532 fix category, Os, tags, user_edit synch 2021-05-18 10:57:21 +02:00
Alejandro Campos caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' 
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
 2021-05-13 11:39:24 +00:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
Daniel Maya 9c234eef85 Ent 7087 mensaje duplicado en los test mails 2021-05-11 13:48:09 +00:00
Daniel Rodriguez 89dcde6ca7 Merge branch 'ent-7477-Campos-de-integracion-con-Integria' into 'develop' 
minor changes

See merge request artica/pandorafms!4107
 2021-05-11 07:40:24 +00:00
Daniel Rodriguez ac0ef3c61c Merge branch 'ent-7475-Mejor-interfaz-de-configuracion-en-integracion-Integria' into 'develop' 
minor change in integria ims setup

See merge request artica/pandorafms!4104
 2021-05-11 07:39:16 +00:00
Daniel Rodriguez 6faefa4afa Merge branch 'ent-7096-unificar-nombres-downtimes' into 'develop' 
Unified downtime name as scheduled downtime

See merge request artica/pandorafms!4001
 2021-05-10 09:06:43 +00:00
Luis f25256a74d Unified downtime name as scheduled downtime 2021-05-10 09:06:43 +00:00
alejandro.campos@artica.es fdeaf52912 implemented user level authentication for integria ims integration 2021-05-07 14:29:29 +02:00
alejandro.campos@artica.es aa4769d331 minor changes 2021-05-05 13:02:53 +02:00
alejandro.campos@artica.es d358fd894d minor change in integria ims setup 2021-05-05 11:03:32 +02:00
José González dbb7fe364f Added standard headers 2021-04-30 14:35:54 +02:00
Calvo 6ad371e4ab Email test working with data in text fields 2021-04-29 16:04:51 +02:00
Marcos Alconada c57ca2a2b8 fixed error with creation and updating gis maps 2021-04-27 11:44:55 +00:00
alejandro.campos@artica.es ada6bccfd6 changed request protocol 2021-04-15 12:12:06 +02:00
Daniel Rodriguez 0fc3cb8714 Merge branch 'ent-6271-mejoras-de-ui-en-setup' into 'develop' 
Multicolumn setup for performance and visual settings

See merge request artica/pandorafms!3921
 2021-04-06 17:47:39 +00:00
fbsanchez fdc4133eaa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-25 10:20:02 +01:00
Daniel Maya 79914082e9 Ent 6850 quitar nta 2021-03-24 15:16:13 +00:00
fbsanchez e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
 2021-03-22 09:59:07 +01:00
Marcos Alconada 04bae1b4fb fixed visual errors 2021-03-18 17:05:50 +00:00
fbsanchez 2862afb7f5 Multicolumn setup for performance and visual settings 2021-03-16 13:00:24 +01:00
marcos f765493ce7 revert selector theme 2021-03-16 11:24:05 +01:00
Daniel Rodriguez 5bae2be954 Merge branch 'ent-6898-Integracion-integria-en-pandora' into 'develop' 
Ent 6898 integracion integria en pandora

See merge request artica/pandorafms!3898
 2021-03-12 13:18:25 +00:00
alejandro.campos@artica.es b4927d6071 minor fix 2021-03-12 12:46:27 +01:00