Commits · 643a50d8a2e239dee9a821157d346893a68fc52d · yotta / pictogram · GitLab

28 Mar, 2016 1 commit
- working on serial/login activity refactorization · 643a50d8
  Fernando Martínez Santiago committed Mar 28, 2016
  
  643a50d8 Browse Files
27 Mar, 2016 1 commit
- Pruebas de ajuster de interfaz · c8c6ea4d
  Miguel Ángel García Cumbreras committed Mar 28, 2016
  
  c8c6ea4d Browse Files
25 Mar, 2016 2 commits
- Modificaciones para el modo OFFLINE · 7ac44499
  Miguel Ángel García Cumbreras committed Mar 25, 2016
  
  7ac44499 Browse Files
- Modificaciones para el modo OFFLINE · afbb66b9
  Miguel Ángel García Cumbreras committed Mar 25, 2016
  
  afbb66b9 Browse Files
17 Mar, 2016 2 commits
- PCB rescaling all pictos greater than 100dx width · ad83e21c
  Fernando Martínez Santiago committed Mar 17, 2016
  
  ad83e21c Browse Files
- Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram into fernando_branch · 741bbc42
```
Conflicts:
	android/Pictogrammar/.idea/gradle.xml
	android/Pictogrammar/app/app.iml
```
  Fernando Martínez Santiago committed Mar 17, 2016
  741bbc42 Browse Files
16 Mar, 2016 2 commits
- online/offline notification tray implemented (issue #353 ) · b6f8b247
  Fernando Martínez Santiago committed Mar 16, 2016
  
  b6f8b247 Browse Files
- wirking on notification online/offline tray · b80d53d5
  Fernando Martínez Santiago committed Mar 16, 2016
  
  b80d53d5 Browse Files
15 Mar, 2016 3 commits
- rescaling local images only (images from server are no longer rescaled) · e96e2819
```
some bugs fixed
```
  Fernando Martínez Santiago committed Mar 15, 2016
  e96e2819 Browse Files
- Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram · cde7a3cb
  Fernando Martínez Santiago committed Mar 15, 2016
  
  cde7a3cb Browse Files
- Rescaling of pictos from PCB implemented · 7737f075
```
User/Pwd DAO managament implemented (issue #350)
```
  Fernando Martínez Santiago committed Mar 15, 2016
  7737f075 Browse Files
14 Mar, 2016 6 commits
- Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram · 889b9572
  Arturo Montejo Ráez committed Mar 14, 2016
  
  889b9572 Browse Files
- Several bugs regarding JSON structure for vocabulary delete and update operations · 25c0f999
  Fernando Martínez Santiago committed Mar 14, 2016
  
  25c0f999 Browse Files
- Working on websockets JSON vocabulary · 373cb7c1
  Fernando Martínez Santiago committed Mar 14, 2016
  
  373cb7c1 Browse Files
- Modificaciones menores de pictogramActivity y primeros casos OFFLINE en Serial · f4d53000
  Miguel Ángel García Cumbreras committed Mar 14, 2016
  
  f4d53000 Browse Files
- Merge branch 'fernando_branch' of http://scm.ujaen.es/softuno/pictogram · 8b01ca8d
  Fernando Martínez Santiago committed Mar 14, 2016
  
  8b01ca8d Browse Files
- Working on GUI for uploading pictos from PCB · 38597dd9
  Fernando Martínez Santiago committed Mar 14, 2016
  
  38597dd9 Browse Files
10 Mar, 2016 4 commits
- PCB interfaz shows invisble pictos when superuser is logged. It's possible to… · fbf06221
```
PCB interfaz shows invisble pictos when superuser is logged. It's possible to enable/disable/make invisible pictos from the PCB
```
  Fernando Martínez Santiago committed Mar 10, 2016
  fbf06221 Browse Files
- Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram · 8ed0bb6e
  Fernando Martínez Santiago committed Mar 10, 2016
  
  8ed0bb6e Browse Files
- Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram · 3a6eb881
  Fernando Martínez Santiago committed Mar 10, 2016
  
  3a6eb881 Browse Files
- Local vocabulary management implemented. Issue #346 fixed. the rest of the… · e4c6ae77
```
Local vocabulary management implemented. Issue #346 fixed. the rest of the devices are notified about local changes when the connexion is available again
```
  Fernando Martínez Santiago committed Mar 10, 2016
  e4c6ae77 Browse Files
09 Mar, 2016 5 commits
- Merge branch 'fernando_branch' of http://scm.ujaen.es/softuno/pictogram · cce62862
  Fernando Martínez Santiago committed Mar 09, 2016
  
  cce62862 Browse Files
- Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram · 47fff35f
  Fernando Martínez Santiago committed Mar 09, 2016
  
  47fff35f Browse Files
- working on local vocabulary management when offline · d70364dd
  Fernando Martínez Santiago committed Mar 09, 2016
  
  d70364dd 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 Directory
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 1 commit
- Thread delay fixed · 27930438
  Fernando Martínez Santiago committed Feb 25, 2016
  
  27930438 Browse Files