Commits · 51132bc18f667e5c586f2551807e1738e34766ce · yotta / pictogram

11 Apr, 2016 2 commits

Merge branch 'issue/363' into 'master' · 51132bc1
```
Issue/363
```
Pablo Molina committed Apr 11, 2016
51132bc1 Browse Files

Completado · 6be3ab4e

 - Actualizado README.md
 - Actualizacidos README.md e install.sh
 - Modificado /sails/README.md
 - Eliminados /.htaccess y /nohup.out
 - Eliminado /sails/src/package.json~
 - Eliminado /sails/src/Gruntfile.back
 - Actualizada configuración con información sobre "ficheros extra"
 - Actualizada la documentación de la base de datos
 - Reordenados los scripts de la base de datos
 - Arreglado installdb.sh
 - Completados scripts de instalación de la base de datos
 - Añadido node-inspector a /sails/src/package.json para depurar
 - Eliminado /sails/src/api/models/#Student.js#

committed Apr 11, 2016

6be3ab4e

05 Apr, 2016 1 commit
- Bug #377 fixed · c02ecc5e
  Fernando Martínez Santiago committed Apr 05, 2016
  
  c02ecc5e
03 Apr, 2016 3 commits
- empty square included · f5adcd27
  Fernando Martínez Santiago committed Apr 03, 2016
  
  f5adcd27 Browse Files
- login documetation included (android/docs) · 4bd4a6e0
  Fernando Martínez Santiago committed Apr 03, 2016
  
  4bd4a6e0 Browse Files
- GUI refactorizacion working: issues… · ca9c5615
```
GUI refactorizacion working: issues #348,#350,#351,#352,#352,#356,#360,#361,#362,#363,#364,#365,#366,#367 closed
```
  Fernando Martínez Santiago committed Apr 03, 2016
  ca9c5615
31 Mar, 2016 2 commits
- working on gui refactorization (vii) · ea32bf48
  Fernando Martínez Santiago committed Mar 31, 2016
  
  ea32bf48 Browse Files
- working on GUI refactorization (vi) · d022b4ed
  Fernando Martínez Santiago committed Mar 31, 2016
  
  d022b4ed Browse Files
30 Mar, 2016 2 commits
- working on serial/login activity refactorization (vi) · 83d95dca
  Fernando Martínez Santiago committed Mar 30, 2016
  
  83d95dca Browse Files
- working on serial/login/pictogram activity refactorization (v) · ebde1051
  Fernando Martínez Santiago committed Mar 30, 2016
  
  ebde1051 Browse Files
29 Mar, 2016 2 commits
- working on serial/login activity refactorization (iv) · 3f51c451
  Fernando Martínez Santiago committed Mar 29, 2016
  
  3f51c451
- Working on login refactorization (iii) · dc3761c6
  Fernando Martínez Santiago committed Mar 29, 2016
  
  dc3761c6 Browse Files
28 Mar, 2016 2 commits
- working on serial/login/pictogram activity structure · ee792d66
  Fernando Martínez Santiago committed Mar 28, 2016
  
  ee792d66 Browse Files
- 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
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
17 Mar, 2016 2 commits
- PCB rescaling all pictos greater than 100dx width · ad83e21c
  Fernando Martínez Santiago committed Mar 17, 2016
  
  ad83e21c
- 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
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
- 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
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
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
- PDB reconnects to room when socket regained · 3a761055
  Arturo Montejo Ráez committed Mar 09, 2016
  
  3a761055
08 Mar, 2016 1 commit
- Working on alter status from pcb when offline · f386fccf
  Fernando Martínez Santiago committed Mar 08, 2016
  
  f386fccf Browse Files