701c11a457
Added event in process status validation when same extra id
2019-06-06 14:52:39 +02:00
29529f18cd
API events in process state validation
2019-06-04 17:06:47 +02:00
1ffc6bd028
Merge remote-tracking branch 'origin/develop' into ent-3770-texto-del-pandora-diag
...
Former-commit-id: 35f8be06ed6fff20ff930a19429a0cbcf5aff33d
2019-05-08 14:36:04 +02:00
11a16e4c2a
Merge branch 'ent-3408-snmp-component-creation-api' into 'develop'
...
Fixed wrong array index for id_group
See merge request artica/pandorafms!2286
Former-commit-id: eaea4fc6551e34c2941e094c78099e07a5315df5
2019-05-06 17:00:29 +02:00
e543b64833
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: dcf81c584d7d2dc8ee8def3e8786d7e67f92da46
2019-04-24 16:20:42 +02:00
8ce3aa0b93
Se añade el valor a assigned by con el usuario de configuracion global
...
Former-commit-id: f7dd22b99d8518210abc6455888c2c98270ad6e4
2019-04-24 13:31:43 +02:00
e7995b988e
Se arregla nombre de la funcion insert
...
Former-commit-id: 24e49bd248b3037a993b7ba04352f0334133200b
2019-04-24 12:37:21 +02:00
062a68fdaf
Ultimas modificaciones
...
Former-commit-id: fb7686f1f75c0d033c40d866d777d10f993a9e36
2019-04-24 12:01:04 +02:00
8987a60755
restauro functions api
...
Former-commit-id: e22da32fb91e8f7b06d7fe627a9a3f2eca877390
2019-04-23 15:39:49 +02:00
014aaffc0d
Se normaliza codigo
...
Former-commit-id: cefce03d5d7b48f8df8cb1dd0cf9662441f2352f
2019-04-22 10:07:28 +02:00
732b3e83d4
Se añaden las modificaciones
...
Former-commit-id: 91b242e0290bd030ac920032f5ca2b23468ba16a
2019-04-17 18:59:08 +02:00
ad4dfc7624
Codigo normalizado, se cambian las llamadas y los datos de entrada a los metodos mediante other
...
Former-commit-id: 13478c483108b878a4cdc25bf19663bf8ed7d0af
2019-04-17 17:25:25 +02:00
51541c8d2c
Atucalizacion de rama
...
Former-commit-id: 0b31052bc4b69d12840b0bac70e06ff222142c07
2019-04-17 15:06:25 +02:00
5de38e204f
Se añade la funcionalidad de sobreescribir perfiles existentes. Se cambia el campo id_grupo por id del perfil
...
Former-commit-id: 0bdec9661a9673a7695754bb7b8ab293650cca66
2019-04-17 12:45:38 +02:00
293b025c7f
Se elimina error de sintaxis
...
Former-commit-id: 0db25e1c670d645c6a3e53829a895024a30a8cd4
2019-04-16 18:35:54 +02:00
5c2ebf0976
Camprobaciones en local para functiones
...
Former-commit-id: caaf9ac04d1c61011a4f2d337e775e72f41c6741
2019-04-16 16:08:06 +02:00
bda67d56c4
Update functions_api.php
...
Former-commit-id: 91efe3435a08085d63e4fc4129b97c290653f237
2019-04-15 17:49:10 +02:00
c8af83b112
Update with validations and type return data functions_api.php
...
Former-commit-id: 0757de69c24df3e547924d8dacd32ba9dd88524c
2019-04-15 12:30:42 +02:00
3dafe2d66d
changed querys and refactor methods
...
Former-commit-id: 8a9ca4a6e70809ff76b922d20980725eb2d879ca
2019-04-12 13:20:59 +02:00
ddfd3339ff
add api
...
Former-commit-id: 7704a1226754067aee849526329eebce372063a1
2019-04-12 11:39:34 +02:00
1e7fb2f375
concatenation
...
Former-commit-id: 1a025ccb247ada9f36f51309baee13f4a2c03a78
2019-04-12 11:37:12 +02:00
2ec72c4d78
Changed query
...
Former-commit-id: f5094c8747677108187e0ba377b80afce2bbd5e0
2019-04-12 11:10:42 +02:00
0afc699b2b
Add concatenation to user variable in filter user group function
...
Former-commit-id: 3e1cef1d560309cbfad9670e8e020ca352ac3619
2019-04-11 10:15:00 +02:00
c313629080
Merge branch 'ent-3445-Solucionar_problematica_flip_flop' into 'develop'
...
flip flop keep counters
See merge request artica/pandorafms!2308
Former-commit-id: b3da4d57bb1c122e1a6040c9b4d35bc7c171043e
2019-04-09 12:04:54 +02:00
351b7218ee
Merge branch 'ent-3683-entities-appear-on-event-comment-api-call' into 'develop'
...
Removed unnecesary io_safe_inpunt on from functions_api.php
See merge request artica/pandorafms!2256
Former-commit-id: 870cdc2ea85241945628ac4a41864a0d54a57bea
2019-04-09 11:19:10 +02:00
49d925d96a
Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
...
Conflicts:
pandora_console/extras/mr/27.sql
Former-commit-id: 67c41a5bd6a4c95647b097171578c5af67b491fa
2019-04-05 16:48:58 +02:00
33db6d2f0c
If is metaconsole, param meta is setted to true
...
Former-commit-id: d652754fc131a0024c0c7846335a4362767e5f1d
2019-04-04 18:13:29 +02:00
c07319fb70
Insert zero into fires_min an fires_max when null
...
Former-commit-id: de1197159053155d4f962d74179933c46189460e
2019-04-01 12:56:10 +02:00
b2e16848f9
add new ff type
...
Former-commit-id: b9ff391d6586e5844e78207d44cdf9b80c98ba7e
2019-03-29 14:59:31 +01:00
1f02159a43
Commit para revisar progreso
...
Former-commit-id: f51d1e10ad320772c77d41aa2da3a1e4eded146a
2019-03-26 12:06:54 +01:00
ce49a45d2a
Commit para revisar progreso
...
Former-commit-id: e1e07ad590624f958e0e8cc31b18d6f936df485e
2019-03-26 11:03:36 +01:00
e163c27b43
Commit para revisar progreso
...
Former-commit-id: 498b7c6a44a18c075c431853d8bf6875e92945f9
2019-03-25 17:59:12 +01:00
3b4cea9962
Fixed wrong array index for id_group
...
Former-commit-id: d902ec0901657035519912262ab55e5c1e6858e4
2019-03-25 12:21:31 +01:00
45b0392d8d
Removed unnecesary io_safe_inpunt on from functions_api.php
...
Former-commit-id: 3120967c09d6629f0c1a1197d122a7e11788fbb7
2019-03-12 15:12:43 +01:00
68afc9289d
Documentation improvements
...
Former-commit-id: ad2155056dd26014f169e277eec2ac7cd463ea3a
2019-02-19 14:51:40 +01:00
582b8a70da
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
...
Conflicts:
pandora_console/install.php
Former-commit-id: 0c97025f2425b1048efd1447a56ea9e2062b3b13
2019-02-18 09:22:48 +01:00
196de9ae3d
Merge branch 'develop' into 3373-Añadir-opcion-a-mas-parametros-en-api_get_groups
...
Former-commit-id: b8436e3dcbc1b23de21653fcbaff88c544c79562
2019-02-15 13:54:28 +01:00
99c0da3a06
Merge branch 'develop' into ent-3121-Report-tipo-general-salida-de-datos-booleanos
...
Conflicts:
pandora_console/include/functions_reporting.php
pandora_console/include/functions_reporting_html.php
Former-commit-id: 10d4c89ad8c6a124c9f31634dc4183e7380d49d7
2019-02-11 11:11:56 +01:00
fcb9275d11
Fixed conflict
...
Former-commit-id: 7aeb505d4d2b8e11f72e5b841eec557d4afc1b6d
2019-02-06 19:09:09 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
11456bcfbb
Merge branch '2519_Listart_y_crear_comandos_de_alerta' into 'develop'
...
Add commands alert
See merge request artica/pandorafms!2025
Former-commit-id: 340201221d0219a0c67e1e34eb6421b7c6d1782d
2019-01-29 18:26:56 +01:00
a3c71f4bca
Merge remote-tracking branch 'origin/2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm' into ent-2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm
...
Former-commit-id: b8eba6ae5a4efa338199efbc35b50b1b6bea8824
2019-01-29 11:57:19 +01:00
cf2b9c5798
Fixed conflicts
...
Former-commit-id: 1be548acda51690c59d03e7270810ad03bb16822
2019-01-28 15:35:37 +01:00
042bf1c6e7
Merge branch '2526_Listar_acciones_de_alerta_desde_la_API' into 'develop'
...
List alert actions in nodes with CLI and API
See merge request artica/pandorafms!2085
Former-commit-id: 9732161ea417a1518e508cb9e2d20438d34ec3b2
2019-01-28 12:56:28 +01:00
61c9603ae8
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: ec5c28bb52343952fd644c1f999d3b5ef04cd709
2019-01-25 09:55:09 +01:00
48eea4ab87
Added centralized error code to API
...
Former-commit-id: 0400f0047276d08182477b4d4c59d42c665189c7
2019-01-23 19:21:02 +01:00
5d8360860d
fixed error include in API not necessary
...
Former-commit-id: a1520c5b4438d559fd98bba4daafd80fb854a406
2019-01-23 17:06:31 +01:00
0f29d6461e
Merge branch 'ent-3013-ipam-modo-configuracion-de-vlan' of brutus.artica.lan:artica/pandorafms into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: b7873c08910f08827387db6d92d8a656d8ca4bf2
2019-01-22 08:57:59 +01:00
2c208b5e29
fixed errors php7 mysqli and warning include
...
Former-commit-id: 68bdf4c26530de45efe2dd8fab360fb88c8976bc
2019-01-22 08:57:48 +01:00
da7e8e5487
Fixed conflict
...
Former-commit-id: 9ca611335700b59f58edf02fa1ab393fcfb8c567
2019-01-21 19:03:32 +01:00
Luis Calvo
marcos.alconada
Alejandro Fraguas
Daniel Rodriguez
Daniel Barbero
Alejandro Gallardo Escobar
Tatiana Llorente
alejandro-campos
manuel.montes
samucarc
artica
Fermin