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

23494 Commits

Author SHA1 Message Date
Daniel Barbero Martin 602ce39907 Fixed clock item VC 2020-01-13 17:13:52 +01:00
Daniel Barbero Martin e54740ec19 fixed parent input 2020-01-13 14:19:56 +01:00
Daniel Barbero Martin 60bd600392 module graph convert to image base 64 2020-01-13 13:31:23 +01:00
Daniel Barbero Martin 4f6ed7c39f Fix tinyMCE background grey 2020-01-13 10:14:51 +01:00
Daniel Barbero Martin 09f1e2b733 fixed errors in resize and move item percentile and value 2020-01-13 09:53:00 +01:00
Daniel Barbero Martin fe46a2a74e Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-13 08:07:20 +01:00
artica 2fa637ee4d Auto-updated build strings. 2020-01-13 00:01:08 +01:00
artica f7ea19863f Auto-updated build strings. 2020-01-12 00:01:08 +01:00
artica f4bc172355 Auto-updated build strings. 2020-01-11 00:01:09 +01:00
Daniel Rodriguez 50e533e559 Merge branch 'ent-5231-9298-Bug-al-crear-un-usuario-con-espacios-al-final' into 'develop' 
add check to prevent user creation with an id with trailing spaces

See merge request artica/pandorafms!3008
 2020-01-10 14:41:33 +01:00
Daniel Rodriguez 79161b3206 Merge branch 'ent-5239-No-aparece-update-fallido-por-OUM-offline-en-audit-log' into 'develop' 
Added log when offline update fails

See merge request artica/pandorafms!3003
 2020-01-10 14:34:41 +01:00
Daniel Rodriguez d864b47424 Merge branch 'ent-4677-error-appliying-report-templates' into 'develop' 
Fixed ui message icon bug on meta

See merge request artica/pandorafms!3007
 2020-01-10 14:26:35 +01:00
alejandro-campos 78df8dcb95 prevent user creation with leading or trailing spaces in user id 2020-01-10 13:50:04 +01:00
Daniel Barbero Martin d4b92a6913 Fixed errors in VC 2020-01-10 13:48:07 +01:00
alejandro-campos ec6a763aa2 add check to prevent user creation with an id with trailing spaces 2020-01-10 13:24:00 +01:00
Luis Calvo 6742881009 Fixed ui message icon bug on meta 2020-01-10 13:16:53 +01:00
Daniel Rodriguez 2734b6461e Merge branch 'ent-4895-error-redireccion-plantillas-cron-tasklist' into 'develop' 
Fixed template redirection tasklist on cron extension

See merge request artica/pandorafms!3006
 2020-01-10 11:12:39 +01:00
Daniel Rodriguez 1ebcfd58e4 Merge branch 'ent-4693-Pete-en-el-contador-de-intervalo-de-agente-con-intervalo-largo' into 'develop' 
fixed interval counter

See merge request artica/pandorafms!2938
 2020-01-10 11:12:05 +01:00
Daniel Maya c9a524b128 fixed interval counter 2020-01-10 11:12:05 +01:00
Daniel Barbero Martin f34387b24e Fixed modal send more forms 2020-01-10 08:41:07 +01:00
Daniel Barbero Martin 14e4e37c2a Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-10 08:09:13 +01:00
artica 467db373b7 Auto-updated build strings. 2020-01-10 00:01:55 +01:00
Daniel Barbero 7e4cb02ceb fixed styles and more 2020-01-09 18:05:21 +01:00
Luis Calvo 4ff1c9cb7d Fixed template redirection tasklist on cron extension 2020-01-09 17:56:34 +01:00
manuel 62c915d6df Added log when offline update fails 2020-01-09 17:09:55 +01:00
Daniel Rodriguez 1cef8aa62f Merge branch 'ent-4658-cross-site-seguridad-base64' into 'develop' 
Changed the mode of obtain the title

See merge request artica/pandorafms!2743
 2020-01-09 16:46:58 +01:00
