Commits · e66071427ca1cdc39cb01e1941f694d5b5871984 · yotta / pictogram · GitLab

17 Apr, 2017 1 commit
- Merged branch develop into develop · e6607142
  Jose Antonio committed Apr 17, 2017
  
  e6607142 Browse Files
16 Apr, 2017 1 commit
- Funciones de acceso a bbdd local · 08390921
  Germán Callejas Alcántara committed Apr 16, 2017
  
  08390921 Browse Files
12 Apr, 2017 5 commits
- grabacion temporal de imagenes · a3bd956f
```
revisión de interfaz de edicion de pictos
```
  Fernando Martínez Santiago committed Apr 12, 2017
  a3bd956f
- Arasaac scroll and search fix · 2ac2ba61
  Jose Antonio committed Apr 12, 2017
  
  2ac2ba61
- Merged branch develop into develop · 3964e2f8
  Jose Antonio committed Apr 12, 2017
  
  3964e2f8 Browse Files
- Improve arasaac byn sql · b40073e3
  Jose Antonio committed Apr 12, 2017
  
  b40073e3
- Añadido el almacenar en local la lista de supervisores de un alumno(está por ver el método final) · d9faa166
  Germán Callejas Alcántara committed Apr 12, 2017
  
  d9faa166 Browse Files
11 Apr, 2017 18 commits
- Working on scene · 7c718270
  Jose Antonio committed Apr 11, 2017
  
  7c718270 Browse Files
- Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · 426ea672
  Arturo Montejo Ráez committed Apr 11, 2017
  
  426ea672 Browse Files
- solved Office.toJSON method · 25d37737
  Arturo Montejo Ráez committed Apr 11, 2017
  
  25d37737 Browse Files
- Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · a9388700
  Sebastián Collado Montañez committed Apr 11, 2017
  
  a9388700 Browse Files
- database ready for scenes · b4dc86eb
  Sebastián Collado Montañez committed Apr 11, 2017
  
  b4dc86eb Browse Files
- Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · e197815f
  Arturo Montejo Ráez committed Apr 11, 2017
  
  e197815f Browse Files
- issues with license mask and null in logo_url fixed · 119473be
  Arturo Montejo Ráez committed Apr 11, 2017
  
  119473be
- Cambiado en upload_sound la forma de cortar el path por el punto que fallaba y… · 8687704f
```
Cambiado en upload_sound la forma de cortar el path por el punto que fallaba y añadido la forma de guardar los supervisores en local(A probar)
```
  Germán Callejas Alcántara committed Apr 11, 2017
  8687704f Browse Files
- 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
- 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 Browse Files
- 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 File
- 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
- Subida de audio terminada en la API · d0caa7d0
  Germán Callejas Alcántara committed Apr 07, 2017
  
  d0caa7d0 Browse Files
06 Apr, 2017 8 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 File
- Routes actualizado para upload_sound · 0b38ca53
  Germán Callejas Alcántara committed Apr 06, 2017
  
  0b38ca53 Browse Directory
- upload sound in sails modified · 110968d7
  Arturo Montejo Ráez committed Apr 06, 2017
  
  110968d7 Browse Directory
- Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · 922d740f
  Fernando Martínez Santiago committed Apr 06, 2017
  
  922d740f Browse Files
- 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