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

765 Commits

Author SHA1 Message Date
Jonathan ec523ff788 #13012 fix event_custom_id on api_create_event 2024-04-22 12:09:04 +02:00
Jonathan 253a9fca2b #8036 events audit log 2024-03-12 17:52:33 +01:00
alejandro.campos@artica.es e84b522dff fix api call 2024-02-26 14:42:42 +01:00
alejandro.campos@artica.es af23275f5d fix api call 2024-02-26 14:41:09 +01:00
Rafael Ameijeiras 4cdea9d8ef Merge branch 'ent-12460-cientos-de-errores-en-el-log-de-apache' into 'develop' 
Ent 12460 Cientos de errores en el log de apache

See merge request artica/pandorafms!6748
 2024-02-09 09:22:48 +00:00
Rafael Ameijeiras 8d45692b76 Merge branch 'ent-9757-anadir-escalado-de-estados-a-api-y-cli' into 'develop' 
Add warning time to CLI create

Closes pandora_enterprise#9757

See merge request artica/pandorafms!6815
 2024-01-31 14:06:07 +00:00
Daniel Cebrian 5b7a123086 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-30 13:21:44 +01:00
daniel 00f9098f56 Merge remote-tracking branch 'origin/develop' into ent-12352-integrar-tablas-de-merge-en-el-pandoradb-sql 
Conflicts:
	pandora_console/extras/mr/68.sql
	pandora_console/pandoradb.sql
 2024-01-25 15:57:20 +01:00
Daniel Cebrian fbb5d349a2 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-24 11:58:00 +01:00
Diego Muñoz-Reja 9bdcfb4b4d Merge branch 'ent-12519-anadir-el-campo-event-custom-id-a-la-creacion-de-eventos-por-cli-y-api' into 'develop' 
Ent-12519-anadir-el-campo-event-custom-id-a-la-creacion-de-eventos-por-cli-y-api

Closes pandora_enterprise#12519

See merge request artica/pandorafms!6769
 2024-01-22 15:49:32 +00:00
Matias Didier 23c33a73f6 Merge branch 'ent-12299-al-borrar-un-agente-por-masivas-en-meta-no-se-borra-el-md5-y-el-conf' into 'develop' 
remove agents bulk operation pandora_enterprise#12299

See merge request artica/pandorafms!6749
 2024-01-22 14:34:29 +00:00
Daniel Cebrian d504267460 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-22 15:18:01 +01:00
Rafael Ameijeiras c98e773cb3 Merge branch 'ent-12139-16339-llamada-api-new_agent-no-funciona-correctamente' into 'develop' 
Ent 12139 16339 llamada api new agent no funciona correctamente

See merge request artica/pandorafms!6509
 2024-01-18 13:37:52 +00:00
felix.suarez 6d1f2331d5 Add warning_time to update API 2023-12-27 12:37:04 -06:00
felix.suarez 0c13fe6902 Add warning_time to create API 2023-12-27 11:09:44 -06:00
Daniel Cebrian a31f964753 #12460 fixed deprecated 2023-12-27 11:12:43 +01:00
Daniel Cebrian d84faad8cf #12631 added field ignore_unknown in api modules and cli 2023-12-14 18:11:34 +01:00
felix.suarez ea935d3a92 API allow create events with event_custom_id 2023-12-13 12:42:17 -06:00
Daniel Cebrian 464ad467aa #12631 created new token Ignore unknown for agent and modules 2023-12-12 15:30:10 +01:00
Diego Muñoz-Reja f5a455aa15 Merge branch 'ent-11750-15965-conflictos-en-la-insercion-de-datos-mediante-la-api' into 'develop' 
Ent 11750 15965 conflictos en la insercion de datos mediante la api

See merge request artica/pandorafms!6389
 2023-12-12 07:30:18 +00:00
daniel 7258188491 remove agents bulk operation pandora_enterprise#12299 2023-12-11 11:01:53 +01:00
Daniel Cebrian 7f4dc4fbe4 #12460 fixed log deprecated 2023-12-11 09:18:40 +01:00
daniel b10a9e8274 Merge remote-tracking branch 'origin/develop' into ent-12086-giss-simbolo-en-bloque-de-modulo-de-tipo-dataserver-se-pierde-al-mover-agentes-a-otros-nodos 
Conflicts:
	pandora_console/include/api.php
 2023-12-01 10:31:17 +01:00
