- 13 Mar, 2017 6 commits
-
-
Jose Antonio committed
-
finished
Jose Antonio committed -
Fernando Martínez Santiago committed
-
Germán Callejas Alcántara committed
-
Fernando Martínez Santiago committed
-
- 11 Mar, 2017 1 commit
-
-
Fernando Martínez Santiago committed
-
- 10 Mar, 2017 8 commits
-
-
Fernando Martínez Santiago committed
-
http://gitlab.ujaen.es/yotta/pictogram
# 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 -
Fernando Martínez Santiago committed
-
Jose Antonio committed
-
- quicksort dates - vocabulary charts
Jose Antonio committed -
Germán Callejas Alcántara committed
-
Sebastián Collado Montañez committed
-
Arturo Montejo Ráez committed
-
- 09 Mar, 2017 5 commits
-
-
Jose Antonio committed
-
Jose Antonio committed
-
Fernando Martínez Santiago committed
-
Sebastián Collado Montañez committed
-
Fernando Martínez Santiago committed
-
- 08 Mar, 2017 6 commits
-
-
Conflicts: sails/src/assets/styles/main.css
Jose Antonio committed -
dates are disordered
Jose Antonio committed -
Sebastián Collado Montañez committed
-
Sebastián Collado Montañez committed
-
Fernando Martínez Santiago committed
-
Sebastián Collado Montañez committed
-
- 07 Mar, 2017 3 commits
-
-
dates from JSON are disordered
Jose Antonio committed -
Sebastián Collado Montañez committed
-
Sebastián Collado Montañez committed
-
- 06 Mar, 2017 5 commits
-
-
Sebastián Collado Montañez committed
-
Sebastián Collado Montañez committed
-
Sebastián Collado Montañez committed
-
Sebastián Collado Montañez committed
-
not finished
Jose Antonio committed
-
- 03 Mar, 2017 1 commit
-
-
not finished
Jose Antonio committed
-
- 02 Mar, 2017 3 commits
-
-
Arturo Montejo Ráez committed
-
Arturo Montejo Ráez committed
-
Arturo Montejo Ráez committed
-
- 01 Mar, 2017 1 commit
-
-
Arturo Montejo Ráez committed
-
- 28 Feb, 2017 1 commit
-
-
Arturo Montejo Ráez committed
-
