Merge branch 'release/v4.07'

rowers/dataprep.py

@@ -1017,8 +1017,8 @@ def new_workout_from_df(r,df,
 
     df.rename(columns = columndict,inplace=True)
 
-    starttimeunix = mktime(startdatetime.utctimetuple())
-    #starttimeunix = arrow.get(startdatetime).timestamp
+    #starttimeunix = mktime(startdatetime.utctimetuple())
+    starttimeunix = arrow.get(startdatetime).timestamp
     df[' ElapsedTime (sec)'] = df['TimeStamp (sec)']
 
     df['TimeStamp (sec)'] = df['TimeStamp (sec)']+starttimeunix

rowers/templates/developers.html

@@ -115,8 +115,10 @@
     
     <h6>Registering an app</h6>
 
-    <p>As a registered user, you can register an app.</p>
-    <ul><li><a href="/rowers/o/applications/">Self-service app link.</a></li></ul>
+
+    <p>We have disabled the self service app link for security reasons.
+      We will replace it with a secure self service app link soon. If you
+      need to register an app, please send email to info@rowsandall.com</p>
     
     <h6>Authentication</h6>
 

rowers/urls.py

@@ -102,10 +102,14 @@ handler404 = 'views.error404_view'
 handler400 = 'views.error400_view'
 handler403 = 'views.error403_view'
 
+from oauth2_provider.views import base
+
 urlpatterns = [
 #    url(r'^password_change/$',auth_views.password_change),
 #    url(r'^password_change_done/$',auth_views.password_change_done),
-    url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
+#    url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
+    url(r'^o/authorize/$', base.AuthorizationView.as_view(), name="authorize"),
+    url(r'^o/token/$', base.TokenView.as_view(), name="token"),
     url(r'^', include(router.urls)),
     url(r'^api-docs$', views.schema_view),
     url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),