Commits · 47fff35f15ba1f133e120a3de5b727d92791c4cd · yotta / pictogram · GitLab

09 Mar, 2016 3 commits
- Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram · 47fff35f
  Fernando Martínez Santiago committed Mar 09, 2016
  
  47fff35f Browse Files
- modifications to db updated · 21fc48ba
  Arturo Montejo Ráez committed Mar 09, 2016
  
  21fc48ba Browse Files
- PDB reconnects to room when socket regained · 3a761055
  Arturo Montejo Ráez committed Mar 09, 2016
  
  3a761055 Browse Files
08 Mar, 2016 2 commits
- Working on alter status from pcb when offline · f386fccf
  Fernando Martínez Santiago committed Mar 08, 2016
  
  f386fccf Browse Files
- working on batch bug · 3b732ed6
  Fernando Martínez Santiago committed Mar 08, 2016
  
  3b732ed6 Browse Files
07 Mar, 2016 2 commits
- working on sockets on/off bug (ii) · 70aee8d2
  Fernando Martínez Santiago committed Mar 07, 2016
  
  70aee8d2 Browse Files
- working on sockets on/off bug · 84dbe6ed
  Fernando Martínez Santiago committed Mar 07, 2016
  
  84dbe6ed Browse Files
05 Mar, 2016 2 commits
- Vocabulary management from PCB, upload and status images, implemented (SAILS side) · 900acc08
  Fernando Martínez Santiago committed Mar 05, 2016
  
  900acc08 Browse Files
- Vocabulary management from PCB, upload and status images, implemented (PCB side) · b6c2e005
  Fernando Martínez Santiago committed Mar 05, 2016
  
  b6c2e005 Browse Files
04 Mar, 2016 1 commit
- Vocabulary management from PCB, upload images, implemented · 3c9d879a
  Fernando Martínez Santiago committed Mar 04, 2016
  
  3c9d879a Browse Files
03 Mar, 2016 2 commits
- Working on image upload (iv) · fa93884b
  Fernando Martínez Santiago committed Mar 03, 2016
  
  fa93884b Browse Files
- working on vocabulary management from PCB (iii) · 936c5734
  Fernando Martínez Santiago committed Mar 03, 2016
  
  936c5734 Browse Files
02 Mar, 2016 1 commit
- working on vocabulary management from PCB (ii) · f7c28fdb
  Fernando Martínez Santiago committed Mar 02, 2016
  
  f7c28fdb Browse Files
01 Mar, 2016 1 commit
- Working on vocabulary management from PCB · f48b31fc
  Fernando Martínez Santiago committed Mar 01, 2016
  
  f48b31fc Browse Files
27 Feb, 2016 2 commits
- Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram · 3e0c1d65
  Arturo Montejo Ráez committed Feb 27, 2016
  
  3e0c1d65 Browse Files
- Issue #339 fixed (upload images from dashboard fails when sails was crashed and rebooted · f9dcb0c8
  Arturo Montejo Ráez committed Feb 27, 2016
  
  f9dcb0c8
25 Feb, 2016 4 commits
- Thread delay fixed · 27930438
  Fernando Martínez Santiago committed Feb 25, 2016
  
  27930438 Browse Files
- Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram · ac0ad839
  Fernando Martínez Santiago committed Feb 25, 2016
  
  ac0ad839 Browse Files
- Cambios en PictogramActivity, para dejar esta actividad lista para el modo… · e5eac320
```
Cambios en PictogramActivity, para dejar esta actividad lista para el modo administrador (habilitar/deshabilitar/añadir pictogramas)
```
  Miguel Ángel García Cumbreras committed Feb 25, 2016
  e5eac320
- Cambios en Serial y LoginActivity · b249f8b3
  Miguel Ángel García Cumbreras committed Feb 25, 2016
  
  b249f8b3 Browse Files
24 Feb, 2016 2 commits
- Bug login solucionado · 9c32545c
  Miguel Ángel García Cumbreras committed Feb 24, 2016
  
  9c32545c Browse Files
- working on semantic grammar integration · b438422c
  Fernando Martínez Santiago committed Feb 24, 2016
  
  b438422c Browse Files
23 Feb, 2016 1 commit
- Solucionados algunos bugs · 922f7edc
  Miguel Ángel García Cumbreras committed Feb 23, 2016
  
  922f7edc
19 Feb, 2016 1 commit
- Solucionado problema de primera carga de pictogramas usando inner clases · 0273c0ab
  Fernando Martínez Santiago committed Feb 19, 2016
  
  0273c0ab Browse Files
18 Feb, 2016 1 commit
- Solucionado problema de primera carga de pictogramas · 9239a071
  Fernando Martínez Santiago committed Feb 18, 2016
  
  9239a071 Browse Files
13 Feb, 2016 1 commit
- Quitados los valores de login por defecto · 122e5b31
  Miguel Ángel García Cumbreras committed Feb 13, 2016
  
  122e5b31 Browse Files
09 Feb, 2016 3 commits
- Pequeños errores corregidos · 95ba792a
  Miguel Ángel García Cumbreras committed Feb 09, 2016
  
  95ba792a
- Pequeños errores corregidos · 3cc032d3
  Miguel Ángel García Cumbreras committed Feb 09, 2016
  
  3cc032d3 Browse Files
- Quitado el fondo blanco de los pictogramas...veremos otras opciones · 380c8c61
  Miguel Ángel García Cumbreras committed Feb 09, 2016
  
  380c8c61 Browse Files
08 Feb, 2016 3 commits
- Iconos actualizados · 2c0ab989
  Miguel Ángel García Cumbreras committed Feb 09, 2016
  
  2c0ab989 Browse Files
- Merge remote-tracking branch 'origin/master' · 65a8a8a3
  Miguel Ángel García Cumbreras committed Feb 09, 2016
  
  65a8a8a3 Browse Files
- Varios issues cerrados. · acb0046b
  Miguel Ángel García Cumbreras committed Feb 09, 2016
  
  acb0046b Browse Files
05 Feb, 2016 1 commit
- Traducciones en views terminadas (#255 ) · b7a255f6
  Manuel committed Feb 05, 2016
  
  b7a255f6
04 Feb, 2016 2 commits
- Merge remote-tracking branch 'origin/master' · f675c734
  Miguel Ángel García Cumbreras committed Feb 04, 2016
  
  f675c734 Browse Files
- Desde Pictogram ya va a la ventana de Login, con unos gestos concretos · 7467a422
  Miguel Ángel García Cumbreras committed Feb 04, 2016
  
  7467a422 Browse Files
03 Feb, 2016 5 commits
- file upload from PDB working · 7c4d356a
  Arturo Montejo Ráez committed Feb 04, 2016
  
  7c4d356a
- Merge remote-tracking branch 'origin/master' · e8951017
  Miguel Ángel García Cumbreras committed Feb 03, 2016
  
  e8951017 Browse Files
- Varios bugs solucionados · faf359be
  Miguel Ángel García Cumbreras committed Feb 03, 2016
  
  faf359be
- some changes in sessions style · d029a7bb
  Arturo Montejo Ráez committed Feb 03, 2016
  
  d029a7bb Browse Files
- some changes in sessions style · fafe7d68
  Arturo Montejo Ráez committed Feb 03, 2016
  
  fafe7d68