Jesús Vélez Palacios
|
4efed80eee
|
CRAPLOAD OF CHANGES :D
|
2016-05-25 19:06:52 +02:00 |
|
Jesús Vélez Palacios
|
54b861ab87
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/es/kauron/estraba/controller/DashboardController.java
# src/main/resources/es/kauron/estraba/fxml/Dashboard.fxml
|
2016-05-25 18:00:49 +02:00 |
|
Jesús Vélez Palacios
|
10c8a30ce3
|
Super commit
|
2016-05-25 17:59:00 +02:00 |
|
Carlos Galindo
|
c3c48afcdc
|
Toggle is now toggleButton for time/distance
|
2016-05-25 17:08:11 +02:00 |
|
Jesús Vélez Palacios
|
4fa0db3c21
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/es/kauron/estraba/controller/DashboardController.java
|
2016-05-25 11:46:51 +02:00 |
|
Jesús Vélez Palacios
|
08b919f131
|
multiple series on mapchart
|
2016-05-25 11:46:14 +02:00 |
|
Carlos Galindo
|
5c6f8db4da
|
Added toggle for time/distance
|
2016-05-25 11:44:14 +02:00 |
|
Jesús Vélez Palacios
|
5c09e8b074
|
Merge remote-tracking branch 'origin/master'
|
2016-05-25 11:20:55 +02:00 |
|
Jesús Vélez Palacios
|
47030ad497
|
initial Dashboard distance -> time commit
|
2016-05-25 11:20:25 +02:00 |
|
Carlos Galindo
|
435c695ab7
|
Moved Splash HR dialog to Splash
|
2016-05-25 11:02:05 +02:00 |
|
Carlos Galindo
|
cd465af904
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/es/kauron/estraba/controller/DashboardController.java
# src/main/java/es/kauron/estraba/controller/SplashController.java
# src/main/java/es/kauron/estraba/model/DataBundle.java
|
2016-05-24 14:40:47 +02:00 |
|
Carlos Galindo
|
414c3c3ee9
|
Added load button and max HR dialog
|
2016-05-24 14:37:47 +02:00 |
|
Jesús Vélez Palacios
|
b0433a32df
|
initial Dashboard distance -> time commit
|
2016-05-24 13:47:49 +02:00 |
|
Carlos Galindo
|
05d052fb00
|
Added markers on map for beginning and end
|
2016-05-22 10:39:09 +02:00 |
|
Carlos Galindo
|
1b76ef109c
|
Now the app runs correctly
|
2016-05-22 10:37:20 +02:00 |
|
Jesús Vélez Palacios
|
1b832e2851
|
drag and drop, main argument autoload, autofixes
|
2016-05-21 21:56:20 +02:00 |
|
Jesús Vélez Palacios
|
74bb277cf2
|
cleanliness + minor fixes + copyright
|
2016-05-21 20:59:11 +02:00 |
|
Jesús Vélez Palacios
|
99b7743934
|
small bugfix + elegant thing
|
2016-05-21 19:59:41 +02:00 |
|
Jesús Vélez Palacios
|
a92c429a95
|
fixed task initialization, and some minor fixed, started with CSS stuff
|
2016-05-21 19:55:45 +02:00 |
|
Carlos Galindo
|
94f4a8ebee
|
Strava-logo-transparent
|
2016-05-21 18:38:01 +02:00 |
|
Carlos Galindo
|
7414b3caa5
|
Better code for loading file (still broken)
|
2016-05-21 18:28:20 +02:00 |
|
Carlos Galindo
|
2715b66d5b
|
Moved loading code to Task (not working)
|
2016-05-20 13:52:10 +02:00 |
|
Carlos Galindo
|
74cc5a6579
|
PieChart starts at 90º
|
2016-05-20 11:59:39 +02:00 |
|
Carlos Galindo
|
6b06414368
|
Strings to resources
|
2016-05-20 11:58:57 +02:00 |
|
Carlos Galindo
|
307c78deac
|
Moved PieChart property to fxml
|
2016-05-19 23:40:29 +02:00 |
|
Jesús Vélez Palacios
|
389499230d
|
m/s to km/h and other fixes
|
2016-05-19 23:26:33 +02:00 |
|
Carlos Galindo
|
a8c6e79e2e
|
Comments on map process and better zoom, centering and display
|
2016-05-19 23:25:40 +02:00 |
|
Carlos Galindo
|
3c3c1fca33
|
Added functioning map
* adding all the points
* centering on the correct location
|
2016-05-19 22:49:08 +02:00 |
|
Jesús Vélez Palacios
|
bb0b5086d0
|
dashboard redesign
|
2016-05-19 14:06:45 +02:00 |
|
Jesús Vélez Palacios
|
bb377effea
|
dashboard redesign
|
2016-05-19 11:22:11 +02:00 |
|
Carlos Galindo
|
cf481771b7
|
Translations CA and ES updated
|
2016-05-19 11:13:42 +02:00 |
|
Jesús Vélez Palacios
|
678b8a9bbd
|
dashboard redesign
|
2016-05-19 10:42:15 +02:00 |
|
Jesús Vélez Palacios
|
3c6b212101
|
dashboard redesign
|
2016-05-18 21:45:29 +02:00 |
|
Jesús Vélez Palacios
|
5de13b6c5b
|
dashboard redesign
|
2016-05-18 20:22:43 +02:00 |
|
Jesús Vélez Palacios
|
2db6dafa0b
|
new dashboard progress
|
2016-05-18 13:15:07 +02:00 |
|
Jesús Vélez Palacios
|
b6e567dc1f
|
cleanup properly now
|
2016-05-18 13:02:31 +02:00 |
|
Jesús Vélez Palacios
|
f91262856a
|
Merge remote-tracking branch 'origin/master'
|
2016-05-18 13:01:57 +02:00 |
|
Jesús Vélez Palacios
|
169b8a8396
|
cleanup
|
2016-05-18 13:01:11 +02:00 |
|
Carlos Galindo
|
8f2a1bafe5
|
Added libs to README
|
2016-05-18 12:52:27 +02:00 |
|
Jesús Vélez Palacios
|
dbbe15ec9e
|
fixed controller name
|
2016-05-17 20:33:48 +02:00 |
|
Jesús Vélez Palacios
|
6f79ff9e3b
|
fixed paths, fixed some FXML mistakes, added icons to Initialize (not yet working)
|
2016-05-17 20:08:07 +02:00 |
|
Jesús Vélez Palacios
|
16d2602efe
|
Merge remote-tracking branch 'origin/master'
|
2016-05-17 19:33:43 +02:00 |
|
Jesús Vélez Palacios
|
f48361bac7
|
Dashboard fxml, fixed some Maven, added icons and built main bundle
|
2016-05-17 19:33:34 +02:00 |
|
Jesús Vélez Palacios
|
59e6f9bf97
|
Update LICENSE.md
|
2016-05-17 17:15:30 +02:00 |
|
Jesús Vélez Palacios
|
dc566684c4
|
Update README.md
|
2016-05-17 17:15:03 +02:00 |
|
Jesús Vélez Palacios
|
118be04314
|
initial commit
deadline 1 week lol
|
2016-05-17 17:09:46 +02:00 |
|
