Commits · 7dbdb95ded74b788e1db9ee3519f10f7aa9fa273 · yotta / pictogram · GitLab

17 Mar, 2017 3 commits
- Vista para editar picto arreglada(Ya funciona bien para editar la imagen o subir una nueva) · 7dbdb95d
  Germán Callejas Alcántara committed Mar 17, 2017
  
  7dbdb95d Browse Files
- Añadida a la vista de editar picto el layout para realizar grabaciones (Falta pulir) · a3d95466
  Germán Callejas Alcántara committed Mar 17, 2017
  
  a3d95466 Browse Files
- node_modules_overwrite minor fix · 29a221a0
  Sebastián Collado Montañez committed Mar 17, 2017
  
  29a221a0 Browse Files
16 Mar, 2017 11 commits
- login view hotfix · fc4e3268
  Sebastián Collado Montañez committed Mar 16, 2017
  
  fc4e3268
- login view update · db28831b
  Sebastián Collado Montañez committed Mar 16, 2017
  
  db28831b Browse Files
- node_modules_override after ansible install · 77ef0000
  Sebastián Collado Montañez committed Mar 16, 2017
  
  77ef0000
- hotfixç · 2b97af66
  Sebastián Collado Montañez committed Mar 16, 2017
  
  2b97af66 Browse Files
- install.sh encoding review · 5f425c4b
  Sebastián Collado Montañez committed Mar 16, 2017
  
  5f425c4b Browse Files
- scripts comments · 08ae006a
  Sebastián Collado Montañez committed Mar 16, 2017
  
  08ae006a Browse Files
- git repo references fixed · e003ac6d
  Sebastián Collado Montañez committed Mar 16, 2017
  
  e003ac6d
- conflicts fixed · af34fcb3
  Arturo Montejo Ráez committed Mar 16, 2017
  
  af34fcb3 Browse Files
- right hacked sails-mysql files · 01f95917
  Arturo Montejo Ráez committed Mar 16, 2017
  
  01f95917 Browse Files
- Merge branch 'master' into develop · d07c5c7e
  Arturo Montejo Ráez committed Mar 16, 2017
  
  d07c5c7e
- node_modules_overwrite added · bae67b3b
  Arturo Montejo Ráez committed Mar 16, 2017
  
  bae67b3b
15 Mar, 2017 9 commits
- minor error in last commit · daa52080
  Sebastián Collado Montañez committed Mar 15, 2017
  
  daa52080
- minor errors fixed · c6966bb5
  Sebastián Collado Montañez committed Mar 15, 2017
  
  c6966bb5
- Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · c1ed8c7e
  Fernando Martínez Santiago committed Mar 15, 2017
  
  c1ed8c7e Browse Files
- PCB v1.1 beta3 · cd1f26ba
  Fernando Martínez Santiago committed Mar 15, 2017
  
  cd1f26ba
- Merged branch develop into develop · 3f57f07f
  Jose Antonio committed Mar 15, 2017
  
  3f57f07f Browse Files
- symbolstix sql unified · f40ce762
  Jose Antonio committed Mar 15, 2017
  
  f40ce762
- Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · cfb1a18a
  Sebastián Collado Montañez committed Mar 15, 2017
  
  cfb1a18a Browse Files
- inform style · 6daf7fad
  Sebastián Collado Montañez committed Mar 15, 2017
  
  6daf7fad
- Translation fix · 3485f6d4
  Jose Antonio committed Mar 15, 2017
  
  3485f6d4 Browse Files
14 Mar, 2017 1 commit
- Translate strings fix - load charts without select method · d3b355eb
  Jose Antonio committed Mar 14, 2017
  
  d3b355eb Browse Files
13 Mar, 2017 8 commits
- fixed #74 and a problem with lost rooms · efad6d91
  Arturo Montejo Ráez committed Mar 13, 2017
  
  efad6d91 Browse Files
- Issue #74 - bug fixed · e07b3fdb
  Jose Antonio committed Mar 13, 2017
  
  e07b3fdb Browse File
- Merged branch develop into develop · c5a164ec
  Jose Antonio committed Mar 13, 2017
  
  c5a164ec Browse Files
- Issue #38 - reports · 6773b6b1
```
finished
```
  Jose Antonio committed Mar 13, 2017
  6773b6b1 Browse Directory
- Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · 34075327
  Fernando Martínez Santiago committed Mar 13, 2017
  
  34075327 Browse Files
- PCB v1.1 beta2 · 7f43ca45
  Fernando Martínez Santiago committed Mar 13, 2017
  
  7f43ca45
- Icono aplicación cambiado (Sin esquinas blancas) · 4685fb76
  Germán Callejas Alcántara committed Mar 13, 2017
  
  4685fb76 Browse Files
- PCB v1.1 beta · a5bd2958
  Fernando Martínez Santiago committed Mar 13, 2017
  
  a5bd2958 Browse Files
11 Mar, 2017 1 commit
- trabajando en v1.1 · f847ea63
  Fernando Martínez Santiago committed Mar 11, 2017
  
  f847ea63 Browse Directory
10 Mar, 2017 7 commits
- trabajando en v1.1 · 48e86a5e
  Fernando Martínez Santiago committed Mar 11, 2017
  
  48e86a5e
- Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · 57b7f0d8
```
# Conflicts:
#	android/Pictogram/tabletlibrary/build.gradle
#	android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictogramActivity.java
#	android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/login/MainActivity.java
#	android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/net/NetServiceTablet.java
```
  Fernando Martínez Santiago committed Mar 10, 2017
  57b7f0d8 Browse Files
- working no duplicate picto and friendly update · 4eca7813
  Fernando Martínez Santiago committed Mar 10, 2017
  
  4eca7813
- Merged branch develop into develop · 27798f66
  Jose Antonio committed Mar 10, 2017
  
  27798f66
- reports almost done - dummy data · 770d3189
```
- quicksort dates
- vocabulary charts
```
  Jose Antonio committed Mar 10, 2017
  770d3189 Browse Files
- Estilos nuevos de login y lista de alumnos · 66419d00
  Germán Callejas Alcántara committed Mar 10, 2017
  
  66419d00
- #37 browser not compatible translation · ce7796aa
  Sebastián Collado Montañez committed Mar 10, 2017
  
  ce7796aa