Commit Graph

14939 Commits

Author SHA1 Message Date
fermin831 ac6b74dcdf Added new window to display user notifications config
Former-commit-id: 57ba8fcd01365cedc92535d7cf71f70432a55a94
2019-02-06 11:36:28 +01:00
fermin831 ddcf0bbd16 Added deletion on global notification config
Former-commit-id: 2356bbe374e5decf929cfaaf2fc4776611b0652d
2019-02-05 18:14:10 +01:00
fermin831 7df3fe2dac Added functionallity to Add element on notification global config
Former-commit-id: b51cf2d5079019a69fd7c4344dfcff2bf38147db
2019-02-05 17:40:44 +01:00
fermin831 b4f3e94b13 Clean dialog box on creation
Former-commit-id: 824f7a968b2e196d6df98b9f5dbd48f21a7c9859
2019-02-05 15:31:08 +01:00
fermin831 68bdbd511c Fixed add consecutive source elements
Former-commit-id: 7763da94a48442953879538d42f36673fbdec752
2019-02-05 13:46:16 +01:00
fermin831 8811257762 Popup to add groups and sources to global notification configuration
Former-commit-id: 481812290ea1d1446aa7378ab6a935139483c8a0
2019-02-05 13:36:16 +01:00
fermin831 0b72571c7c Added NOT IN in format mysql filter
Former-commit-id: f3a8cdd6923834443ed7223d1e6ad7776b861184
2019-02-05 12:53:57 +01:00
fermin831 54f0bc1a03 Disable selec boxes when click notify all users on notifications global config
Former-commit-id: 93a3a0007a3a8dfabfec5d0b9ead7d185aeee81b
2019-02-04 11:02:52 +01:00
fermin831 d2a3d3bbbc Added all users in global notifications config
Former-commit-id: d4bf0067f3ffe2e4fdef25158579716bdfd78d5d
2019-02-04 10:41:35 +01:00
fermin831 50030b6933 Added notify all users and disable on first load
Former-commit-id: d193a8375ce00f3f2cf2c1fc181d4eef47c92eb2
2019-02-01 14:48:52 +01:00
fermin831 a8b85d2593 Added missing docs
Former-commit-id: 807c7466b60e4c8ecb77fb8d94102300e9bcd780
2019-02-01 13:53:22 +01:00
fermin831 315a51c5e7 Added only read selector global notification setup
Former-commit-id: bd6262cda30c0bb5a63b106e6c3832efbcfc63b9
2019-02-01 13:46:58 +01:00
fermin831 1c0a5ca247 Added pospone select (fixme)
Former-commit-id: 428b4424a15ef54c4d95a2eb4af07a334366577a
2019-01-31 20:11:43 +01:00
fermin831 75eaa875c9 Added checkboxes to notifications global configuration
Former-commit-id: 79df159f003292dfef697773fe8daa25b77f04c2
2019-01-31 19:43:13 +01:00
fermin831 01bc0775bc Added notification global configuration (only enable and disable)
Former-commit-id: 850d4dd1d8e30fc66623308b8ab148eaeadb5015
2019-01-31 19:13:51 +01:00
fermin831 b589826c86 Added HTML switch element
Former-commit-id: 426557a47577fd9b5b2002ed02d70f1effb92162
2019-01-31 19:11:59 +01:00
fermin831 95f3c063a5 Added tnotification_source_group_user table
Former-commit-id: e1b542a76ceb0e80f49904c16a98e44c14fff1ff
2019-01-31 16:27:55 +01:00
fermin831 397f2964da Added messages notification ball
Former-commit-id: c44a99cf63bc7451890389e4d234fd8aa7b62cbc
2019-01-31 15:16:56 +01:00
fbsanchez 3f81e60df2 wip messages
Former-commit-id: 7852ce90b3f2681a0134a651812341f7fac00c53
2019-01-30 17:33:31 +01:00
fbsanchez 406c062a3c WIP messages, usable
Former-commit-id: 79e0b38fe7499642480505aac088ef8b45b04714
2019-01-30 13:29:46 +01:00
fbsanchez fa6c4d5bc9 notifications, WIP: new lib defined
Former-commit-id: 430ac2e090f91403fc074d2a9b37ab36de10d5a9
2019-01-30 11:56:47 +01:00
fbsanchez dc3d7cc5e2 notifications, first approach db schema
Former-commit-id: 1142c65f175c13eaaff9b26a9887f4ef519e9612
2019-01-30 11:56:21 +01:00
artica 6485de04fd Auto-updated build strings.
Former-commit-id: b5071a47e475e0aa13a62e9e76066cfd10d99ec1
2019-01-30 00:01:26 +01:00
Daniel Rodriguez edd96e75ab Merge branch 'ent-3450-Error-informe-dinámico-al-marcar-una-gráfica-por-cada-agente' into 'develop'
Fixed auto combined graph in metaconsole

