Commits · 5c89fb0d2f1bf906a5eb4861d4ad236e04e7bc4d · yotta / pictogram · GitLab

20 Apr, 2017 3 commits
- working on scenes · 5c89fb0d
  Sebastián Collado Montañez committed Apr 20, 2017
  
  5c89fb0d Browse Files
- Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · 01bcb078
  Sebastián Collado Montañez committed Apr 20, 2017
  
  01bcb078
- activate scene, only visual · a3958968
  Sebastián Collado Montañez committed Apr 20, 2017
  
  a3958968 Browse Files
19 Apr, 2017 9 commits
- PCB: prevent softkeyb when editing picto, working on sound upload service · 8892d4de
  Fernando Martínez Santiago committed Apr 19, 2017
  
  8892d4de
- Working - Duplicate scene · 8d0f2c3d
  Jose Antonio committed Apr 19, 2017
  
  8d0f2c3d
- Merged branch develop into develop · a763dfc5
  Jose Antonio committed Apr 19, 2017
  
  a763dfc5 Browse Files
- Working - Delete scene · 2a7a0ad9
  Jose Antonio committed Apr 19, 2017
  
  2a7a0ad9
- scenes interface structure · 8f3ae2c9
  Sebastián Collado Montañez committed Apr 19, 2017
  
  8f3ae2c9
- scenes policies hotfix · 52b0f66d
  Sebastián Collado Montañez committed Apr 19, 2017
  
  52b0f66d Browse Files
- ansible updated for scenes · 5841847c
  Sebastián Collado Montañez committed Apr 19, 2017
  
  5841847c Browse Files
- test-autismo-jaen, test-centro-destrezas fixed · 01d346b1
  Sebastián Collado Montañez committed Apr 19, 2017
  
  01d346b1
- scene_adapt fixed, test-caja fixed · a8866dfc
  Sebastián Collado Montañez committed Apr 19, 2017
  
  a8866dfc
18 Apr, 2017 5 commits
- Merged branch develop into develop · 7910eae4
  Jose Antonio committed Apr 18, 2017
  
  7910eae4 Browse Files
- Working on scenes - collections controller · 385ff3d0
  Jose Antonio committed Apr 18, 2017
  
  385ff3d0
- Working on scenes - collections controller · 7c9d9a5b
  Jose Antonio committed Apr 18, 2017
  
  7c9d9a5b
- Supervisor asociado a picto funcionando · 673d1552
  Germán Callejas Alcántara committed Apr 18, 2017
  
  673d1552
- Listar supervisores de alumno finalizado, añadida varias funciones de acceso a… · 9817cfab
```
Listar supervisores de alumno finalizado, añadida varias funciones de acceso a BBDD local del PCB, e iteración al presionar un supervisor de la lista no logueado previamente
```
  german committed Apr 18, 2017
  9817cfab
17 Apr, 2017 5 commits
- Merged branch develop into develop · 7e362156
  Jose Antonio committed Apr 17, 2017
  
  7e362156 Browse Files
- Working on scenes · 1849ee61
  Jose Antonio committed Apr 17, 2017
  
  1849ee61
- Scene SQL - not finished · 897c69d3
  Jose Antonio committed Apr 17, 2017
  
  897c69d3 Browse Directory
- listado de supervisores en pcb asociado a estudiante · ecbc021d
  Fernando Martínez Santiago committed Apr 17, 2017
  
  ecbc021d
- 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 12 commits
- Working on scene · 7c718270
  Jose Antonio committed Apr 11, 2017
  
  7c718270
- 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