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

18753 Commits

Author SHA1 Message Date
daniel 7700ee85ca Merge remote-tracking branch 'origin/develop' into 3079-Alertas_php7 2018-11-15 15:34:08 +01:00
daniel d12a25866d fixed translate php7 warning 2018-11-15 15:33:46 +01:00
vgilc da410c9394 Merge branch '3079-Alertas_php7' into 'develop' 
3079 alertas php7

See merge request artica/pandorafms!1978
 2018-11-15 14:17:26 +01:00
daniel aee12e6bf9 Merge remote-tracking branch 'origin/develop' into 3079-Alertas_php7 2018-11-15 13:23:09 +01:00
daniel b78c52caa4 fixed error Acess for Access 2018-11-15 13:22:54 +01:00
nramon cc72416333 Merge branch 'ent-3037-rw341132-snmp-trap-generator-questions' into 'develop' 
Fixed snmptrap binary in windows trap generator

See merge request artica/pandorafms!1977
 2018-11-15 13:19:43 +01:00
fermin831 b786c6c3ab Fixed snmptrap binary in windows trap generator 2018-11-15 13:04:35 +01:00
vgilc 614efef0c4 Merge branch '3079-Alertas_php7' into 'develop' 
create alert php7

See merge request artica/pandorafms!1975
 2018-11-15 09:46:27 +01:00
artica e9e132589c Auto-updated build strings. 2018-11-15 00:01:29 +01:00
daniel 6174e622c8 create alert php7 2018-11-14 18:15:48 +01:00
vgilc e2612e2273 Merge branch '3072-Problemas_jquery' into 'develop' 
fixed errors cv

See merge request artica/pandorafms!1974
 2018-11-14 16:46:33 +01:00
daniel 60212dae50 fixed errors cv 2018-11-14 16:38:44 +01:00
vgilc d7db1e95e4 Merge branch 'fix/ehorus-password' into 'develop' 
Decode entities in the eHorus password.

See merge request artica/pandorafms!1972
 2018-11-14 12:41:52 +01:00
nramon 0c019d1baf Merge branch 'fix/db_connect_charset' into 'develop' 
removed default charset, set to auto

See merge request artica/pandorafms!1973
 2018-11-14 12:36:17 +01:00
fbsanchez a20d541fb4 removed default charset, set to auto 2018-11-14 12:31:35 +01:00
Ramon Novoa 574e537ff1 Decode entities in the eHorus password. 
Ref pandora_enterprise#3073.
 2018-11-14 12:16:59 +01:00
vgilc b218cd2dde Merge branch '3072-Problemas_jquery' into 'develop' 
fixed error upgrade jquery

See merge request artica/pandorafms!1969
 2018-11-14 11:45:19 +01:00
daniel 22a26aa072 fixed error upgrade jquery 2018-11-14 11:40:01 +01:00
vgilc d91f81d0ed Merge branch '2718-Creacion-de-usuarios-desde-metaconsola' into 'develop' 
fixed minor bug: Assigned node field showing in meta user update form when…

See merge request artica/pandorafms!1968
 2018-11-14 08:30:42 +01:00
artica 633d6987eb Auto-updated build strings. 2018-11-14 00:01:29 +01:00
alejandro-campos 5eed82eb62 fixed minor bug: Assigned node field showing in meta user update form when selecting admin profile in case the user was a stardard user 2018-11-13 19:00:16 +01:00
vgilc 3a6b2aa024 Merge branch '2784-Pantalla_por_dispositivos_filtrado_por_custom_fields' into 'develop' 
view cusatom field

See merge request artica/pandorafms!1898
 2018-11-13 17:29:31 +01:00
tatiana.llorente@artica.es b2996e59d5 Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-13 16:50:35 +01:00
tatiana.llorente@artica.es a6b8929a37 Added jquery-ui styles to css - #2784 2018-11-13 16:48:06 +01:00
tatiana.llorente@artica.es 719e502a27 Revert "Added jquery-ui styles to css - #2784" 
This reverts commit fdda5793d2.
 2018-11-13 16:34:27 +01:00