Daniel Barbero a933a091ea styles fixed 2020-01-09 12:07:19 +01:00
Daniel Rodriguez 063600fda2 Merge branch 'ent-4597-bug-items-consola-visual-se-superponen-sobre-menu-superior' into 'develop' 
Fixed z-index header

See merge request artica/pandorafms!2888
 2020-01-09 11:52:27 +01:00
Manuel Montes 5e058df052 Fixed z-index header 2020-01-09 11:52:27 +01:00
Daniel Barbero b40f5b17c1 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-09 09:43:57 +01:00
artica d8b97885a9 Auto-updated build strings. 2020-01-09 00:01:13 +01:00
Daniel Barbero Martin 909dc4bf7c fixed css 2020-01-08 18:08:20 +01:00
Daniel Barbero Martin c25a64e737 fix styles main.css 2020-01-08 18:00:32 +01:00
Daniel Barbero Martin a8e9c69e9a save min.js and min.js.map 2020-01-08 17:33:00 +01:00
Daniel Barbero Martin d97cdfbc7a fix element line 2020-01-08 17:28:03 +01:00
Daniel Rodriguez 1f15fd5dae Merge branch 'ent-5181-Pete-SQL-y-mal-funcionamineto-de-Auto-combined-graph' into 'develop' 
Ent 5181 pete sql y mal funcionamineto de auto combined graph

See merge request artica/pandorafms!3000
 2020-01-08 14:46:29 +01:00
Tatiana Llorente 2c019f04ee Fixed bug in auto combined graph 2020-01-08 11:37:44 +01:00
Daniel Rodriguez c30e9eb1fe Merge branch 'ent-4980-No-cambia-el-Shape-de-los-fictional-nodes-de-Circle-a-Square-Rhombus-en-un-mapa-de-red' into 'develop' 
Ent 4980 no cambia el shape de los fictional nodes de circle a square rhombus en un mapa de red

See merge request artica/pandorafms!2896
 2020-01-08 11:33:27 +01:00
Daniel Barbero Martin c4f0305f9b Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-08 08:29:59 +01:00
artica 64e63dad63 Auto-updated build strings. 2020-01-08 00:01:15 +01:00
Daniel Barbero Martin da01883902 Fixed items vc line 2020-01-07 18:07:07 +01:00
Daniel Barbero Martin b49dd76ce4 Add images input 2020-01-07 15:43:44 +01:00
Daniel Barbero Martin 9e2c048895 new styles VC 2020-01-07 12:06:35 +01:00
Daniel Barbero Martin 4813bef53e Add new input linked visual console 2020-01-07 12:00:39 +01:00
Daniel Rodriguez d16ecc54b6 Merge branch '5148-Tabs-vista-eventos' into 'develop' 
Changed to 2px active tab

Closes pandora_enterprise#5148

See merge request artica/pandorafms!2959
 2020-01-07 11:46:18 +01:00
Daniel Rodriguez eea9b0337c Merge branch 'ent-5081-Fallo-estético-en-el-Update-manager-Offline' into 'develop' 
Ent 5081 fallo estético en el update manager offline

See merge request artica/pandorafms!2977
 2020-01-07 11:12:59 +01:00
vgilc 8ecefd686f Merge branch 'ent-3967-imagen-en-consulta-a-db-interface' into 'develop' 
Fix bug on reports db interface query

See merge request artica/pandorafms!2906
 2020-01-07 10:58:37 +01:00
vgilc 3f2c93ea2b Merge branch 'ent-3977-Conteo-módulos-de-agente-con-grupos-secundarios' into 'develop' 
Ent 3977 conteo módulos de agente con grupos secundarios

See merge request artica/pandorafms!2926
 2020-01-07 10:57:44 +01:00
Daniel Maya 8572540f9a Ent 3977 conteo módulos de agente con grupos secundarios 2020-01-07 10:57:44 +01:00
vgilc 828203ed06 Merge branch 'ent-4437-ayuda-no-hierarchy' into 'develop' 
Deleted help icon

See merge request artica/pandorafms!2616
 2020-01-07 10:55:36 +01:00