Sander Roosendaal
|
6c7180dd02
|
bug fix power plot (expecting serialized value)
|
2017-02-07 13:15:32 +01:00 |
|
Sander Roosendaal
|
0d0d70a49c
|
Merge tag 'rq-dashboard' into develop
added rq-dashboard
|
2017-02-07 12:58:28 +01:00 |
|
Sander Roosendaal
|
30f792178f
|
Merge branch 'release/rq-dashboard'
|
2017-02-07 12:58:09 +01:00 |
|
Sander Roosendaal
|
5738de3f99
|
added RQ dashboard to admin
|
2017-02-07 12:48:47 +01:00 |
|
Sander Roosendaal
|
5e4f22be9d
|
changed correlation to Spearman
|
2017-02-07 11:53:52 +01:00 |
|
Sander Roosendaal
|
f1967a9d5f
|
Merge tag 'stats_v4' into develop
improved stats page
|
2017-02-07 11:27:03 +01:00 |
|
Sander Roosendaal
|
05a5d693ce
|
Merge branch 'release/stats_v4'
|
2017-02-07 11:26:45 +01:00 |
|
Sander Roosendaal
|
24565e2ef2
|
filtered out non meaningul values
|
2017-02-07 10:49:42 +01:00 |
|
Sander Roosendaal
|
955d5aa070
|
typo
|
2017-02-07 07:23:13 +01:00 |
|
Sander Roosendaal
|
f9142a5f6a
|
changed default value for expires
|
2017-02-06 22:19:41 +01:00 |
|
Sander Roosendaal
|
510af9c5bc
|
Merge tag 'deltazero' into develop
bug fix (int workout id)
|
2017-02-06 22:07:05 +01:00 |
|
Sander Roosendaal
|
74c579cfa0
|
Merge branch 'hotfix/deltazero'
|
2017-02-06 22:06:49 +01:00 |
|
Sander Roosendaal
|
80008f79c7
|
bug fix
|
2017-02-06 22:03:29 +01:00 |
|
Sander Roosendaal
|
48899a1809
|
Merge tag 'stats_v3' into develop
cumstats
|
2017-02-06 21:50:50 +01:00 |
|
Sander Roosendaal
|
a16059e45d
|
Merge branch 'release/stats_v3'
|
2017-02-06 21:50:35 +01:00 |
|
Sander Roosendaal
|
7f6660c0cd
|
stats_v3
|
2017-02-06 21:47:15 +01:00 |
|
Sander Roosendaal
|
b85308602d
|
cumstats
|
2017-02-06 21:39:56 +01:00 |
|
Sander Roosendaal
|
aff54b0a79
|
Merge tag 'gmapfix' into develop
Gmap overflow bugfix
|
2017-02-06 18:04:31 +01:00 |
|
Sander Roosendaal
|
a89628dd8a
|
Merge branch 'release/gmapfix'
|
2017-02-06 18:04:15 +01:00 |
|
Sander Roosendaal
|
f9eae7f591
|
Fixed google map overflow issue
|
2017-02-06 17:38:13 +01:00 |
|
Sander Roosendaal
|
c6b5aedbc7
|
Merge tag 'stats_v2' into develop
stats v2
|
2017-02-06 15:42:20 +01:00 |
|
Sander Roosendaal
|
1c4048e247
|
Merge branch 'release/stats_v2'
|
2017-02-06 15:40:50 +01:00 |
|
Sander Roosendaal
|
3b3f1845ae
|
removed print statement
|
2017-02-06 15:24:32 +01:00 |
|
Sander Roosendaal
|
0e89864e1d
|
Merge branch 'feature/stats_v2' into develop
|
2017-02-06 15:08:03 +01:00 |
|
Sander Roosendaal
|
fb76710681
|
Stats page v2
|
2017-02-06 15:07:24 +01:00 |
|
Sander Roosendaal
|
38f7a59476
|
automating the stats
|
2017-02-06 09:56:09 +01:00 |
|
Sander Roosendaal
|
b061eb5b1a
|
Merge tag 'statspage' into develop
New Stats page
|
2017-02-05 21:40:03 +01:00 |
|
Sander Roosendaal
|
f5472b1e3e
|
Merge branch 'release/statspage'
|
2017-02-05 21:39:09 +01:00 |
|
Sander Roosendaal
|
75681c1220
|
Basic Stats page
|
2017-02-05 21:24:17 +01:00 |
|
Sander Roosendaal
|
0b183053ba
|
implemented from_db_value in PowerZOnes model
|
2017-02-05 15:46:15 +01:00 |
|
Sander Roosendaal
|
2a3bfbadee
|
Merge tag 'error500' into develop
Improved error 500 page (bug report link)
|
2017-01-28 20:53:27 +01:00 |
|
Sander Roosendaal
|
ed6d569105
|
Merge branch 'release/error500'
|
2017-01-28 20:52:48 +01:00 |
|
Sander Roosendaal
|
35742a7cd0
|
Added button to BitBucket Issue to 500 page
|
2017-01-28 20:48:54 +01:00 |
|
Sander Roosendaal
|
0a719de27b
|
Merge tag 'hrform' into develop
Hotfix HR form
|
2017-01-28 19:29:36 +01:00 |
|
Sander Roosendaal
|
0e49ef7a94
|
Merge branch 'hotfix/hrform'
|
2017-01-28 19:29:14 +01:00 |
|
Sander Roosendaal
|
fe85318024
|
Bug fix HR user form
|
2017-01-28 19:27:57 +01:00 |
|
Sander Roosendaal
|
9ca2f4fc26
|
don't know
|
2017-01-28 19:19:24 +01:00 |
|
Sander Roosendaal
|
46d55062ea
|
Merge tag 'accountmgmt' into develop
Account mgmt
|
2017-01-27 16:43:48 +01:00 |
|
Sander Roosendaal
|
6ac3e3eac2
|
Merge branch 'release/accountmgmt'
|
2017-01-27 16:43:31 +01:00 |
|
Sander Roosendaal
|
227081cfb3
|
User can edit name and email address
|
2017-01-27 11:17:29 +01:00 |
|
Sander Roosendaal
|
ae36376dbe
|
Merge tag 'smtp3' into develop
SMTP testing
|
2017-01-26 17:46:32 +01:00 |
|
Sander Roosendaal
|
cfd339ef9c
|
Merge branch 'release/smtp3'
|
2017-01-26 17:46:06 +01:00 |
|
Sander Roosendaal
|
79f2df050d
|
SMTP further testing
|
2017-01-26 17:44:06 +01:00 |
|
Sander Roosendaal
|
c23fd20894
|
EMail to YAML settings
|
2017-01-26 17:40:15 +01:00 |
|
Sander Roosendaal
|
9d9c1fed9c
|
Merge tag 'emailtest2' into develop
USE_TLS = False
|
2017-01-26 17:34:40 +01:00 |
|
Sander Roosendaal
|
fdaff20411
|
Merge branch 'release/emailtest2'
|
2017-01-26 17:34:27 +01:00 |
|
Sander Roosendaal
|
1ffc0cc759
|
Use TLS = False
|
2017-01-26 17:32:25 +01:00 |
|
Sander Roosendaal
|
cc7899f2d1
|
Merge tag 'emailtest' into develop
email to smtp test
|
2017-01-26 17:23:07 +01:00 |
|
Sander Roosendaal
|
6d740f62d5
|
Merge branch 'release/emailtest'
|
2017-01-26 17:22:44 +01:00 |
|
Sander Roosendaal
|
d0c7b3dd5d
|
email to smtp test
|
2017-01-26 17:21:24 +01:00 |
|