tatiana.llorente@artica.es 4a001d8192 Merge branch '2784-Pantalla_por_dispositivos_filtrado_por_custom_fields' of https://brutus.artica.lan:8081/artica/pandorafms into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-13 16:30:54 +01:00
tatiana.llorente@artica.es fdda5793d2 Added jquery-ui styles to css - #2784 2018-11-13 16:27:57 +01:00
artica f308e1f590 Updated version and build strings. 2018-11-13 15:59:16 +01:00
daniel ac671d041c Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-13 15:47:07 +01:00
daniel 4dbcecb951 WIP custom fields view 2018-11-13 15:46:44 +01:00
vgilc 5ee9534b0f Merge branch '2251-Advertencia-al-cambiar-nombre-de-modulo-de-tipo-interfaz-2' into 'develop' 
decoded entities when retrieving module name in case SNMP module name is updated

See merge request artica/pandorafms!1965
 2018-11-13 12:00:00 +01:00
alejandro-campos c5a0065cba decoded entities when retrieving module name in case SNMP module name is updated 2018-11-13 11:50:46 +01:00
tatiana.llorente@artica.es ea9cbb6973 Changed visual styles - #2784 2018-11-13 11:20:27 +01:00
vgilc 062f413bfe Merge branch '2606-Gestión-de-colecciones-desde-metaconsola-dev' into 'develop' 
collection management from metaconsole

See merge request artica/pandorafms!1962
 2018-11-13 09:28:29 +01:00
vgilc 72691ffe8d Merge branch '2677-no-se-elimina-parent-id-entre-modulos-del-mismo-agente' into 'develop' 
Fixed bug in modules deletion: parent id set to 0 in case parent has been deleted

See merge request artica/pandorafms!1961
 2018-11-13 08:37:45 +01:00
danielmaya 2a0d2e6c46 collection management from metaconsole 2018-11-13 08:33:47 +01:00
artica e29160f34d Auto-updated build strings. 2018-11-13 00:01:29 +01:00
alejandro-campos e45dc3a981 Fixed bug in modules deletion: parent id set to 0 in case parent has been deleted 2018-11-12 18:39:14 +01:00
vgilc d2aee3d6e4 Merge branch 'fix/module-sem' into 'develop' 
Remove a semaphore that is no longer needed. Thanks fbsanchez!

See merge request artica/pandorafms!1958
 2018-11-12 17:41:25 +01:00
vgilc 9d896de41a Merge branch 'ent-3050-fallo-php-7-en-networks-maps' into 'develop' 
Fixed php errors on radial networkmap

See merge request artica/pandorafms!1960
 2018-11-12 16:49:58 +01:00
vgilc 6d0d7fd410 Merge branch '2718-Creacion-de-usuarios-desde-metaconsola' into 'develop' 
removed Assigned node field from admin global profile when creating user from metaconsole

See merge request artica/pandorafms!1959
 2018-11-12 16:49:08 +01:00
fermin831 a201262737 Fixed php errors on radial networkmap 2018-11-12 16:29:31 +01:00
alejandro-campos 75ad60a071 removed Assigned node field from admin global profile when creating user from metaconsole 2018-11-12 15:57:18 +01:00
tatiana.llorente@artica.es 406bf08e2e Changed images for status modules and agents - #2784 2018-11-12 15:43:23 +01:00
Ramon Novoa be79ae83fb Remove a semaphore that is no longer needed. Thanks fbsanchez! 
Ref pandora_enterprise#3060.
 2018-11-12 15:32:37 +01:00
daniel afaa6ad2ba Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-12 09:07:56 +01:00
artica 0dd6c54651 Auto-updated build strings. 2018-11-12 00:01:25 +01:00
artica 4f928c8c22 Auto-updated build strings. 2018-11-11 00:01:25 +01:00
artica 76b24c3214 Auto-updated build strings. 2018-11-10 00:01:28 +01:00
artica 2ed98eac77 Auto-updated build strings. 2018-11-09 00:01:27 +01:00