Commits · 7c78dce0965d6c7cfea95ba2b9e94a69e5afaeb8 · yotta / pictogram · GitLab

22 Dec, 2016 1 commit
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 7c78dce0
```
# Conflicts:
#	android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/SerialActivity.java
```
  Fernando Martínez Santiago committed Dec 22, 2016
  7c78dce0
20 Dec, 2016 1 commit
- Añadida nueva clase como adapter para las listas de alumnos y supervisores del login. · b7139260
```
Añadido layout para los items de esas listas.
Funciones para crear las listas. (No funciona del todo bien)
```
  german committed Dec 20, 2016
  b7139260
19 Dec, 2016 2 commits
- Design Repaired (Appear list when keyboard is hide faults) · e9fb5c5e
  german committed Dec 19, 2016
  
  e9fb5c5e
- working on PCB sessions 2 · bf9a9ff0
  Fernando Martínez Santiago committed Dec 19, 2016
  
  bf9a9ff0 Browse Files
18 Dec, 2016 3 commits
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 5413736a
  Fernando Martínez Santiago committed Dec 18, 2016
  
  5413736a
- working on PCB sessions (butttons) · 6b6c2ff8
  Fernando Martínez Santiago committed Dec 18, 2016
  
  6b6c2ff8 Browse Files
- working on PCB sessions · 1e0bf9e3
  Fernando Martínez Santiago committed Dec 18, 2016
  
  1e0bf9e3 Browse Directory
16 Dec, 2016 8 commits
- Merge branch 'fernando_branch' of http://scm.ujaen.es/softuno/pictogram into develop · da6bcac0
  Fernando Martínez Santiago committed Dec 16, 2016
  
  da6bcac0
- working on PCB session · a007406e
  Fernando Martínez Santiago committed Dec 16, 2016
  
  a007406e
- Invisible lists if keyboard appear. Show again the list if keyboard dissapear fault · 51c69a8d
  german committed Dec 16, 2016
  
  51c69a8d
- Added list of legal users (stu & sup) only on the view. · 7f3dbfae
  german committed Dec 16, 2016
  
  7f3dbfae
- Added list of legal users (stu & sup) only on the view. (reverted from commit… · 05515591
```
Added list of legal users (stu & sup) only on the view. (reverted from commit 86cbcefb270cedcec610bba18e7ac01b2eea1f6f)
```
  german committed Dec 16, 2016
  05515591
- Added list of legal users (stu & sup) only on the view. · ce5ba35f
  german committed Dec 16, 2016
  
  ce5ba35f
- issue #666 closed (lectoescritura) · 6bab22da
  root committed Dec 16, 2016
  
  6bab22da
- Added list of legal users (stu & sup) only on the view. · c516233a
  german committed Dec 16, 2016
  
  c516233a Browse Files
15 Dec, 2016 5 commits
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 13739838
  Fernando Martínez Santiago committed Dec 15, 2016
  
  13739838
- working on instructions by using PCB · ebfd293d
  Fernando Martínez Santiago committed Dec 15, 2016
  
  ebfd293d
- Traducciones para opciones de leyenda en pictoconfig · 743c7416
  Sebastián Collado committed Dec 15, 2016
  
  743c7416
- working on issue #692 · a18377fb
  Fernando Martínez Santiago committed Dec 15, 2016
  
  a18377fb
- issue #679 solved · 3d67429d
  Arturo Montejo Ráez committed Dec 15, 2016
  
  3d67429d Browse Files
14 Dec, 2016 6 commits
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 5d1d33f3
  Sebastián Collado committed Dec 14, 2016
  
  5d1d33f3 Browse Files
- Legend change with radiobutton · 0f096bb6
  Sebastián Collado committed Dec 14, 2016
  
  0f096bb6
- Applied changes to repair the legend code and the results on the view of the tablet. · eeedc14a
  german committed Dec 14, 2016
  
  eeedc14a
- issue #686 y #684 closed · 7d70e7db
  Fernando Martínez Santiago committed Dec 14, 2016
  
  7d70e7db Browse Directory
- licence creation date added · 0816363f
  Arturo Montejo Ráez committed Dec 14, 2016
  
  0816363f Browse Directory
- license controller ready · 96f2461f
  Arturo Montejo Ráez committed Dec 14, 2016
  
  96f2461f Browse Directory
13 Dec, 2016 5 commits
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · e1cadbc7
  Sebastián Collado committed Dec 13, 2016
  
  e1cadbc7 Browse Files
- Lecto-escritura en dashboard · dcdba958
  Sebastián Collado committed Dec 13, 2016
  
  dcdba958
- Merge branch 'master' into develop · cda393ef
  Arturo Montejo Ráez committed Dec 13, 2016
  
  cda393ef Browse Files
- fixed problem with empty student list for therapists · 2c172b8c
  Arturo Montejo Ráez committed Dec 13, 2016
  
  2c172b8c Browse Files
- issue #630 solved · 74042fef
  Fernando Martínez Santiago committed Dec 13, 2016
  
  74042fef
12 Dec, 2016 9 commits
- Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram into develop · 59a02fe5
  Arturo Montejo Ráez committed Dec 12, 2016
  
  59a02fe5 Browse Files
- Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · f942adcb
  Arturo Montejo Ráez committed Dec 12, 2016
  
  f942adcb Browse Files
- fixed problem with missing students in office admin list · e78e0533
  Arturo Montejo Ráez committed Dec 12, 2016
  
  e78e0533 Browse Files
- Legend text size changed · 2907f452
  german committed Dec 12, 2016
  
  2907f452 Browse Directory
- Picto updated · 23e527f1
  german committed Dec 12, 2016
  
  23e527f1 Browse Directory
- Picto updated · a603373e
  german committed Dec 12, 2016
  
  a603373e Browse Files
- gitignore updated · 0d8ed678
  Arturo Montejo Ráez committed Dec 12, 2016
  
  0d8ed678
- gitignore updated · 2e308327
  Arturo Montejo Ráez committed Dec 12, 2016
  
  2e308327 Browse Files
- conflict resolved · 706c14d6
  Arturo Montejo Ráez committed Dec 12, 2016
  
  706c14d6