Jonathan 9819c3a5ff Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos 2023-11-28 08:30:23 +01:00
Diego Muñoz-Reja 454f8f64a5 Merge branch 'ent-12135-quitar-modo-raw_encoding-de-api' into 'develop' 
Ent 12135 quitar modo raw encoding de api

See merge request artica/pandorafms!6528
 2023-11-27 09:58:36 +00:00
Jonathan 4f707a5a1b Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos 2023-11-23 09:27:46 +01:00
daniel 4e3fa66c2b fix error move agents to metaconsole pandora_enterprise#12086 2023-11-14 11:44:51 +01:00
Alejandro Campos 0f381b0db7 Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada' 
# Conflicts:
#   pandora_console/extras/mr/66.sql
 2023-10-03 13:11:09 +00:00
miguel angel rasteu 57d89190e6 #12135 default api raw_decode 2023-10-03 14:49:06 +02:00
alejandro.campos@artica.es 0771094e85 minor changes 2023-10-02 16:42:32 +02:00
Jonathan 6db13cc55a merge conflict solution 2023-09-28 13:14:49 +02:00
miguel angel rasteu 5d41cf7d04 #12139 Fix new_agent api request 2023-09-27 15:47:44 +02:00
Jonathan 70e3707b64 #11705 group extra id heredity event custom id 2023-09-25 12:22:10 +02:00
Jonathan e5c5f91576 #11705 change name event_custom_id 2023-09-25 10:32:23 +02:00
Jonathan 79fe89c3c5 #11705 new custom_field tevento 2023-09-22 12:24:15 +02:00
daniel 3d5a5c856b ITSM pandora_enterprise#11471 2023-09-08 13:09:03 +02:00
Jonathan 94315147cf #11750 module_data name file add module id 2023-09-01 10:12:03 +02:00
Jonathan fb4ac30b57 #10598 show error on create web and check 2023-08-09 13:20:43 +02:00
alejandro.campos@artica.es 75219fb465 keep user id 2023-07-28 12:31:20 +02:00
alejandro.campos@artica.es cf26f4c32a fix inherit ack timestamp feature 2023-07-27 15:11:15 +02:00
alejandro.campos@artica.es 8029125929 fix inherit ack timestamp feature 2023-07-27 15:04:22 +02:00
daniel 1f1b85561c Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-19 11:39:06 +02:00
Rafael Ameijeiras d860d613d6 Merge branch 'ent-10598-nuevo-wizard-de-bienvenida' into 'develop' 
Ent 10598 nuevo wizard de bienvenida

See merge request artica/pandorafms!6043
 2023-07-17 05:57:29 +00:00
Rafael Ameijeiras 9084df382b Merge branch 'ent-10645-15201-peticion-de-cambio-get_events' into 'develop' 
Ent 10645 15201 peticion de cambio get events

See merge request artica/pandorafms!5824
 2023-07-12 07:26:15 +00:00
Gorka Sanchez 3ff9b9b3d6 Merge branch 'ent-10861-permisos-excesivos-api-para-gestion-usuarios-y-perfiles' into 'develop' 
Ent 10861 permisos excesivos api para gestion usuarios y perfiles

See merge request artica/pandorafms!5869
 2023-07-10 07:20:35 +00:00
Gorka Sanchez 683f9de3b2 Merge branch 'ent-11353-15662-no-se-anade-mas-de-un-agente-a-la-parada-planificada-mediante-llamada-a-la-api' into 'develop' 
Ent 11353 15662 no se anade mas de un agente a la parada planificada mediante llamada a la api

See merge request artica/pandorafms!6110
 2023-07-10 07:19:45 +00:00
daniel 200750f90b change events user_comment new table tevent_comment pandora_enterprise#11387 2023-07-07 12:53:14 +02:00
Matias Didier fde3857674 Merge branch 'ent-11476-cambiar-headers-de-copyright' into 'develop' 
Ent 11476 cambiar headers de copyright

See merge request artica/pandorafms!6069
 2023-06-22 13:24:47 +00:00
Jonathan 13e404bcd2 #11353 api not null agent downtime add agent 2023-06-15 08:56:16 +02:00
Jonathan 0760d0fdaf #11353 Api downtime agents explode multi agents 2023-06-15 08:44:53 +02:00