Private
Public Access
1
0
Commit Graph

4293 Commits

Author SHA1 Message Date
Sander Roosendaal
110fdb2497 strava export 2019-03-10 16:37:05 +01:00
Sander Roosendaal
c073069832 Merge branch 'release/v9.44' 2019-03-09 07:42:39 +01:00
Sander Roosendaal
287b873f5a tested 2019-03-09 07:42:27 +01:00
Sander Roosendaal
f3c4d307e0 tested 2019-03-09 07:33:32 +01:00
Sander Roosendaal
a01e4bce3a Merge branch 'feature/windows' into develop 2019-03-08 17:50:24 +01:00
Sander Roosendaal
1b534fccad tested 2019-03-08 17:49:37 +01:00
Sander Roosendaal
2124933dec runkeeper stuff 2019-03-08 13:39:43 +01:00
Sander Roosendaal
5df5afc96c Merge branch 'release/v9.43' into develop 2019-03-07 19:35:43 +01:00
Sander Roosendaal
4a71f194dd Merge branch 'release/v9.43' 2019-03-07 19:35:30 +01:00
Sander Roosendaal
db34a03179 tested 2019-03-07 19:35:19 +01:00
Sander Roosendaal
0dd3e9542e fixed sporttracks and ua exports 2019-03-07 19:31:19 +01:00
Sander Roosendaal
e01c03d091 Merge branch 'feature/py3fixes' into develop 2019-03-07 14:29:14 +01:00
Sander Roosendaal
f53a2a22ee fixing #424 2019-03-07 14:27:40 +01:00
Sander Roosendaal
9f73e37297 adding tests for chart delete 2019-03-07 13:47:40 +01:00
Sander Roosendaal
721d3dc3a2 opaque id on graph delete 2019-03-07 13:16:27 +01:00
Sander Roosendaal
dee2ec8859 encoding`:wq 2019-03-07 12:36:45 +01:00
Sander Roosendaal
2311e22cd8 removed django debug toolbar
not compatible with django 1.9.5
2019-03-07 12:08:29 +01:00
Sander Roosendaal
16d2a3c118 removed html minify from settings.py 2019-03-07 10:51:43 +01:00
Sander Roosendaal
9f5b309821 Merge branch 'release/v9.42' 2019-03-03 21:21:16 +01:00
Sander Roosendaal
678b473c10 removing outliers 2019-03-03 21:20:41 +01:00
Sander Roosendaal
a4fdf00a45 scale_width on activity chart 2019-03-03 21:14:33 +01:00
Sander Roosendaal
712a085299 Merge branch 'release/v9.41' 2019-03-03 21:09:40 +01:00
Sander Roosendaal
517d7d8281 improved strava import mapping 2019-03-03 21:07:00 +01:00
Sander Roosendaal
4ac023acce Merge branch 'release/v9.40' 2019-03-03 16:58:13 +01:00
Sander Roosendaal
38676a9d2c tested 2019-03-03 16:57:53 +01:00
Sander Roosendaal
b47e0def0b Merge branch 'release/v9.39' 2019-03-03 15:36:25 +01:00
Sander Roosendaal
4c68583a8d tested 2019-03-03 15:36:04 +01:00
Sander Roosendaal
cd39a25e4c bug fixes 2019-03-03 15:16:37 +01:00
Sander Roosendaal
a6e7827b75 Merge branch 'release/v9.38' 2019-03-02 17:05:42 +01:00
Sander Roosendaal
2d9c04159e font changes for caret 2019-03-02 17:05:22 +01:00
Sander Roosendaal
f0cd67afed Merge branch 'release/v9.37' into develop 2019-03-02 16:55:45 +01:00
Sander Roosendaal
5a7955ddb7 Merge branch 'release/v9.37' 2019-03-02 16:55:33 +01:00
Sander Roosendaal
835aa17dd7 tested 2019-03-02 16:55:18 +01:00
Sander Roosendaal
38bb113e8d bokeh over https 2019-03-02 16:51:43 +01:00
Sander Roosendaal
11e5b57a57 Merge branch 'release/v9.36' into develop 2019-03-02 16:04:06 +01:00
Sander Roosendaal
a19b73f36e Merge branch 'release/v9.36' 2019-03-02 16:03:34 +01:00
Sander Roosendaal
8e3bdf9e97 tested 2019-03-02 16:03:21 +01:00
Sander Roosendaal
823ab48a8a freeze requirements.txt 2019-03-02 15:55:26 +01:00
Sander Roosendaal
9d1528b1ee Merge branch 'feature/hostingfonts' into develop 2019-03-02 15:50:54 +01:00
Sander Roosendaal
5c90ecde5f fonts local 2019-03-02 15:50:40 +01:00
Sander Roosendaal
3247fe9387 locally hosting fontawesome fonts 2019-03-02 15:43:21 +01:00
Sander Roosendaal
6502b59db1 tested 2019-03-02 15:40:41 +01:00
Sander Roosendaal
e624e1b909 tested 2019-03-02 15:35:16 +01:00
Sander Roosendaal
8c10686bbd Merge branch 'hotfix/v9.35' into develop 2019-03-02 15:23:41 +01:00
Sander Roosendaal
bb5e7af000 Merge branch 'hotfix/v9.35' 2019-03-02 15:23:35 +01:00
Sander Roosendaal
0a333d5253 bug fix 2019-03-02 15:23:16 +01:00
Sander Roosendaal
7cf38e4c59 color palette interactive activity chart 2019-03-02 15:20:36 +01:00
Sander Roosendaal
6fca69c3be box chart and activity chart improvements (holoview) 2019-03-02 15:10:25 +01:00
Sander Roosendaal
5e236ed138 Merge branch 'develop' of bitbucket.org:sanderroosendaal/rowsandall into develop 2019-02-28 22:54:22 +01:00
Sander Roosendaal
54bca0cfd3 Merge branch 'feature/python3' into develop 2019-02-28 22:53:16 +01:00