Commits · 6d46926f6bf60bb5c6b0c5dc8eb66de579525f0d · yotta / pictogram · GitLab

11 Apr, 2017 10 commits
- merged from master · 6d46926f
  Arturo Montejo Ráez committed Apr 11, 2017
  
  6d46926f Browse Files
- Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · 44f7eea8
  Arturo Montejo Ráez committed Apr 11, 2017
  
  44f7eea8 Browse Files
- modified gitignore · 29e17047
  Arturo Montejo Ráez committed Apr 11, 2017
  
  29e17047 Browse Files
- Funcion upload_sound hecha en tablet(Falta retocar y hacer pruebas) · cbb31baf
  Germán Callejas Alcántara committed Apr 11, 2017
  
  cbb31baf Browse Files
- Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · 18cfd017
  Sebastián Collado Montañez committed Apr 11, 2017
  
  18cfd017 Browse Files
- Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · 5a33f3a7
  Sebastián Collado Montañez committed Apr 11, 2017
  
  5a33f3a7 Browse Files
- Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · d8f8322a
  Sebastián Collado Montañez committed Apr 11, 2017
  
  d8f8322a Browse Files
- scene database schema · 580f87c8
  Sebastián Collado Montañez committed Apr 11, 2017
  
  580f87c8 Browse Files
- gitignore modified · 3a492758
  Arturo Montejo Ráez committed Apr 11, 2017
  
  3a492758 Browse Files
- Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · eabea625
  Arturo Montejo Ráez committed Apr 11, 2017
  
  eabea625 Browse Files
10 Apr, 2017 3 commits
- addpicto ARASAAC B&W buttons · e3b77e36
  Jose Antonio committed Apr 10, 2017
  
  e3b77e36
- Issue #131 translate fix · 48dc267d
  Jose Antonio committed Apr 10, 2017
  
  48dc267d
- error with admin login fixed · b5d0af59
  Arturo Montejo Ráez committed Apr 10, 2017
  
  b5d0af59
07 Apr, 2017 4 commits
- issue #116 implemented · 814c8e69
  Arturo Montejo Ráez committed Apr 07, 2017
  
  814c8e69 Browse Files
- Merged branch develop into develop · 5accdc6f
  Jose Antonio committed Apr 07, 2017
  
  5accdc6f Browse Files
- Working on black and white interface · 2fde7804
  Jose Antonio committed Apr 07, 2017
  
  2fde7804 Browse Files
- Subida de audio terminada en la API · d0caa7d0
  Germán Callejas Alcántara committed Apr 07, 2017
  
  d0caa7d0 Browse Files
06 Apr, 2017 9 commits
- Merged branch develop into develop · 1488a819
  Jose Antonio committed Apr 06, 2017
  
  1488a819 Browse Files
- Issue #139 · f373d407
  Jose Antonio committed Apr 06, 2017
  
  f373d407 Browse Files
- Policies editadas y funcion para crear path al audio · e2ef3827
  Germán Callejas Alcántara committed Apr 06, 2017
  
  e2ef3827 Browse Files
- Routes actualizado para upload_sound · 0b38ca53
  Germán Callejas Alcántara committed Apr 06, 2017
  
  0b38ca53 Browse Files
- upload sound in sails modified · 110968d7
  Arturo Montejo Ráez committed Apr 06, 2017
  
  110968d7 Browse Files
- Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · 922d740f
  Fernando Martínez Santiago committed Apr 06, 2017
  
  922d740f
- issue #141 fixed · 536173a3
  Fernando Martínez Santiago committed Apr 06, 2017
  
  536173a3
- Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · 0d43cf5f
  Arturo Montejo Ráez committed Apr 06, 2017
  
  0d43cf5f Browse Files
- issue #129 fixed · 288b6ee8
  Arturo Montejo Ráez committed Apr 06, 2017
  
  288b6ee8
05 Apr, 2017 7 commits
- workin on issue #141 · 77ae9311
  Fernando Martínez Santiago committed Apr 06, 2017
  
  77ae9311 Browse Files
- Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · ae3d9e03
  Fernando Martínez Santiago committed Apr 05, 2017
  
  ae3d9e03 Browse Files
- Issue #133 ,#134 ,#137 ,#138 ,#140 closed · 5d0886c7
  Fernando Martínez Santiago committed Apr 05, 2017
  
  5d0886c7 Browse Files
- Issue #139 · 47f7a852
  Jose Antonio committed Apr 05, 2017
  
  47f7a852 Browse Directory
- Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · d8df45b8
  Germán Callejas Alcántara committed Apr 05, 2017
  
  d8df45b8 Browse Files
- Subida de audio hecha(Falta probar en tablet) · 4334f75d
  Germán Callejas Alcántara committed Apr 05, 2017
  
  4334f75d
- working on issues #133 , #134 , #135 , #137 , #138 · 6250914d
  Fernando Martínez Santiago committed Apr 05, 2017
  
  6250914d Browse Files
04 Apr, 2017 4 commits
- Hot Fix - unexpected token · d5a684f4
  Jose Antonio committed Apr 04, 2017
  
  d5a684f4
- Cambiado commit anterior (añadido populate(uri_sound)) · ea9851f6
  Germán Callejas Alcántara committed Apr 04, 2017
  
  ea9851f6
- Añadido metodo upload_sound a StudentController con las policies, routes y path establecidos · d140acb0
  Germán Callejas Alcántara committed Apr 04, 2017
  
  d140acb0 Browse File
- Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · 2c9a01b0
  Arturo Montejo Ráez committed Apr 04, 2017
  
  2c9a01b0 Browse Files
01 Apr, 2017 1 commit
- Issue #125 fixed · 252741c0
  Fernando Martínez Santiago committed Apr 01, 2017
  
  252741c0 Browse Files
30 Mar, 2017 2 commits
- Asignar supervisor a picto funcionando · 416a0b98
  Germán Callejas Alcántara committed Mar 30, 2017
  
  416a0b98
- Refactorizado el modo de escalar la imagen, ahora se reescala una vez esta en… · f82b517c
```
Refactorizado el modo de escalar la imagen, ahora se reescala una vez esta en EditPictoActivity y no antes de pasarla por los intent
```
  Germán Callejas Alcántara committed Mar 30, 2017
  f82b517c Browse Directory