Merged in dev (pull request #1)

Dev merging back into Master

fixtures/client_create.json

@@ -0,0 +1,7 @@
+{"data": {
+    "id": 1239455,
+    "wid": 777,
+    "name": "Very Big Company",
+    "at": "2013-02-26T08:45:28+00:00"
+  }
+}

fixtures/client_get.json

@@ -0,0 +1,11 @@
+{
+    "data": {
+        "id":1239455,
+        "wid":777,
+        "name":"Very Big Company",
+        "at":"2013-02-26T08:45:28+00:00",
+        "notes": "Contact: John Jacob Jingleheimer Schmidt",
+        "hrate": 12,
+        "cur": "AUD"
+    }
+}

fixtures/client_projects_get.json

@@ -0,0 +1,21 @@
+[
+    {
+        "id":909,
+        "wid":777,
+        "cid":987,
+        "name":"Very lucrative project",
+        "billable":false,
+        "is_private":true,
+        "active":true,
+        "at":"2013-03-06T09:15:18+00:00"
+    },{
+        "id":32143,
+        "wid":777,
+        "cid":987,
+        "name":"Factory server infrastructure",
+        "billable":true,
+        "is_private":true,
+        "active":true,
+        "at":"2013-03-06T09:16:06+00:00"
+    }
+]

fixtures/client_update.json

@@ -0,0 +1,9 @@
+{
+    "data": {
+        "id":1239455,
+        "wid":777,
+        "name":"Very Big Company",
+        "notes":"something about the client",
+        "at":"2013-02-26T08:55:28+00:00"
+    }
+}

fixtures/clients_get.json

@@ -0,0 +1,15 @@
+[
+    {
+        "id":1239455,
+        "wid":777,
+        "name":"Very Big Company",
+        "notes":"something about the client",
+        "at":"2013-02-26T08:55:28+00:00"
+    }, {
+        "id":1239456,
+        "wid":777,
+        "name":"Small Startup",
+        "notes":"Really cool people",
+        "at":"2013-03-26T08:55:28+00:00"
+    }
+]

fixtures/dashboard.json

@@ -0,0 +1,91 @@
+{
+   "most_active_user":[
+      {
+         "user_id":426060,
+         "duration":97652
+      },
+      {
+         "user_id":682638,
+         "duration":30600
+      },
+      {
+         "user_id":426054,
+         "duration":23400
+      },
+      {
+         "user_id":682650,
+         "duration":21600
+      },
+      {
+         "user_id":426055,
+         "duration":7506
+      }
+   ],
+   "activity":[
+      {
+         "user_id":6822650,
+         "project_id":34654059,
+         "duration":-1392018288,
+         "description":"new design"
+      },
+      {
+         "user_id":4260544,
+         "project_id":30349753,
+         "duration":-1392019190,
+         "description":"backend"
+      },
+      {
+         "user_id":426055,
+         "project_id":3689864,
+         "duration":-1392021417,
+         "description":"writing post"
+      },
+      {
+         "user_id":6822650,
+         "project_id":36898655,
+         "duration":10800,
+         "description":"design",
+         "stop":"2014-02-14T14:30:00+00:00"
+      },
+      {
+         "user_id":35224123,
+         "project_id":0,
+         "duration":65573,
+         "stop":"2014-02-13T08:12:06+00:00"
+      },
+      {
+         "user_id":35224123,
+         "project_id":3689865,
+         "duration":3600,
+         "stop":"2014-02-10T15:30:00+00:00"
+      },
+      {
+         "user_id":35224123,
+         "project_id":3535357,
+         "duration":10800,
+         "description":"backend",
+         "stop":"2014-02-10T14:30:00+00:00"
+      },
+      {
+         "user_id":6822638,
+         "project_id":3534557,
+         "duration":12600,
+         "description":"call",
+         "stop":"2014-02-10T12:22:00+00:00"
+      },
+      {
+         "user_id":35224123,
+         "project_id":303258,
+         "duration":5280,
+         "description":"research for presentation",
+         "stop":"2014-02-10T11:58:00+00:00"
+      },
+      {
+         "user_id":35224123,
+         "project_id":346409,
+         "duration":7200,
+         "description":"Meeting",
+         "stop":"2014-02-10T10:00:00+00:00"
+      }
+   ]
+}

fixtures/project_create.json

@@ -0,0 +1,14 @@
+{
+    "data": {
+        "id":193838628,
+        "wid":777,
+        "cid":123397,
+        "name":"An awesome project",
+        "billable":false,
+        "is_private":true,
+        "active":true,
+        "at":"2013-03-06T12:15:37+00:00",
+        "template_id":10237,
+        "color": "5"
+    }
+}

fixtures/project_get.json

@@ -0,0 +1,14 @@
+{
+    "data": {
+        "id":193838628,
+        "wid":777,
+        "cid":123397,
+        "name":"An awesome project",
+        "billable":false,
+        "is_private":true,
+        "active":true,
+        "at":"2013-03-06T12:15:37+00:00",
+        "template":true,
+        "color": "5"
+    }
+}

fixtures/project_projectusers_get.json

@@ -0,0 +1,18 @@
+[
+    {
+        "id":4692190,
+        "pid":777,
+        "uid":123,
+        "wid":99,
+        "manager":true,
+        "rate":4
+    },
+    {
+        "id":4692193,
+        "pid":777,
+        "uid":125,
+        "wid":99,
+        "manager":false,
+        "rate":4
+    }
+]

fixtures/project_tasks_get.json

@@ -0,0 +1,19 @@
+[
+    {
+        "name":"A new task",
+        "id":1335076912,
+        "wid":888,
+        "pid":777,
+        "active":false,
+        "at":"2013-02-26T15:09:52+00:00",
+        "estimated_seconds":3600
+    }, {
+        "name":"Another task",
+        "id":1335076911,
+        "uid": 12309,
+        "wid":888,
+        "pid":777,
+        "active":false,
+        "at":"2013-02-26T15:09:52+00:00"
+    }
+]

fixtures/project_update.json

@@ -0,0 +1,13 @@
+{
+    "data": {
+        "id":193838628,
+        "wid":777,
+        "cid":123398,
+        "name":"Changed the name",
+        "billable":false,
+        "active":true,
+        "at":"2013-03-06T12:15:37+00:00",
+        "template":true,
+        "color":"6"
+    }
+}

fixtures/projectuser_create.json

@@ -0,0 +1,10 @@
+{
+    "data": {
+        "id":4692190,
+        "pid":777,
+        "uid":123,
+        "wid":99,
+        "manager":true,
+        "rate":4
+    }
+}

fixtures/projectuser_update.json

@@ -0,0 +1,12 @@
+{
+    "data": {
+        "id":4692190,
+        "pid":777,
+        "uid":123,
+        "wid":99,
+        "manager":false,
+        "rate":15,
+        "fullname":"John Swift",
+        "at":"2013-03-05T09:21:44+00:00"
+    }
+}

fixtures/projectusers_create_multiple.json

@@ -0,0 +1,26 @@
+{
+    "data":[
+        {
+            "id":4692190,
+            "pid":777,
+            "uid":1267998,
+            "wid":99,
+            "manager":true,
+            "rate":4,
+        },{
+            "id":4692192,
+            "pid":777,
+            "uid":29624,
+            "wid":99,
+            "manager":true,
+            "rate":4,
+        },{
+            "id":4692191,
+            "pid":777,
+            "uid":112047,
+            "wid":99,
+            "manager":true,
+            "rate":4,
+        }
+    ]
+}

fixtures/projectusers_get.json

@@ -0,0 +1,10 @@
+{
+    "data": {
+        "id":4692190,
+        "pid":777,
+        "uid":123,
+        "wid":99,
+        "manager":true,
+        "rate":4
+    }
+}

fixtures/projectusers_update_multiple.json

@@ -0,0 +1,29 @@
+{
+    "data":[
+        {
+            "id":4692190,
+            "pid":777,
+            "uid":1267998,
+            "wid":99,
+            "manager":false,
+            "rate":15,
+            "at":"2013-03-05T09:20:58+00:00"
+        },{
+            "id":4692192,
+            "pid":777,
+            "uid":29624,
+            "wid":99,
+            "manager":false,
+            "rate":15,
+            "at":"2013-03-05T09:20:58+00:00"
+        },{
+            "id":4692191,
+            "pid":777,
+            "uid":112047,
+            "wid":99,
+            "manager":false,
+            "rate":15,
+            "at":"2013-03-05T09:20:58+00:00"
+        }
+    ]
+}

fixtures/reset_token.json

@@ -0,0 +1 @@
+"a0123123b8e43343d614553f95f9192ab9c1"

fixtures/signups.json

@@ -0,0 +1,19 @@
+{
+    "data":{
+        "id":599978901,
+        "api_token":"808lolae4eab897cce9729a53642124effe",
+        "default_wid":983493,
+        "email":"test.user@toggl.com",
+        "fullname":"Test User",
+        "jquery_timeofday_format":"",
+        "jquery_date_format":"",
+        "timeofday_format":"",
+        "date_format":"",
+        "store_start_and_stop_time":false,
+        "beginning_of_week":0,
+        "sidebar_piechart":false,
+        "timeline_experiment":false,
+        "new_blog_post":{},
+        "invitation":{}
+    }
+}

fixtures/tag_create.json

@@ -0,0 +1,7 @@
+{
+    "data": {
+        "id":1239455,
+        "wid":777,
+        "name":"billed"
+    }
+}

fixtures/tag_update.json

@@ -0,0 +1,7 @@
+{
+    "data": {
+        "id":1239455,
+        "wid":777,
+        "name":"not billed"
+    }
+}

fixtures/task_create.json

@@ -0,0 +1,10 @@
+{
+    "data": {
+        "name":"A new task",
+        "id":1335076912,
+        "wid":888,
+        "pid":777,
+        "active":true,
+        "estimated_seconds":0
+    }
+}

fixtures/task_get.json

@@ -0,0 +1,10 @@
+{
+    "data": {
+        "name":"A new task",
+        "id":1335076912,
+        "wid":888,
+        "pid":777,
+        "active":true,
+        "estimated_seconds":0
+    }
+}