From 897a3db05ee0b886089b331891360ae6e45a085f Mon Sep 17 00:00:00 2001 From: Jenkins Date: Thu, 1 Dec 2016 17:12:24 +0000 Subject: [PATCH 01/14] Bumping version to 2.0.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ba626c4..89c4fd9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "user-api", - "version": "2.0.0", + "version": "2.0.1", "description": "Basic RESTful User Management API", "main": "app.js", "author": "Red Hat", From 9ddebd9c0b6c06e3ce78554acd91cca90a313d4b Mon Sep 17 00:00:00 2001 From: Jenkins Date: Thu, 1 Dec 2016 17:13:03 +0000 Subject: [PATCH 02/14] Bumping version to 2.0.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 89c4fd9..97482de 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "user-api", - "version": "2.0.1", + "version": "2.0.2", "description": "Basic RESTful User Management API", "main": "app.js", "author": "Red Hat", From eff8e750bb637d01f65cb0e682d31a9c852c6726 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Thu, 1 Dec 2016 17:13:46 +0000 Subject: [PATCH 03/14] Bumping version to 2.0.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 97482de..22b3947 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "user-api", - "version": "2.0.2", + "version": "2.0.3", "description": "Basic RESTful User Management API", "main": "app.js", "author": "Red Hat", From f4de3f7fe7a5ec1d37f81a63cdd9e243c482981e Mon Sep 17 00:00:00 2001 From: Jenkins Date: Thu, 1 Dec 2016 17:14:13 +0000 Subject: [PATCH 04/14] Bumping version to 2.0.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 22b3947..bd6ff7c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "user-api", - "version": "2.0.3", + "version": "2.0.4", "description": "Basic RESTful User Management API", "main": "app.js", "author": "Red Hat", From 70b65f30d48217207f5d9df32ab4cb4cb1f6472f Mon Sep 17 00:00:00 2001 From: Jenkins Date: Thu, 1 Dec 2016 17:15:14 +0000 Subject: [PATCH 05/14] Bumping version to 2.0.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bd6ff7c..78a6bef 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "user-api", - "version": "2.0.4", + "version": "2.0.5", "description": "Basic RESTful User Management API", "main": "app.js", "author": "Red Hat", From 21d99ecb673051639f7c492049f713378a4db8f9 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Thu, 1 Dec 2016 17:16:12 +0000 Subject: [PATCH 06/14] Bumping version to 2.0.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 78a6bef..bf03ea6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "user-api", - "version": "2.0.5", + "version": "2.0.6", "description": "Basic RESTful User Management API", "main": "app.js", "author": "Red Hat", From 77f3dd0e4cf9e820ca2fb4e1a051dea3c7f07a91 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Thu, 1 Dec 2016 17:17:12 +0000 Subject: [PATCH 07/14] Bumping version to 2.0.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bf03ea6..01e5e99 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "user-api", - "version": "2.0.6", + "version": "2.0.7", "description": "Basic RESTful User Management API", "main": "app.js", "author": "Red Hat", From d96e201645ed8c49a05c444c96bbb74d4b95bf1b Mon Sep 17 00:00:00 2001 From: Jenkins Date: Thu, 1 Dec 2016 17:18:13 +0000 Subject: [PATCH 08/14] Bumping version to 2.0.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 01e5e99..0cf0bd9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "user-api", - "version": "2.0.7", + "version": "2.0.8", "description": "Basic RESTful User Management API", "main": "app.js", "author": "Red Hat", From 0fbb905310999df52bf5a561c36b59dc9fc4352a Mon Sep 17 00:00:00 2001 From: Aiden Keating Date: Tue, 6 Dec 2016 15:04:37 +0000 Subject: [PATCH 09/14] Add Aiden Keating and update gitignore * Add information for user `akeating` * Update `package.json` to include `npm-debug.log` --- .gitignore | 1 + models/users.json | 34 +++++++++++++++++++++++++++++++++- package.json | 2 +- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3c3629e..5171c54 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ node_modules +npm-debug.log \ No newline at end of file diff --git a/models/users.json b/models/users.json index 45af3c4..0c5a2d4 100644 --- a/models/users.json +++ b/models/users.json @@ -59,6 +59,37 @@ "thumbnail": "https://randomuser.me/api/portraits/thumb/women/19.jpg" } }, { + "gender": "male", + "name": { + "title": "mr", + "first": "Aiden", + "last": "Keating" + }, + "location": { + "street": "35 Grove Street", + "city": "Waterford", + "state": "Ireland", + "zip": 12345 + }, + "email": "akeating@redhat.com", + "username": "akeating", + "password": "123457", + "salt": "HsxzewdQ", + "md5": "5809e5fda81eed34bad9ca6eff414924", + "sha1": "6c95f0d9210e88028074d4baaeefc3d6c830a9a3", + "sha256": "f92fc585c017d093b03dba898162613380f137f934637c5bf9050fe68c103c54", + "registered": 1180746503, + "dob": 1028583070, + "phone": "041-252-0953", + "cell": "081-567-1935", + "PPS": "2470896T", + "picture": { + "large": "https://randomuser.me/api/portraits/men/75.jpg", + "medium": "https://randomuser.me/api/portraits/med/men/75.jpg", + "thumbnail": "https://randomuser.me/api/portraits/thumb/men/75.jpg" + } +}, +{ "gender": "male", "name": { "title": "mr", @@ -88,7 +119,8 @@ "medium": "https://randomuser.me/api/portraits/med/men/75.jpg", "thumbnail": "https://randomuser.me/api/portraits/thumb/men/75.jpg" } -}, { +}, +{ "gender": "female", "name": { "title": "mrs", diff --git a/package.json b/package.json index 0cf0bd9..e55f0c3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "user-api", - "version": "2.0.8", + "version": "2.0.9", "description": "Basic RESTful User Management API", "main": "app.js", "author": "Red Hat", From 3dc378ed93bb3afd8ffa68a9bd3fb4398a491997 Mon Sep 17 00:00:00 2001 From: Aiden Keating Date: Tue, 6 Dec 2016 16:26:56 +0000 Subject: [PATCH 10/14] Update tests to cope with new user * User count is now 101 --- tests/accept/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/accept/users.js b/tests/accept/users.js index 418bcf0..4aa5906 100644 --- a/tests/accept/users.js +++ b/tests/accept/users.js @@ -30,7 +30,7 @@ describe('Users', function() { .end(function(err, res) { res.body.should.be.a('array'); res.should.have.status(200); - res.body.length.should.be.eql(100); + res.body.length.should.be.eql(101); done(); }); }); From 7d8d9a3d401a8dd85eeed3c2ed397ade3568f640 Mon Sep 17 00:00:00 2001 From: PhilipGough Date: Tue, 6 Dec 2016 16:31:16 +0000 Subject: [PATCH 11/14] Add name to append.json --- models/append.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/models/append.json b/models/append.json index 99fe3fc..d4ec2e5 100644 --- a/models/append.json +++ b/models/append.json @@ -2,5 +2,6 @@ "attendees": [ "Gerard Ryan", "Jason Madigan" + "Philip Gough" ] -} \ No newline at end of file +} From 35f5cbeb365ccb6fb963767d0b20bbdda32b1369 Mon Sep 17 00:00:00 2001 From: Jameel Briones Date: Tue, 6 Dec 2016 16:34:56 +0000 Subject: [PATCH 12/14] Adding Jameel Briones --- models/append.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/models/append.json b/models/append.json index 99fe3fc..e6c1a37 100644 --- a/models/append.json +++ b/models/append.json @@ -1,6 +1,7 @@ { "attendees": [ "Gerard Ryan", - "Jason Madigan" + "Jason Madigan", + "Jameel Briones" ] -} \ No newline at end of file +} From 45332eb5299e1d0eb9d3304ce09d58edfbb34d47 Mon Sep 17 00:00:00 2001 From: Laura Fitzgerald Date: Tue, 6 Dec 2016 16:29:29 +0000 Subject: [PATCH 13/14] add Laura Fitzgerald --- models/append.json | 1 + 1 file changed, 1 insertion(+) diff --git a/models/append.json b/models/append.json index d4ec2e5..ce7fb3c 100644 --- a/models/append.json +++ b/models/append.json @@ -3,5 +3,6 @@ "Gerard Ryan", "Jason Madigan" "Philip Gough" + "Laura Fitzgerald" ] } From e228763a4f65769860db3a053ec95aa8d7fba974 Mon Sep 17 00:00:00 2001 From: Clifton Sherrard Date: Tue, 6 Dec 2016 16:34:36 +0000 Subject: [PATCH 14/14] Added name to append --- .idea/git-tutorial.iml | 12 + .idea/inspectionProfiles/Project_Default.xml | 6 + .idea/jsLibraryMappings.xml | 6 + .idea/misc.xml | 6 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + .idea/workspace.xml | 304 +++++++++++++++++++ models/append.json | 7 +- 8 files changed, 352 insertions(+), 3 deletions(-) create mode 100644 .idea/git-tutorial.iml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/jsLibraryMappings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml diff --git a/.idea/git-tutorial.iml b/.idea/git-tutorial.iml new file mode 100644 index 0000000..24643cc --- /dev/null +++ b/.idea/git-tutorial.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..5b5702d --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml new file mode 100644 index 0000000..b8387eb --- /dev/null +++ b/.idea/jsLibraryMappings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..28a804d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..55b2e65 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..29151f5 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,304 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1481038029930 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/models/append.json b/models/append.json index 2f12a1c..313e623 100644 --- a/models/append.json +++ b/models/append.json @@ -2,8 +2,9 @@ "attendees": [ "Gerard Ryan", "Jason Madigan", - "Jameel Briones" - "Philip Gough" - "Laura Fitzgerald" + "Jameel Briones", + "Philip Gough", + "Laura Fitzgerald", + "Clifton Sherrard" ] }