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

19474 Commits

Author SHA1 Message Date
fbsanchez 8d17c9e0d0 minor plugintools fix 
Former-commit-id: d7d43777b952b483a733c7ac92776f12b5c17e62
 2019-02-04 19:32:54 +01:00
fbsanchez 7247fbf6ef Merge branch 'ent-1959-cron-supervisor-de-estado' of brutus.artica.lan:artica/pandorafms into ent-1959-cron-supervisor-de-estado 
Former-commit-id: 8cb75cd39226594d79f861d44de613c346b84f8d
 2019-02-04 19:17:41 +01:00
fbsanchez 89af077b52 Servers get server string name 
Former-commit-id: e67755e9a86872ba65c5768191cba80fbd879322
 2019-02-04 19:16:50 +01:00
fbsanchez c15357dc03 Servers get server string name 
Former-commit-id: 6988fc5972c72c23131704e9dcb45328755b0ee8
 2019-02-04 19:16:30 +01:00
fbsanchez 53947de42a minor changes - constants style 
Former-commit-id: 3482cb88dc0884ea3c1742eb8fef4ac7c603a849
 2019-02-04 19:14:02 +01:00
Daniel Rodriguez 06e87d2b36 Merge branch 'ent-3248-6352-anadir-compatibilidad-snmp-v3-a-servidor-snmp-enterprise' into 'develop' 
Add SNMPv3 support to the Enterprise SNMP Server.

See merge request artica/pandorafms!2122

Former-commit-id: 49fd3b38b38d95f6b457dbf83d46f6ba52e94e1e
 2019-02-04 17:00:25 +01:00
Alejandro Fraguas 67ab08fc41 Merge branch 'ent-3344-7304-procesado-de-XML-con-acentos' into 'develop' 
added accent compatibility Dataserver

See merge request artica/pandorafms!2109

Former-commit-id: 7e7479c3d82aeb398fb0c76fe7df61d8522af2b3
 2019-02-04 14:05:40 +01:00
Alejandro Fraguas ec97e54dec Merge branch 'ent-3338-Bulk-operations-Module-operations' into 'develop' 
Changed the order of actions

See merge request artica/pandorafms!2139

Former-commit-id: 13b7155ec497027e521f3a9b2147b9e24692e0db
 2019-02-04 11:22:43 +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
manuel.montes 0a94ac9eb0 Merge branch 'develop' into ent-3338-Bulk-operations-Module-operations 
Conflicts:
	pandora_console/godmode/massive/massive_operations.php


Former-commit-id: b673fb9521259653d6f0386e6d9ab5add276380f
 2019-02-04 11:00:50 +01:00
fermin831 d2a3d3bbbc Added all users in global notifications config 
Former-commit-id: d4bf0067f3ffe2e4fdef25158579716bdfd78d5d
 2019-02-04 10:41:35 +01:00
Daniel Rodriguez 74d9b18c87 Merge branch 'cursed-format-change' into 'develop' 
Cambio del formato de estilo visual del código

See merge request artica/pandorafms!2156

Former-commit-id: 9b05490414194e58adbcd6a79a20c93eff40c9a4
 2019-02-04 10:18:05 +01:00
Alejandro Gallardo Escobar 4c735762dc Merge branch 'develop' into cursed-format-change 
Former-commit-id: a986a0245f7f0cce5ea7fc3c33503bc53e85242a
 2019-02-04 09:11:39 +01:00
artica af1f081e5c Auto-updated build strings. 
Former-commit-id: e75f41146e01ab55222c3b4176a50aee7e9246df
 2019-02-04 00:01:33 +01:00
artica 934533141e Auto-updated build strings. 
Former-commit-id: ac84c1e47dd82d12c0b83a0a79b044ca26fc8d8e
 2019-02-03 00:01:26 +01:00
artica 24e799f18e Auto-updated build strings. 
Former-commit-id: 0e390ddd2b2294dbd043bc7c94dd9a82c228c80f
 2019-02-02 00:01:29 +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
Alejandro Gallardo Escobar d38236091b Format fixes 
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
 2019-02-01 09:55:29 +01:00
artica 62461525e8 Auto-updated build strings. 
Former-commit-id: 899c65040831974e16b76b37348dea7d428a7af3
 2019-02-01 00:01:36 +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
Alejandro Gallardo Escobar 229c60c5cc Merge branch 'develop' into cursed-format-change 
Former-commit-id: a3dfd193c81af0ebe0549dc2a9c953aac98b5f68
 2019-01-31 09:42:10 +01:00
artica d6667354fc Auto-updated build strings. 
Former-commit-id: 166da74dd65e72a242b58cf10f4c564496b76fe9
 2019-01-31 00:01:24 +01:00
fbsanchez 3f81e60df2 wip messages 
Former-commit-id: 7852ce90b3f2681a0134a651812341f7fac00c53
 2019-01-30 17:33:31 +01:00
daniel c5d5fd4164 Merge branch 'fix/mr_value_731' into 'develop' 
fixed mr token

See merge request artica/pandorafms!2158

Former-commit-id: c6134a2d1911471335704d231d0b479ae5c94bd7
 2019-01-30 17:15:57 +01:00
daniel d0fe6c9ecf fixed mr token 
Former-commit-id: ab5615c8eb0f1a2b153934b807d23804f4fd5562
 2019-01-30 17:11:48 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
fbsanchez 406c062a3c WIP messages, usable 
Former-commit-id: 79e0b38fe7499642480505aac088ef8b45b04714
 2019-01-30 13:29:46 +01:00
artica 7a9684f23c Changed the format of the .css files 
Former-commit-id: a0dce3fe780031105396a8439c83d520197670af
 2019-01-30 12:42:16 +01:00
artica dc238cf74a Changed the format of the .js and .html files 
Former-commit-id: 7a06315787b85355f4840cbfb0431d55dea4293d
 2019-01-30 12:27:18 +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
Samuel Carcases 3eeaf83ee3 Update pandora_manage.pl 
Former-commit-id: 4bc758a4284e96658137fb9580f36163a2031944
 2019-01-29 17:40:25 +01:00
Alejandro Fraguas eb0b9bd05b Update pandora_manage.pl 
Former-commit-id: 4064310d63eb101eb1a13825357aa5c425eae502
 2019-01-29 17:16:47 +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
Alejandro Fraguas c05e99f37e Update pandora_manage.pl 
Former-commit-id: 451b04e91078b99c8b9f41a35271797c343f357c
 2019-01-29 16:07:39 +01:00
Daniel Rodriguez 5bc10915da Merge branch 'ent-3451-retoques-ipam' into 'develop' 
added pandora_block_ping to check response of multiple addresses

See merge request artica/pandorafms!2147

Former-commit-id: 6adf7e7f59beba0d1f579ab267fd40d0c21a24c4
 2019-01-29 15:58:00 +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