tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-18 00:08:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
35,587 Commits 34 Branches 30 Tags
Commit Graph

1668 Commits

Author SHA1 Message Date
Daniel Barbero Martin
a0982cd260 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/users/profile_list.php
 2021-05-18 08:39:06 +02:00
fbsanchez
818186ff28 DB updates - syncqueue 2021-05-17 12:57:15 +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 Barbero Martin
5b376568a4 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/47.sql
 2021-05-13 08:25:59 +02:00
Daniel Rodriguez
13fa1159ce Merge branch 'ent-6858-Goliat-opensource' into 'develop' 
Backup upload

See merge request artica/pandorafms!3936
 2021-05-12 13:10:48 +00:00
José González
3758c80019 Fixed delete_files entries. 2021-05-12 13:07:45 +00:00
Luis
7d56552e72 Added missing fields to alert snmp actions 2021-05-12 12:54:36 +00:00
José González
9e9ea4d00a Merge with last develop 2021-05-12 09:17:32 +02:00
alejandro.campos@artica.es
fdeaf52912 implemented user level authentication for integria ims integration 2021-05-07 14:29:29 +02:00
Daniel Barbero Martin
55a1ea6f2a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-04 17:19:35 +02:00
fbsanchez
34b02982e1 Ensure valid values (alert correlation) for compat mode for criticity, id_group and id_tag 2021-04-30 15:01:43 +02:00
fbsanchez
366e9a08d5 minor fix 2021-04-30 14:36:47 +02:00
fbsanchez
6b83deacdd Migrate old rules 2021-04-30 14:34:10 +02:00
Daniel Barbero Martin
2ca981b03e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-29 08:34:41 +02:00
Daniel Maya
8ef21d9b15 Ent 7395 filtro de eventos en metaconsola server 2021-04-28 10:50:04 +00:00
fbsanchez
78487fa4e5 Auto-synchronizer MC 2021-04-22 15:37:59 +02:00
Daniel Barbero Martin
100ae705f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-20 13:33:40 +02:00
Daniel Barbero Martin
b8b9fa561f Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-20 08:07:21 +02:00
fbsanchez
50f580c112 Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-19 14:35:59 +02:00
fbsanchez
2e45e0bde4 Fixes in table tevent_rule definition 2021-04-15 10:35:21 +02:00
fbsanchez
21d72f41f9 Revert "Revert "Update tevent_rule schema"" 
This reverts commit 2b05cde214c4cd3ebbdf4192aea0358f1a0d6528.

 Changes to be committed:
	modified:   pandora_console/extras/mr/46.sql
	modified:   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	modified:   pandora_console/pandoradb.sql
 2021-04-15 00:20:42 +02:00
fbsanchez
2b05cde214 Revert "Update tevent_rule schema" 
This reverts commit a80e50b7301858ff5e98a3a5c5e705a30731a8a8.

 Changes to be committed:
	modified:   pandora_console/extras/mr/46.sql
	modified:   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	modified:   pandora_console/pandoradb.sql
 2021-04-14 21:42:19 +02:00
fbsanchez
a80e50b730 Update tevent_rule schema 2021-04-14 21:39:58 +02:00
Daniel Barbero Martin
1b21652ed2 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-14 08:35:02 +02:00
Jose Gonzalez
3d359dab36 Fixed merge with 7161 2021-04-13 12:55:35 +02:00
Daniel Rodriguez
751d7ec3cf Merge branch 'ent-7161-Cambiar-opciones-de-skin-en-usuarios-y-grupos' into 'develop' 
Ent 7161 cambiar opciones de skin en usuarios y grupos

See merge request artica/pandorafms!3972
 2021-04-13 09:26:50 +00:00
Daniel Maya
9bbac06771 Ent 7161 cambiar opciones de skin en usuarios y grupos 2021-04-13 09:26:50 +00:00
José González
4a028b2ee3 Merge branch 'develop' into 'ent-6387-limitar-agentes-por-grupo' 
# Conflicts:
#   pandora_console/extras/mr/46.sql
 2021-04-13 07:52:48 +00:00
Daniel Barbero Martin
aa31ed8f58 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-13 08:34:05 +02:00
Daniel Maya
8a27517cc5 Ent 7281 aumentar carácteres de la caja de consulta sql en informes 2021-04-12 14:44:33 +00:00
Daniel Barbero Martin
37fe9bfafb WIP command center 2021-04-09 14:27:12 +02:00
Jose Gonzalez
f8d4039314 Fixed merges 2021-04-09 10:34:25 +02:00
Daniel Barbero Martin
2a6dffd0f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-08 17:32:32 +02:00
fbsanchez
1ac6ed35cf Merge remote-tracking branch 'origin/develop' into ent-6924-cambiar-label-event-text-por-event-name 
Conflicts:
	pandora_console/extras/mr/46.sql
 2021-04-07 10:23:33 +02:00
Daniel Barbero Martin
e5b2a27631 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/46.sql
 2021-04-07 08:26:38 +02:00
Luis
4b9f8ce202 Added custom fields combo larger params 2021-04-06 16:51:14 +00:00
Daniel Barbero Martin
cc222faddc Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/include/functions_api.php
 2021-03-25 17:00:27 +01: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 Barbero Martin
0bfe060c50 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-24 17:30:47 +01:00
Daniel Maya
79914082e9 Ent 6850 quitar nta 2021-03-24 15:16:13 +00:00
Daniel Barbero Martin
68d9390519 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-23 08:41:39 +01:00
Jose Gonzalez
d43c51cc66 WIP: Backup upload 2021-03-22 17:37:15 +01: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
Daniel Rodriguez
3eaff54b73 Merge branch 'ent-6232-nt-incluir-metricas-en-el-wizard-de-interfaces-snmp' into 'develop' 
Ent 6232 nt incluir metricas en el wizard de interfaces snmp

See merge request artica/pandorafms!3935
 2021-03-18 16:02:56 +00:00
Jose Gonzalez
9e54f9517b WIP: Backup upload 2021-03-18 16:12:39 +01:00
Daniel Barbero Martin
505e724384 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-15 08:19:32 +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
3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
fbsanchez
95f1a2abcc Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2021-03-11 10:00:17 +01:00