Commits · c6966bb5f4b3bc9e7c4bfdc0fa26661470e5dfa2 · yotta / pictogram · GitLab

15 Mar, 2017 8 commits
- minor errors fixed · c6966bb5
  Sebastián Collado Montañez committed Mar 15, 2017
  
  c6966bb5 Browse Directory
- 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 Browse Files
- 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 Browse Files
- Translation fix · 3485f6d4
  Jose Antonio committed Mar 15, 2017
  
  3485f6d4 Browse Directory
14 Mar, 2017 1 commit
- Translate strings fix - load charts without select method · d3b355eb
  Jose Antonio committed Mar 14, 2017
  
  d3b355eb Browse Directory
13 Mar, 2017 7 commits
- Issue #74 - bug fixed · e07b3fdb
  Jose Antonio committed Mar 13, 2017
  
  e07b3fdb Browse Files
- 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 Files
- 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 Browse Files
- Icono aplicación cambiado (Sin esquinas blancas) · 4685fb76
  Germán Callejas Alcántara committed Mar 13, 2017
  
  4685fb76 Browse Directory
- PCB v1.1 beta · a5bd2958
  Fernando Martínez Santiago committed Mar 13, 2017
  
  a5bd2958 Browse File
11 Mar, 2017 1 commit
- trabajando en v1.1 · f847ea63
  Fernando Martínez Santiago committed Mar 11, 2017
  
  f847ea63 Browse Directory
10 Mar, 2017 8 commits
- trabajando en v1.1 · 48e86a5e
  Fernando Martínez Santiago committed Mar 11, 2017
  
  48e86a5e Browse Files
- 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 Browse Files
- reports almost done - dummy data · 770d3189
```
- quicksort dates
- vocabulary charts
```
  Jose Antonio committed Mar 10, 2017
  770d3189 Browse Directory
- Estilos nuevos de login y lista de alumnos · 66419d00
  Germán Callejas Alcántara committed Mar 10, 2017
  
  66419d00 Browse Files
- #37 browser not compatible translation · ce7796aa
  Sebastián Collado Montañez committed Mar 10, 2017
  
  ce7796aa Browse Files
- restored milliseconds support in sails-mysql · 02145ed4
  Arturo Montejo Ráez committed Mar 10, 2017
  
  02145ed4 Browse Directory
09 Mar, 2017 5 commits
- Merged branch develop into develop · 1d4910a9
  Jose Antonio committed Mar 09, 2017
  
  1d4910a9 Browse Files
- working on reports · cd84372a
  Jose Antonio committed Mar 09, 2017
  
  cd84372a Browse Files
- issues #54 , #54 solved · 46ef4204
  Fernando Martínez Santiago committed Mar 09, 2017
  
  46ef4204 Browse Files
- #37 browser version tested · a287cfd3
  Sebastián Collado Montañez committed Mar 09, 2017
  
  a287cfd3 Browse File
- working on #63 , #64 · 69905aa1
  Fernando Martínez Santiago committed Mar 09, 2017
  
  69905aa1 Browse Files
08 Mar, 2017 6 commits
- Merge remote-tracking branch 'refs/remotes/origin/develop' · 34c610d3
```
Conflicts:
	sails/src/assets/styles/main.css
```
  Jose Antonio committed Mar 08, 2017
  34c610d3 Browse Files
- working on reports - filter by instruction or method · 5d10a0d9
```
dates are disordered
```
  Jose Antonio committed Mar 08, 2017
  5d10a0d9 Browse File
- firefox version checked · c65df187
  Sebastián Collado Montañez committed Mar 08, 2017
  
  c65df187 Browse Directory
- minor changes on browser compatibility · 353a575f
  Sebastián Collado Montañez committed Mar 08, 2017
  
  353a575f Browse Directory
- issues #54 , #54 solved · 74ae02fe
  Fernando Martínez Santiago committed Mar 08, 2017
  
  74ae02fe
- #37 new file for browse incompatibility redirect · edb19a11
  Sebastián Collado Montañez committed Mar 08, 2017
  
  edb19a11
07 Mar, 2017 3 commits
- working on reports - dates disordered · a6439228
```
dates from JSON are disordered
```
  Jose Antonio committed Mar 07, 2017
  a6439228 Browse Files
- #37 alert for browser incompatibility · dec4fbee
  Sebastián Collado Montañez committed Mar 07, 2017
  
  dec4fbee Browse File
- #37 valid browser before angular · d711097c
  Sebastián Collado Montañez committed Mar 07, 2017
  
  d711097c Browse Files
06 Mar, 2017 1 commit
- error in commit 6ad319 fixed · f774c2da
  Sebastián Collado Montañez committed Mar 06, 2017
  
  f774c2da