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 |
|
Sander Roosendaal
|
c91a1a12d9
|
Merge tag 'powerzonesdefaults' into develop
Changed defaults for Power Zones
|
2017-01-26 13:46:48 +01:00 |
|
Sander Roosendaal
|
c3b46941bf
|
Merge branch 'release/powerzonesdefaults'
|
2017-01-26 13:46:23 +01:00 |
|
Sander Roosendaal
|
dd5f79c550
|
typo
|
2017-01-26 13:39:18 +01:00 |
|
Sander Roosendaal
|
c296f46b96
|
Changed default power zone values and names
|
2017-01-26 13:38:40 +01:00 |
|
Sander Roosendaal
|
5a74f8cb2f
|
Merge tag 'flexzonefix2' into develop
fix pie chart
|
2017-01-25 22:21:29 +01:00 |
|
Sander Roosendaal
|
99a9ca9686
|
Merge branch 'release/flexzonefix2'
|
2017-01-25 22:20:56 +01:00 |
|
Sander Roosendaal
|
dc409e38bc
|
Piechart fix
|
2017-01-25 22:17:06 +01:00 |
|
Sander Roosendaal
|
a96f93456f
|
Merge tag 'flexpowerzonesbugfix' into develop
Bug fix flex power zones
|
2017-01-25 22:01:29 +01:00 |
|
Sander Roosendaal
|
6dd4f4c391
|
Merge branch 'release/flexpowerzonesbugfix'
|
2017-01-25 22:01:00 +01:00 |
|
Sander Roosendaal
|
9072d50f5a
|
bug fix flex power zones
|
2017-01-25 21:59:35 +01:00 |
|
Sander Roosendaal
|
3cec874a84
|
add FTP and power to makeplot
|
2017-01-25 21:24:36 +01:00 |
|
Sander Roosendaal
|
c8ad85868e
|
Merge tag 'flexpowerzones' into develop
Flex Power Zones
|
2017-01-25 21:12:10 +01:00 |
|
Sander Roosendaal
|
cf1df5c933
|
Merge branch 'release/flexpowerzones'
|
2017-01-25 21:11:49 +01:00 |
|
Sander Roosendaal
|
1a9d1c19ad
|
changed bands to zones (wording)
|
2017-01-25 21:10:45 +01:00 |
|
Sander Roosendaal
|
58c954f47f
|
fix email settings bug
|
2017-01-25 21:07:24 +01:00 |
|
Sander Roosendaal
|
fd50a9ea4c
|
fixed email sending bug
|
2017-01-25 21:04:31 +01:00 |
|
Sander Roosendaal
|
d8fc9a0392
|
Merge branch 'feature/powerzones' into develop
|
2017-01-25 18:19:04 +01:00 |
|
Sander Roosendaal
|
8b7005b3dc
|
small bug fix
|
2017-01-25 18:18:13 +01:00 |
|
Sander Roosendaal
|
591e515f92
|
initial implementation of Power Zones form
|
2017-01-25 18:07:57 +01:00 |
|
Sander Roosendaal
|
5eed5d05a8
|
defined PowerZonesForm
|
2017-01-25 15:37:26 +01:00 |
|
Sander Roosendaal
|
e4c2270306
|
updated models.py to add powerzones
|
2017-01-24 23:24:57 +01:00 |
|