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

23587 Commits

Author SHA1 Message Date
Daniel Barbero Martin 640d93045f Merge remote-tracking branch 'origin/develop' into ent-2152-Operaciones-masivas-de-grupos-secundarios 
Conflicts:
	pandora_console/godmode/massive/massive_edit_agents.php
 2022-03-09 09:28:08 +01:00
artica 18e6bd1c22 Auto-updated build strings. 2022-03-09 01:00:14 +01:00
Daniel Rodriguez 6e98545bda Merge branch 'ent-8415-lista-templates-descuadrada-usuario-sin-RM' into 'develop' 
Fix reports view

Closes pandora_enterprise#8415

See merge request artica/pandorafms!4703
 2022-03-08 15:36:37 +00:00
Daniel Rodriguez 24da0283ee Merge branch 'ent-8524-se-pueden-crear-respuestas-de-eventos-sin-nombre' into 'develop' 
Event response creation name required

See merge request artica/pandorafms!4685
 2022-03-08 15:33:57 +00:00
artica 223475d546 Auto-updated build strings. 2022-03-08 01:00:06 +01:00
artica 3a5d412588 Updated version and build strings. 2022-03-07 12:21:14 +01:00
artica d9f7ea4038 Auto-updated build strings. 2022-03-07 01:00:15 +01:00
artica 5f08afca26 Auto-updated build strings. 2022-03-06 01:00:16 +01:00
artica 69be7b1b55 Auto-updated build strings. 2022-03-05 01:00:19 +01:00
artica e3c80e015d Auto-updated build strings. 2022-03-04 01:00:14 +01:00
fbsanchez 8d049a0ad5 removed invalid components from pandoradb_data 2022-03-03 18:26:28 +01:00
artica 4a7160ce39 Auto-updated build strings. 2022-03-03 01:00:15 +01:00
artica f34722841f Auto-updated build strings. 2022-03-02 01:00:07 +01:00
Daniel Rodriguez f69ade2ca0 Merge branch 'ent-8653-No-funciona-selector-de-grupos-en-apartado-de-perfil-en-creacion-edicion-de-usuario' into 'develop' 
fix group selector in user creation and user edition view

See merge request artica/pandorafms!4728
 2022-03-01 15:12:41 +00:00
alejandro.campos@artica.es 69749e9498 fix group selector in user creation and user edition view 2022-03-01 15:12:28 +01:00
Daniel Rodriguez 953aa2887c Merge branch 'ent-6375-proyectos-auto-aplicacion-de-politicas' into 'develop' 
some tools for policy-auto-application

See merge request artica/pandorafms!4526
 2022-03-01 12:53:36 +00:00
artica 6f23817373 Auto-updated build strings. 2022-03-01 01:00:20 +01:00
artica 2f3f82bf4c Auto-updated build strings. 2022-02-28 01:00:15 +01:00
artica 5ec4632216 Auto-updated build strings. 2022-02-27 01:00:14 +01:00
artica 8d6389c528 Auto-updated build strings. 2022-02-26 01:00:15 +01:00
Daniel Rodriguez db3e74a2f6 Merge branch 'ent-8623-error-sql-filtro-agentes' into 'develop' 
Fixed missing char

See merge request artica/pandorafms!4718
 2022-02-25 09:19:37 +00:00
José González 95e8a10fe1 Clean traces 2022-02-25 08:31:14 +01:00
artica 144f3f2a10 Auto-updated build strings. 2022-02-25 01:00:21 +01:00
José González 08b393614a Fixed missing char 2022-02-24 14:55:47 +01:00
Daniel Rodriguez 3f7067fe48 Merge branch 'ent-I-do-now-like-procedures' into 'develop' 
Allow both behaviours in alert time slots

See merge request artica/pandorafms!4711
 2022-02-24 09:55:40 +00:00
Daniel Rodriguez a4b6c996d1 Merge branch 'ent-8319-update-manager-comprobar-que-los-oums-y-los-mr-sean-consecutivos' into 'develop' 
UMC ImSureWhatImDoingWhenInstallingOfflinePatchesBecouseImGoingToIgnoreYourMessages

