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

619 Commits

Author SHA1 Message Date
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
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
fbsanchez 83d8b5348f pol group api create agent auto-assign fix 2022-02-08 17:54:14 +01:00
fbsanchez 3f52679969 removed policy stuff from api update_agent_field 2022-02-07 18:56:58 +01:00
fbsanchez d6b6357e98 removed policy stuff from api update_agent 2022-02-07 18:54:24 +01:00
fbsanchez 592df1c3a7 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/pandoradb.sql
 2022-02-01 15:16:21 +01:00
José González 36bef528ab Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs' 
# Conflicts:
#   pandora_console/godmode/massive/massive_delete_agents.php
 2022-02-01 12:45:17 +00:00
Jose Gonzalez 40efaa157d Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs 2022-02-01 13:42:30 +01:00
Jose Gonzalez d81e6571ec New audit logs 2022-02-01 13:39:18 +01:00
Daniel Rodriguez 4ba18dc52b Merge branch 'ent-8119-Llamada-a-la-API-nodo-centralizado' into 'develop' 
implemented api method

See merge request artica/pandorafms!4659
 2022-02-01 09:42:42 +00:00
alejandro.campos@artica.es 4cf312f88e implemented api method 2022-01-27 13:23:12 +01:00
fbsanchez 1207463f16 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/include/class/HTML.class.php
 2022-01-25 14:16:47 +01:00
vgilc 6edc6c6d40 Merge branch 'ent-8437-SQL-Injection-en-API' into 'develop' 
sanitize sql inputs

See merge request artica/pandorafms!4629
 2022-01-25 10:30:01 +00:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
fbsanchez 28743dcb5d sizeof => count 2022-01-19 12:40:52 +01:00
Daniel Rodriguez c6e2e45260 Merge branch 'ent-8369-10666-GUARDIA-Problemas-cluster-consola' into 'develop' 
fixed problems in clusters

See merge request artica/pandorafms!4583
 2022-01-13 12:42:50 +00:00
alejandro.campos@artica.es bc8460dedc minor fix 2022-01-13 12:58:19 +01:00
alejandro.campos@artica.es c93a758111 sanitize sql inputs 2022-01-12 14:11:10 +01:00
alejandro.campos@artica.es 8123d9e44b fixed alias filter in get events api method (metaconsole) 2022-01-11 15:26:31 +01:00
fbsanchez 58ba683005 Super 8 2022-01-10 20:52:29 +01:00
alejandro.campos@artica.es 9390a25367 minor fix 2022-01-05 18:02:28 +01:00
alejandro.campos@artica.es c360a3a06c fixed get event api call 2021-12-15 15:22:40 +01:00
alejandro.campos@artica.es 847e50383a fixed problems in clusters 2021-12-14 12:07:22 +01:00
Daniel Barbero Martin c3f4addb0e wip special days alerts 2021-11-04 12:33:40 +01:00
Daniel Barbero Martin fdca5e4a78 wip special days alerts 2021-11-03 17:30:54 +01:00
fbsanchez d4ceaa4643 Recreate service modules 2021-10-07 13:21:04 +02:00
Daniel Rodriguez c6e2fd6aa9 Merge branch 'ent-7993-bug-en-llamada-api-crear-alert-template-meta' into 'develop' 
API set create alert template metaconsole support

See merge request artica/pandorafms!4401
 2021-09-22 09:08:34 +00:00
Calvo 698ddd47df Fix api get group by id bug with or withouth url encode separator 2021-09-17 13:51:47 +02:00
Calvo 796f083730 Fix api get group by id bug 2021-09-17 11:52:30 +02:00
Calvo bb1e0a0b8b API set create alert template metaconsole support 2021-09-13 10:10:52 +02:00
Calvo 62775e0dae Fix api group_id_by_name with url enconde separator 2021-09-06 18:13:14 +02:00
fbsanchez d492b055da Merge remote-tracking branch 'origin/develop' into ent-7786-agentes-asignados-a-politicas-en-metaconsola 2021-08-11 09:25:26 +02:00
Daniel Rodriguez 00ed8233d0 Merge branch 'ent-7755-graficas-adjuntas-tienen-fuentes-muy-pequeñas' into 'develop' 
set default font size on graph modules when is send in mails

See merge request artica/pandorafms!4264
 2021-08-10 12:19:54 +00:00
fbsanchez bba7123793 Merge branch 'ent-7074-Command-Center' into ent-7786-agentes-asignados-a-politicas-en-metaconsola 2021-07-14 10:05:59 +02:00
fbsanchez 9b31906bdf Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
 2021-07-13 10:01:59 +02:00
Daniel Maya a4203aaee2 Ent 7272 nuevos elementos consola visual odómetro 2021-07-12 10:27:10 +00:00
fbsanchez 554a32b567 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-09 14:40:44 +02:00
fbsanchez ae562e5a7c Use node db directly to handle policy_agents 2021-07-08 21:06:38 +02:00
Junichi Satoh b74beb76df Fixed that plugin module related APIs did not work properly in some cases. 2021-07-06 14:40:40 +09:00
marcos ea57c58f40 set default font size on graph modules when is send in mails 2021-07-05 11:34:32 +02:00
Daniel Barbero Martin f9bbc132a6 Wip command center, collections merge restore 2021-06-15 10:35:34 +02:00
Daniel Barbero Martin b4e1c9d61f Wip command center, api call node 2021-06-10 14:15:36 +02:00
Daniel Barbero Martin d91e7f6aba Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-26 08:28:42 +02:00
Daniel Maya 7eaaa1f371 Ent 4991 api editar scheduled downtimes y añadir eliminar agentes de ellas 2021-05-25 13:40:33 +00:00
Daniel Barbero Martin 73454dd4ea Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-20 08:21:31 +02:00
Daniel Rodriguez 22fa755fc3 Merge branch 'ent-7527-problemas-pandora_revent' into 'develop' 
Fixed issues with https calls

Closes pandora_enterprise#7527

See merge request artica/pandorafms!4128
 2021-05-19 16:02:34 +00:00
Daniel Barbero Martin 8c0a9859a8 remove synch old and check api 2021-05-19 17:08:13 +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
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