Commits · 07f44854aa61e5a3d6601e4d2d6786cc41c7b853 · yotta / pictogram · GitLab

20 Apr, 2016 1 commit
- Añadido /sails/.vagrant a gitignore · 07f44854
  Pablo Molina committed Apr 20, 2016
  
  07f44854
19 Apr, 2016 3 commits
- Añadida organización de etiquetas a CONTRIBUTING.md · 7af6ff8e
  Pablo Molina committed Apr 19, 2016
  
  7af6ff8e Browse Files
- Añadido fichero CONTRIBUTING.md con una guía de colaboración · e448ccce
  Pablo Molina committed Apr 19, 2016
  
  e448ccce
- Merged origin/master into master · ebc987b4
  Pablo Molina committed Apr 19, 2016
  
  ebc987b4 Browse Files
18 Apr, 2016 1 commit
- Fixed #383 · 43f9b70f
  Pablo Molina committed Apr 18, 2016
  
  43f9b70f
16 Apr, 2016 3 commits
- issue #391 fixed · 66ed4620
  Arturo Montejo Ráez committed Apr 16, 2016
  
  66ed4620 Browse File
- updating pre version · 148cb19d
```
Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram
```
  Arturo Montejo Ráez committed Apr 16, 2016
  148cb19d Browse Files
- new logo added · f814e842
  Arturo Montejo Ráez committed Apr 16, 2016
  
  f814e842
14 Apr, 2016 1 commit
- Fixed #383 · d69dfc9d
  Pablo Molina committed Apr 14, 2016
  
  d69dfc9d Browse Files
12 Apr, 2016 2 commits
- Arreglado el orden de importación de la base de datos · f1fb46f5
  Pablo Molina committed Apr 12, 2016
  
  f1fb46f5 Browse Files
- Añadida copia de assets a install.sh · 46873a1b
  Pablo Molina committed Apr 12, 2016
  
  46873a1b
11 Apr, 2016 8 commits
- Añadido /sails/src/assets/app/js/local.js a gitignore · d257711b
  Pablo Molina committed Apr 11, 2016
  
  d257711b Browse Files
- Añadidas resoluciones a /sails/src/assets/app/bower.json · fdf4ccfb
  Pablo Molina committed Apr 11, 2016
  
  fdf4ccfb
- Updated install.sh using pushd and popd · 2ea2bf27
  Pablo Molina committed Apr 11, 2016
  
  2ea2bf27 Browse Files
- Añadido directorio de subidas a install.sh · c6538a9d
  Pablo Molina committed Apr 11, 2016
  
  c6538a9d Browse Files
- Eliminados ficheros innecesarios · 674fa6da
  Pablo Molina committed Apr 11, 2016
  
  674fa6da
- Actualizada documentación del cliente web. · 30012267
  Pablo Molina committed Apr 11, 2016
  
  30012267
- Merge branch 'issue/363' into 'master' · 51132bc1
```
Issue/363
```
  Pablo Molina committed Apr 11, 2016
  51132bc1 Browse Files
- Completado #363 · 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#
```
  Pablo Molina 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 Browse File
- 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 Directory
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 Directory
- wirking on notification online/offline tray · b80d53d5
  Fernando Martínez Santiago committed Mar 16, 2016
  
  b80d53d5 Browse Files
15 Mar, 2016 2 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 Directory
- Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram · cde7a3cb
  Fernando Martínez Santiago committed Mar 15, 2016
  
  cde7a3cb