Sander Roosendaal
|
583784a90c
|
add zipfile import to mailprocessing
|
2016-12-19 18:09:33 +01:00 |
|
Sander Roosendaal
|
9b876385f2
|
Merge branch 'release/zips'
|
2016-12-19 17:58:21 +01:00 |
|
Sander Roosendaal
|
485edb67ef
|
Some error catching
|
2016-12-19 16:46:29 +01:00 |
|
Sander Roosendaal
|
4bda2f3539
|
Processing of zipped files
|
2016-12-18 16:57:42 +01:00 |
|
Sander Roosendaal
|
f5236d429e
|
Merge tag 'c2sync' into develop
c2sync error tracing (prepare for bugfix)
|
2016-12-18 15:06:24 +01:00 |
|
Sander Roosendaal
|
fe9efff99e
|
Merge branch 'hotfix/c2sync'
|
2016-12-18 15:05:40 +01:00 |
|
Sander Roosendaal
|
2ffd31f8a6
|
some more
|
2016-12-18 15:05:02 +01:00 |
|
Sander Roosendaal
|
a0a6d205cb
|
Some error tracking with C2 log
|
2016-12-18 15:03:48 +01:00 |
|
Sander Roosendaal
|
1b37af4306
|
Merge tag 'favoriteadmin' into develop
Favorite Admin
|
2016-12-16 14:27:44 +01:00 |
|
Sander Roosendaal
|
f4fc9b67be
|
Merge branch 'release/favoriteadmin'
|
2016-12-16 14:27:32 +01:00 |
|
Sander Roosendaal
|
6f2ca05db4
|
add favorites to admin
|
2016-12-16 14:20:58 +01:00 |
|
Sander Roosendaal
|
c15ece930a
|
Merge tag 'newusers' into develop
New users get new workout
|
2016-12-16 13:28:24 +01:00 |
|
Sander Roosendaal
|
d711aa76ae
|
Merge branch 'release/newusers'
|
2016-12-16 13:28:07 +01:00 |
|
Sander Roosendaal
|
15c8954b18
|
Merge branch 'feature/videoredirect' into develop
|
2016-12-16 13:23:47 +01:00 |
|
Sander Roosendaal
|
cdb843a7b9
|
settings
|
2016-12-16 13:23:10 +01:00 |
|
Sander Roosendaal
|
1938506735
|
added notes to example workout
|
2016-12-16 13:21:16 +01:00 |
|
Sander Roosendaal
|
125e0a72b9
|
Thank you page + example workout
|
2016-12-16 13:13:59 +01:00 |
|
Sander Roosendaal
|
a182988702
|
data cleaning improvement
|
2016-12-13 23:07:30 +01:00 |
|
Sander Roosendaal
|
7e1cb2ed63
|
Merge tag 'removefit' into develop
remove old fit files
|
2016-12-13 22:45:13 +01:00 |
|
Sander Roosendaal
|
70ea8cd0d1
|
Merge branch 'release/removefit'
|
2016-12-13 22:44:49 +01:00 |
|
Sander Roosendaal
|
eeddccee48
|
Removed old CSV and fit files
|
2016-12-13 22:41:12 +01:00 |
|
Sander Roosendaal
|
7ea0adf7d1
|
Merge tag 'footer' into develop
repairdata fix
|
2016-12-13 22:35:36 +01:00 |
|
Sander Roosendaal
|
0239b7baab
|
Merge branch 'hotfix/footer'
|
2016-12-13 22:35:22 +01:00 |
|
Sander Roosendaal
|
972f7a2062
|
Added attributeerror to repairdata
|
2016-12-13 22:34:48 +01:00 |
|
Sander Roosendaal
|
9ea371f4e7
|
footer
|
2016-12-13 22:33:01 +01:00 |
|
Sander Roosendaal
|
d7096bb5fe
|
Merge tag 'repairdatafix' into develop
Repairdatafix
|
2016-12-13 22:23:36 +01:00 |
|
Sander Roosendaal
|
a120e1df43
|
Merge branch 'release/repairdatafix'
|
2016-12-13 22:23:21 +01:00 |
|
Sander Roosendaal
|
52fec14a32
|
bug fix repair data
|
2016-12-13 22:20:29 +01:00 |
|
Sander Roosendaal
|
b9db637d19
|
Merge tag 'editmenus' into develop
Hotfix edit menus
|
2016-12-13 15:53:24 +01:00 |
|
Sander Roosendaal
|
8db2a2e47a
|
Merge branch 'hotfix/editmenus'
|
2016-12-13 15:53:12 +01:00 |
|
Sander Roosendaal
|
b59aeeee14
|
bug fix edit and adv edit menus
|
2016-12-13 15:52:21 +01:00 |
|
Sander Roosendaal
|
83ee3a0bce
|
Merge branch 'feature/nk-tools' into develop
|
2016-12-13 11:06:59 +01:00 |
|
Sander Roosendaal
|
0e6fac88b5
|
NK Tools Force Curve
|
2016-12-13 10:44:02 +01:00 |
|
Sander Roosendaal
|
7d0d7a0fd5
|
added stats for SpeedCoach 2 GPS
|
2016-12-11 20:33:41 +01:00 |
|
Sander Roosendaal
|
62718ea07a
|
Merge tag 'flexbuttons' into develop
Flex buttons on workouts-list
|
2016-12-09 19:54:31 +01:00 |
|
Sander Roosendaal
|
a1cfcede0f
|
Merge branch 'release/flexbuttons'
|
2016-12-09 19:54:17 +01:00 |
|
Sander Roosendaal
|
e5cb8b856d
|
Flex buttons on workouts list
|
2016-12-09 19:49:18 +01:00 |
|
Sander Roosendaal
|
14e67a07eb
|
Merge tag 'gzip-csvmail' into develop
hotfix csv file decompression
|
2016-12-09 08:11:04 +01:00 |
|
Sander Roosendaal
|
73a362f067
|
Merge branch 'hotfix/gzip-csvmail'
|
2016-12-09 08:10:49 +01:00 |
|
Sander Roosendaal
|
2e21979e73
|
Bug fix
|
2016-12-09 08:10:20 +01:00 |
|
Sander Roosendaal
|
1efeeee6fe
|
Merge tag 'gzip-orphans' into develop
Gzip-orphans + csv email with gzip
|
2016-12-09 08:05:40 +01:00 |
|
Sander Roosendaal
|
19ed5021b5
|
Merge branch 'release/gzip-orphans'
|
2016-12-09 08:05:11 +01:00 |
|
Sander Roosendaal
|
2b4b2f8f93
|
CSV file emailing for gzipped
|
2016-12-09 07:59:10 +01:00 |
|
Sander Roosendaal
|
8efd276bb9
|
Merge tag 'gzipped2' into develop
gzipped rowingdata>=0.93.6
|
2016-12-08 23:34:04 +01:00 |
|
Sander Roosendaal
|
79004c5fd9
|
Merge branch 'release/gzipped2'
|
2016-12-08 23:33:35 +01:00 |
|
Sander Roosendaal
|
20c72c651b
|
Merge branch 'feature/gzipped' into develop
|
2016-12-08 23:28:08 +01:00 |
|
Sander Roosendaal
|
0034c1bc88
|
gzipped
|
2016-12-08 23:27:19 +01:00 |
|
Sander Roosendaal
|
8895f61e73
|
gzip
|
2016-12-08 23:07:57 +01:00 |
|
Sander Roosendaal
|
a37bb03fd8
|
Merge tag 'gzipped' into develop
gzipped
|
2016-12-08 21:55:43 +01:00 |
|
Sander Roosendaal
|
00850cd90a
|
Merge branch 'hotfix/gzipped'
|
2016-12-08 21:55:19 +01:00 |
|