763 Commits

Author	SHA1	Message	Date
marcos.alconada	ddfd3339ff	add api ... Former-commit-id: 7704a1226754067aee849526329eebce372063a1	2019-04-12 11:39:34 +02:00
marcos.alconada	1e7fb2f375	concatenation ... Former-commit-id: 1a025ccb247ada9f36f51309baee13f4a2c03a78	2019-04-12 11:37:12 +02:00
marcos.alconada	2ec72c4d78	Changed query ... Former-commit-id: f5094c8747677108187e0ba377b80afce2bbd5e0	2019-04-12 11:10:42 +02:00
marcos.alconada	0afc699b2b	Add concatenation to user variable in filter user group function ... Former-commit-id: 3e1cef1d560309cbfad9670e8e020ca352ac3619	2019-04-11 10:15:00 +02:00
Daniel Rodriguez	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
Alejandro Fraguas	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
Daniel Barbero	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
Luis Calvo	33db6d2f0c	If is metaconsole, param meta is setted to true ... Former-commit-id: d652754fc131a0024c0c7846335a4362767e5f1d	2019-04-04 18:13:29 +02:00
Luis Calvo	c07319fb70	Insert zero into fires_min an fires_max when null ... Former-commit-id: de1197159053155d4f962d74179933c46189460e	2019-04-01 12:56:10 +02:00
Daniel Barbero	b2e16848f9	add new ff type ... Former-commit-id: b9ff391d6586e5844e78207d44cdf9b80c98ba7e	2019-03-29 14:59:31 +01:00
marcos.alconada	1f02159a43	Commit para revisar progreso ... Former-commit-id: f51d1e10ad320772c77d41aa2da3a1e4eded146a	2019-03-26 12:06:54 +01:00
marcos.alconada	ce49a45d2a	Commit para revisar progreso ... Former-commit-id: e1e07ad590624f958e0e8cc31b18d6f936df485e	2019-03-26 11:03:36 +01:00
marcos.alconada	e163c27b43	Commit para revisar progreso ... Former-commit-id: 498b7c6a44a18c075c431853d8bf6875e92945f9	2019-03-25 17:59:12 +01:00
Luis Calvo	3b4cea9962	Fixed wrong array index for id_group ... Former-commit-id: d902ec0901657035519912262ab55e5c1e6858e4	2019-03-25 12:21:31 +01:00
Luis Calvo	45b0392d8d	Removed unnecesary io_safe_inpunt on from functions_api.php ... Former-commit-id: 3120967c09d6629f0c1a1197d122a7e11788fbb7	2019-03-12 15:12:43 +01:00
Alejandro Gallardo Escobar	68afc9289d	Documentation improvements ... Former-commit-id: ad2155056dd26014f169e277eec2ac7cd463ea3a	2019-02-19 14:51:40 +01:00
Tatiana Llorente	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
alejandro-campos	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
manuel.montes	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
samucarc	fcb9275d11	Fixed conflict ... Former-commit-id: 7aeb505d4d2b8e11f72e5b841eec557d4afc1b6d	2019-02-06 19:09:09 +01:00
artica	b3da2803a4	Changed the format of the .php files ... Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399	2019-01-30 16:18:44 +01:00
Alejandro Fraguas	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
samucarc	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
samucarc	cf2b9c5798	Fixed conflicts ... Former-commit-id: 1be548acda51690c59d03e7270810ad03bb16822	2019-01-28 15:35:37 +01:00
Alejandro Fraguas	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
daniel	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
Fermin	48eea4ab87	Added centralized error code to API ... Former-commit-id: 0400f0047276d08182477b4d4c59d42c665189c7	2019-01-23 19:21:02 +01:00
daniel	5d8360860d	fixed error include in API not necessary ... Former-commit-id: a1520c5b4438d559fd98bba4daafd80fb854a406	2019-01-23 17:06:31 +01:00
daniel	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
daniel	2c208b5e29	fixed errors php7 mysqli and warning include ... Former-commit-id: 68bdf4c26530de45efe2dd8fab360fb88c8976bc	2019-01-22 08:57:48 +01:00
samucarc	da7e8e5487	Fixed conflict ... Former-commit-id: 9ca611335700b59f58edf02fa1ab393fcfb8c567	2019-01-21 19:03:32 +01:00
samucarc	bd48c96de4	Fixed duplicated function module group synch in API ... Former-commit-id: 03b23a85223add6d8f730dbfebaf58fbf7839e2a	2019-01-21 15:03:02 +01:00
samucarc	367c9fc6fc	Merge remote-tracking branch 'origin/2521_Crear_grupos_de_modulos_desde_la_API_2' into 2521_Crear_grupos_de_modulo_desde_la_API ... Former-commit-id: 7d604cb6777734f43dc5d64f38b5cca651cce25d	2019-01-21 11:41:57 +01:00
samucarc	1dbbc820ad	Merge branch 'develop' into 2521_Crear_grupos_de_modulo_desde_la_API ... Former-commit-id: c8ce459cee080644b5184d74bdea56f34ab82eaf	2019-01-21 11:31:36 +01:00
Alejandro Fraguas	f8ac525281	Merge branch '2527-listar-ycrear-filtros-de-eventos-desde-la-api' into 'develop' ... implemented api functions to create/update/delete/list event filters See merge request artica/pandorafms!2093 Former-commit-id: 03b530b0a118972a6af7b17fba9919b0fc45d611	2019-01-21 10:31:17 +01:00
samucarc	344589494a	Fixed minor error ... Former-commit-id: 56aafe5689d627ac515c80b0158fc998992bd457	2019-01-18 17:33:29 +01:00
samucarc	0c9446fceb	Added new functionality in CLI and API to update module counts and alert counts ... Former-commit-id: aca543eb33de0dc231d18a4776676a4700b37120	2019-01-18 17:24:32 +01:00
Daniel Rodriguez	92aafb5953	Merge branch '2978-INTRACOM-Funciones-API-traps-y-control-de-acceso-de-aplicacion-externa-Fix-de-código-pisado-2' into 'develop' ... Add traps, and other intracom API functions - #2978 See merge request artica/pandorafms!2119 Former-commit-id: 42bf67414f74d373ece3f83b4eecf2e4fd17f049	2019-01-17 12:08:03 +01:00
alejandro-campos	e316977d4b	Refactorize and add two new fields to api_get_groups api function ... Former-commit-id: 2d59091279c284d549c09744ee61c8fee1e33564	2019-01-16 12:23:19 +01:00
manuel.montes	aabcf73210	Fixed bug in functions_api ... Former-commit-id: 28e5d9cf323dd04432ca5cabcd447e8cbf748706	2019-01-15 16:33:52 +01:00
enriquecd	5ead23014d	Add traps, and other intracom API functions - #2978 ... Former-commit-id: 6f4029434a36030206def701df0d6e66995c6ca3	2019-01-11 12:33:22 +01:00
Enrique Camargo	1865cc954c	Revert "Merge branch…" ... This reverts merge request !1899 Former-commit-id: e19c3f43ff8a1a416e339f874d73299406d7e57a	2019-01-11 12:12:51 +01:00
enriquecd	ae9b595edd	Merge branch 'develop' into 2978-Functiones-API-traps-y-control-de-acceso-de-aplicacion-externa-Fix-de-código-pisado ... Conflicts: pandora_console/include/functions_api.php Former-commit-id: 5a5debe1ed66000fb8569ec589c84cad8e8dfe63	2019-01-11 12:04:50 +01:00
samucarc	5ecc9276e0	Merge branch 'develop' into 2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm ... # Conflicts: # pandora_console/include/functions_api.php Former-commit-id: 6ba5a8f0fd2d02daca0d05e08b27981c7137f0bc	2019-01-03 16:25:40 +01:00
alejandro-campos	ccb4778217	implemented api functions to create/update/delete/list event filters ... Former-commit-id: f6b5c092622d74dee4fd587f259e6c286cd9c180	2018-12-17 18:18:17 +01:00
samucarc	a9d3d81757	Fixed api function ... Former-commit-id: 9b376941609b04ac13da551e8253d5ed5a8085dc	2018-12-17 17:56:01 +01:00
samucarc	58289e73bc	Added new functionality for CLI to delete policy agents. ... Former-commit-id: 753f9c47d2a4ffe8e5eb599dbd41d5b851500164	2018-12-17 17:51:30 +01:00
samucarc	632d67095b	List alert actions in nodes with CLI and API ... Former-commit-id: 11e9a8137a2a37b081fcbac2ee50cac27c2c208b	2018-12-14 17:20:46 +01:00
samucarc	7f99a8f9f4	List and synchronize group of modules of the meta console with CLI ... Former-commit-id: 2fc699ee17ac08fe2d60746c0a3d8859a5083f7a	2018-12-11 14:43:27 +01:00
samucarc	484d79d974	Fixed synch error ... Former-commit-id: 9b370b64fd24302f76733ca84792d0a57418d688	2018-12-10 16:06:25 +01:00