See merge request artica/pandorafms!4701
 2022-02-24 09:54:19 +00:00
artica 2cac1fed32 Auto-updated build strings. 2022-02-24 01:00:19 +01:00
fbsanchez cad5b8efa5 float current v 2022-02-23 17:52:09 +01:00
fbsanchez 45d1641169 Merge remote-tracking branch 'origin/develop' into ent-8319-update-manager-comprobar-que-los-oums-y-los-mr-sean-consecutivos 2022-02-23 17:45:15 +01:00
fbsanchez 5d5b0cb553 errata fix 2022-02-23 17:44:51 +01:00
fbsanchez eee355ff00 errata fix 2022-02-23 14:07:20 +01:00
fbsanchez deb46436d3 Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas 
Conflicts:
	pandora_console/extras/mr/52.sql
 2022-02-23 12:11:44 +01:00
Daniel Barbero Martin 9dc7c77cb0 remove procedure and retrocompatibility pandora_enterprise#3943 2022-02-23 10:58:38 +01:00
fbsanchez 2f304f9250 sync with updatemanager repo 2022-02-23 10:53:33 +01:00
fbsanchez 130b077202 Minor change 2022-02-23 10:51:19 +01:00
fbsanchez be9996ab9f Weird stuff for updates 2022-02-23 10:24:01 +01:00
Daniel Rodriguez 9f96c4e287 Merge branch 'ent-8551-cambio-nombre-fichero-migrate' into 'develop' 
Moved migrate fielename

See merge request artica/pandorafms!4708
 2022-02-23 08:25:09 +00:00
artica df94b6ce4a Auto-updated build strings. 2022-02-23 01:00:18 +01:00
Daniel Rodriguez 4c31e4cda3 Merge branch 'ent-8508-cepsa-correlation-server-no-encola-alertas-en-alert-server' into 'develop' 
Alert server improved

See merge request artica/pandorafms!4673
 2022-02-22 17:03:12 +00:00
Daniel Barbero Martin 5b0d3fe6d4 remove procedure and retrocompatibility pandora_enterprise#3943 2022-02-22 13:26:13 +01:00
Daniel Barbero Martin 237a7feb98 remove procedure and retrocompatibility pandora_enterprise#3943 2022-02-22 13:20:53 +01:00
Daniel Rodriguez ffc7cb2b44 Merge branch 'ent-8455-ampliar-limite-comandos' into 'develop' 
Increased field size

Closes pandora_enterprise#8455

See merge request artica/pandorafms!4706
 2022-02-22 12:08:46 +00:00
Daniel Rodriguez 3092a00edb Merge branch 'ent-8532-widget-agent-modulos-no-muestra-modulos' into 'develop' 
Fix agentmodules widget conf style

See merge request artica/pandorafms!4693
 2022-02-22 11:47:55 +00:00
Daniel Rodriguez dcfe55f2dd Merge branch 'ent-8600-fallo-umbrales-creacion-modulo-snmp-interface' into 'develop' 
Quick fix

See merge request artica/pandorafms!4707
 2022-02-22 11:47:19 +00:00
Daniel Barbero Martin 93cad269c8 fixed json entities pandora_enterprise#3943 2022-02-22 12:03:22 +01:00
Daniel Barbero Martin 3b1b9938ee fixed select2 multiple pandora_enterprise#8606 2022-02-22 11:00:11 +01:00
artica 4eaee57c75 Auto-updated build strings. 2022-02-22 01:00:51 +01:00
fbsanchez ef75a260d0 Merge remote-tracking branch 'origin/develop' into ent-8508-cepsa-correlation-server-no-encola-alertas-en-alert-server 2022-02-21 17:58:32 +01:00
Calvo b67683adff Fix agent modules selector on meta for dashboards 2022-02-21 16:38:09 +01:00
Calvo bacd0a616f Merge remote-tracking branch 'origin/develop' into ent-8532-widget-agent-modulos-no-muestra-modulos 2022-02-21 13:43:20 +01:00