tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-09-26 11:29:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
36,963 Commits 34 Branches 30 Tags
Commit Graph

741 Commits

Author SHA1 Message Date
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
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
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
miguel angel rasteu
cec9a263fe #11529 Fix base64 decode 2023-06-12 13:55:26 +02:00
miguel angel rasteu
db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu
1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu
64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu
933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
Jonathan
ae526d5df0 #10598 New wizard welcome 2023-05-23 16:54:40 +02:00
Matias Didier
2db1eddc11 Merge branch 'ent-10326-bearer-token-permite-conectar-con-pandora1234-por-defecto' into 'develop' 
Ent 10326 bearer token permite conectar con pandora1234 por defecto

See merge request artica/pandorafms!5782
 2023-05-19 07:00:38 +00:00
Jonathan
66e1de90df #10861 change permisions api functions 2023-05-09 17:28:54 +02:00
Jorge Rincon
46ae13b4f9 #10645 Add agent name to nodo 2023-05-04 08:11:15 +02:00
Jonathan
305a853281 Merge branch 'develop' into ent-10185-filtros-personalizados-para-el-visor-de-datos-de-logs 2023-04-28 10:18:31 +02:00
Daniel Cebrian
d28cd1577b #10326 regenerate api token when update password 2023-04-25 15:43:02 +02:00
alejandro.campos@artica.es
4bb88080ea Keep In process status for new events with same extra id 2023-04-14 08:59:19 +02:00
alejandro.campos@artica.es
2ca27ae15d Keep In process status for new events with same extra id 2023-04-12 17:32:52 +02:00
Diego Muñoz-Reja
0f635c8206 Merge branch 'ent-10127-14800-anadir-id_nodo-a-llamada-api-validate_events' into 'develop' 
Ent 10127 14800 anadir id nodo a llamada api validate events

See merge request artica/pandorafms!5479
 2023-02-27 16:53:01 +00:00
Pablo Aragon
54e4da7aad Merge branch 'develop' into ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms-2 2023-02-03 10:48:42 +01:00
Jimmy Olano
c15fe41897 Merge branch 'ent-9473-derivado-del-trabajo-q-a-765-api-pfms-get-total_modules-no-devuelve-total-por-grupo-especifico' into 'develop' 
Ent 9473 derivado del trabajo q a 765 api pfms get total modules no devuelve total por grupo especifico

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9473

See merge request artica/pandorafms!5419
 2023-01-31 19:15:34 +00:00
Daniel Cebrian
d49f1320f5 #10127 added param 'id_node' in set_validate_events for update from metaconsole 2023-01-31 12:37:55 +01:00
daniel
df8cb7f481 fix api call server for module graph pandora_enterprise#10241 2023-01-26 14:17:54 +01:00
Pablo Aragon
d2c286fc4c 9220 Conflict resolved 2023-01-24 09:50:34 +01:00
Jonathan
904b505803 #9473 total_modules all and id 2023-01-16 16:31:13 +01:00
Calvo
d8428a46a7 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2023-01-13 10:12:21 +01:00
Pablo Aragon
c503836634 Restrict access to collections with nms license 2023-01-12 12:28:40 +01:00
Jonathan
e311602520 #9440 Change permissions on planned_downtimes_additem to AR 2023-01-04 09:52:47 +01:00
Calvo
38838cd4e0 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-30 15:25:57 +01:00