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

15166 Commits

Author SHA1 Message Date
Daniel Barbero Martin
6c305833bf fix groups, module_groups, network_components user_edit synch 2021-05-18 17:18:54 +02:00
José González
91d11bd4cf Controlled pandora_revent with id_agent 0 2021-05-18 16:37:05 +02:00
José González
46e0cbca70 id_agent control for pandora_revent 2021-05-18 14:52:23 +02:00
José González
e5ebc52356 Fixed missed parameter 2021-05-18 13:32:10 +02:00
fbsanchez
876e3dd191 Minor fix - linter return type in comments set to mixed 2021-05-18 13:27:56 +02:00
fbsanchez
0d50ea94db Ensure oid starts with dot - braa requriements 2021-05-18 13:27:06 +02:00
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
artica
739bc7ebd9 Auto-updated build strings. 2021-05-18 01:00:45 +02:00
Daniel Rodriguez
b8fe685028 Merge branch 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' into 'develop' 
implemented user level authentication for integria ims integration

See merge request artica/pandorafms!4117
 2021-05-17 14:41:11 +00:00
fbsanchez
4f7ec16467 avoid maintenance warning 2021-05-17 14:37:01 +02:00
José González
7617330e93 Added agent regex to console task template send email 2021-05-17 13:31:46 +02:00
Daniel Barbero Martin
bc6a838ebb WIP command center, fix view synch queue 2021-05-17 12:35:29 +02:00
Daniel Barbero Martin
1526dac01d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-17 08:35:52 +02:00
artica
d2fd310ea2 Auto-updated build strings. 2021-05-17 01:00:38 +02:00
artica
8c0461e2bf Auto-updated build strings. 2021-05-16 01:00:26 +02:00
artica
bfc805d6a7 Auto-updated build strings. 2021-05-15 01:00:46 +02:00
alejandro.campos@artica.es
1c1e25e712 Added new item type in reports 2021-05-14 14:54:09 +02:00
Daniel Rodriguez
5b2c340163 Merge branch 'ent-6085-Bandwidth-view-vista-de-interfaces' into 'develop' 
Create interface views

See merge request artica/pandorafms!4023
 2021-05-14 09:37:48 +00:00
Daniel Barbero Martin
3f509ebd09 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-14 08:36:58 +02:00
artica
9b6ad55910 Auto-updated build strings. 2021-05-14 01:00:47 +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 Rodriguez
3a76d6e680 Merge branch 'ent-7156-eliminar-agente-desde-meta-no-borra-ficheros' into 'develop' 
Added comments header and improve code

Closes pandora_enterprise#7156

See merge request artica/pandorafms!3986
 2021-05-13 11:14:44 +00:00
Daniel Maya
a869e0749c #7505 fixed fixed Hirearchy 2021-05-13 10:11:58 +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
artica
afa48e815d Auto-updated build strings. 2021-05-13 01:00:45 +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
Daniel Rodriguez
ed4e89a4d0 Merge branch 'ent-7517-11735-fallo-graficas-snmp-interface-en-vista-de-agente-con-black-theme' into 'develop' 
fixed visual error on snmp interfaces agent graphs  black theme

See merge request artica/pandorafms!4119
 2021-05-12 12:52:44 +00:00
Marcos Alconada
f8eafa5015 fixed visual error on snmp interfaces agent graphs black theme 2021-05-12 12:52:44 +00:00
Daniel Maya
a08a69fa91 #7522 fixed duplicate ip_target 2021-05-12 12:39:56 +02:00
Daniel Barbero Martin
ad03bc41aa Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-12 08:41:00 +02:00
artica
671c1ca0a3 Auto-updated build strings. 2021-05-12 01:00:48 +02:00
Daniel Rodriguez
dcbeaa1b3e Merge branch 'ent-7295-bug-visual-en-modal-eventos' into 'develop' 
Fixed visual bug on event modal event responses

See merge request artica/pandorafms!4022
 2021-05-11 13:49:40 +00:00
Luis
b9398604f6 Fixed visual bug on event modal event responses 2021-05-11 13:49:40 +00:00
Daniel Rodriguez
858adb2628 Merge branch 'ent-7345-Bugs-en-el-apartado-de-Diagnosticos' into 'develop' 
Fixed errors diagnostic

See merge request artica/pandorafms!4047
 2021-05-11 13:48:55 +00:00
José González
5aa5e9eab4 Merge branch 'develop' into 'ent-6858-Goliat-opensource' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2021-05-11 13:11:51 +00:00
Daniel Rodriguez
f77d774a32 Merge branch 'ent-7476-black-theme-color-letra-en-el-control-de-busqueda-de-usuarios-no-se-ve' into 'develop' 
fixed visual error black theme

See merge request artica/pandorafms!4100
 2021-05-11 07:39:58 +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
de58f0533b Merge branch 'ent-6618-giss-nombres-de-servicios-aleatorios' into 'develop' 
Ent 6618 giss nombres de servicios aleatorios

See merge request artica/pandorafms!4039
 2021-05-11 07:37:49 +00:00
Daniel Rodriguez
197e156869 Merge branch 'ent-5264-Report-vacio-mails-console-tasks' into 'develop' 
Added function for use templates in emails

Closes pandora_enterprise#5264

See merge request artica/pandorafms!4027
 2021-05-11 07:35:01 +00:00
Daniel Barbero Martin
c19e398057 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-11 07:37:56 +02:00
artica
6bdd983755 Auto-updated build strings. 2021-05-11 01:00:46 +02:00
fbsanchez
3bb615a639 Added method getDBH DBmaintainer 2021-05-10 15:24:33 +02:00
fbsanchez
1f968a0ce0 1st steps show node pending queries 2021-05-10 13:40:41 +02:00
Daniel Rodriguez
fd7eb10f3e Merge branch 'ent-7340-Mensaje-ajax-php-permanente-en-el-log-de-consola' into 'develop' 
remove log input

See merge request artica/pandorafms!4103
 2021-05-10 09:52:08 +00:00
Luis
61dc2e833b Ent 5680 llamada api set update agent field 2021-05-10 09:49:43 +00:00
Daniel Rodriguez
b6169575a9 Merge branch 'ent-7155-bug-edicion-tickets-integria' into 'develop' 
Ent 7155 bug edicion tickets integria

See merge request artica/pandorafms!3991
 2021-05-10 09:17:14 +00:00
Luis
a94c70551d Ent 7155 bug edicion tickets integria 2021-05-10 09:17:14 +00:00
Daniel Rodriguez
826e9edddb Merge branch 'ent-7481-black-theme-segunda-solapa-de-vista-de-un-agente-no-tiene-tabla' into 'develop' 
fixed visual error black theme event modal

See merge request artica/pandorafms!4098
 2021-05-10 09:16:19 +00:00
Marcos Alconada
8f324b942b fixed visual error black theme event modal 2021-05-10 09:16:19 +00:00