See merge request artica/pandorafms!2146

Former-commit-id: c25a50e5176dcb2996df04ebcee3907cc444b56e
2019-01-29 19:14:15 +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
Daniel Maya cc27f0451a Fixed auto combined graph in metaconsole 2
Former-commit-id: 672531931421175354f2a877ac295c1763107756
2019-01-29 17:12:24 +01:00
Alejandro Fraguas ae190ef058 Merge branch 'ent-2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm' into 'develop'
Ent 2523 api listar, crear, borrar y modificar usuarios desde la api #6167 eu comm

See merge request artica/pandorafms!2149

Former-commit-id: a5a1e6aadf4efe43160eebe883a27ce58ac09bc2
2019-01-29 16:23:35 +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
artica cec6aedaf5 Updated version and build strings.
Former-commit-id: 3ba62782db1b3eac4caafb21b5491d249f5a9b44
2019-01-29 11:08:54 +01:00
artica 354834a872 Auto-updated build strings.
Former-commit-id: b59b540696e6f36d82e154a9aefea75519e9adac
2019-01-29 00:01:27 +01:00
Daniel Maya e03b62d168 Fixed auto combined graph in metaconsole
Former-commit-id: c0e819e35fbb5952fa8ce2806e9cddff521a5131
2019-01-28 18:05:46 +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
artica 550abc6634 Auto-updated build strings.
Former-commit-id: b2b65befe5f01bb047fe48f25c4f33eacc277d41
2019-01-28 00:01:23 +01:00
artica dd9f6e5f21 Auto-updated build strings.
Former-commit-id: 92bbfc8b4c06e1873fe92c9f3b31ddc43d070a1d
2019-01-27 00:01:29 +01:00
artica 50036f2120 Auto-updated build strings.
Former-commit-id: 18dc882c6097c97f606ffc45e592f2118b4890cc
2019-01-26 00:01:25 +01:00
daniel 7d4fc056ca fixed errors Qa
Former-commit-id: 9eea2ee2a3ec6bd51d0e7ef88b560e0475fe7504
2019-01-25 11:18:15 +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
daniel 335abb9abc fixed error css
Former-commit-id: d2be8c4cf4306cb51c9b3854cbe06d4c80119d8b
2019-01-25 09:54:53 +01:00
artica d191cdef17 Auto-updated build strings.
Former-commit-id: 0c056fa59423bd4342f513f80bd0a49a9df0dddd
2019-01-25 00:01:33 +01:00
fermin831 3cd9d22f1e Merge branch 'ent-3441-no-se-esta-comprobando-bien-el-modo-centralizado-en-el-nodo' into ent-2516-api-listar-y-crear-modulos-de-inventario-6170-eucomm
Former-commit-id: 577301035cbde2dee5e7a001e48aab50a482a0ec
2019-01-24 14:56:23 +01:00
fermin831 072ad0a1ea Add return value to generate_hash_to_api function
Former-commit-id: b6420e14ab59c08c661a11763edaaa52ad612af8
2019-01-24 13:38:13 +01:00
artica f9113fa2e5 Auto-updated build strings.
Former-commit-id: 4593b36762b46a3b621d39318cb7a9e5b437db52
2019-01-24 00:01:27 +01:00
Fermin 48eea4ab87 Added centralized error code to API
Former-commit-id: 0400f0047276d08182477b4d4c59d42c665189c7
2019-01-23 19:21:02 +01:00
daniel 687358d70c add new token treshold IPAM
Former-commit-id: cc7858af6a83b0773fec3249e13cfbfb274f2fba
2019-01-23 17:33:06 +01:00
daniel 5d8360860d fixed error include in API not necessary
Former-commit-id: a1520c5b4438d559fd98bba4daafd80fb854a406
2019-01-23 17:06:31 +01:00
Alejandro Fraguas 25d4239ef9 Merge branch '2521_Crear_grupos_de_modulo_desde_la_API' into 'develop'
Create module group API

See merge request artica/pandorafms!2053

Former-commit-id: 55819d89a59549ebec28d32840667e37d34a1f79
2019-01-23 17:02:34 +01:00
daniel fb46197c1f fixed minor error button
Former-commit-id: 4b57425285d33d181390090fbdd3c36882ab4fcf
2019-01-23 15:30:46 +01:00
daniel 841a9cf60b Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
Former-commit-id: a23fffb984a6edd4ef7eefe871814ea0120c615a
2019-01-23 11:08:48 +01:00
artica 1e4a288f53 Auto-updated build strings.
Former-commit-id: d02bc496b37ddd35ad1a75174daa0b3ca6d24f24
2019-01-23 00:01:23 +01:00