Private
Public Access
1
0
Commit Graph

9378 Commits

Author SHA1 Message Date
sanderroosendaal
5a280afd0b Merge tag 'twitter' into develop
1.0.2
2016-10-31 19:18:43 +01:00
sanderroosendaal
3298259400 Merge branch 'release/twitter' twitter 2016-10-31 19:18:20 +01:00
sanderroosendaal
7f92f1f4d4 Added Twitter and Bitbucket to contact/email page 2016-10-31 19:16:59 +01:00
sanderroosendaal
8bc3699e12 Merge branch 'feature/timedelta' into develop 2016-10-31 17:30:24 +01:00
sanderroosendaal
17a7e236b8 Fixed some time rendering bugs 2016-10-31 17:29:30 +01:00
sanderroosendaal
faf23c3162 Changed get_datetimes to timedelta 2016-10-31 16:57:58 +01:00
sanderroosendaal
1806d8a36b Merge tag 'emailsubject' into develop
1.0.1
2016-10-31 16:37:39 +01:00
sanderroosendaal
21db90ffe9 Merge branch 'release/emailsubject' emailsubject 2016-10-31 16:37:19 +01:00
sanderroosendaal
0a0e21ae07 If name is empty, name will be set to - imported through email - 2016-10-31 16:31:54 +01:00
sanderroosendaal
caedf5392f Merge tag 'sliders' into develop
1.0.0
2016-10-31 15:54:49 +01:00
sanderroosendaal
c66b309e11 Merge branch 'release/sliders' sliders 2016-10-31 15:54:23 +01:00
sanderroosendaal
042a83f254 sliders final 2016-10-31 15:53:31 +01:00
sanderroosendaal
7fb67ff176 publishing sliders 2016-10-31 15:52:12 +01:00
sanderroosendaal
ada6042a39 merge conflict resolved 2016-10-31 15:43:34 +01:00
sanderroosendaal
68579a0265 Merge branch 'feature/sliders' into develop 2016-10-31 15:36:12 +01:00
sanderroosendaal
0b2fc89ffb added check for non-empty dataframe 2016-10-31 15:32:53 +01:00
sanderroosendaal
49f93da544 Cumulative Flex Plot v1 2016-10-31 15:18:11 +01:00
sanderroosendaal
bb39d2b0af removed db.sqlite3 2016-10-31 14:15:40 +01:00
sanderroosendaal
bff31d0829 Removed some pyc files 2016-10-31 13:23:25 +01:00
sanderroosendaal
97cbc1b313 Removing db.sqlite3 from git 2016-10-31 13:03:00 +01:00
sanderroosendaal
be6333081e Master` 2016-10-31 13:00:18 +01:00
sanderroosendaal
f7ea837bcc Sliders on flex chart 2016-10-31 12:55:21 +01:00
sanderroosendaal
3f5f4a84df Added slider on flex plot 2016-10-31 12:51:27 +01:00
sanderroosendaal
20a96ee18d Added sliders to Flex Plot (including mean) 2016-10-31 12:49:10 +01:00
sanderroosendaal
ff9a2114c2 Merge tag 'RELEASE' into develop
RELEASE 1
2016-10-30 17:55:38 +01:00
sanderroosendaal
6877e93e2c Merge branch 'release/RELEASE' RELEASE 2016-10-30 17:54:47 +01:00
sanderroosendaal
3eed3cc3e7 Uploading files 2016-10-30 17:39:32 +01:00
sanderroosendaal
c135e98d61 Initial commit 2016-10-30 17:10:39 +01:00