Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging #1

Open
wants to merge 242 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
242 commits
Select commit Hold shift + click to select a range
3f77240
Update README.md
nchen94 Sep 8, 2014
c2ffeaf
Meanjs folder for Hummingbird- sltalty
sltclss Sep 21, 2014
832a715
test
nchen94 Sep 21, 2014
81a1114
Code Standards -sltalty
sltclss Sep 21, 2014
1b4570d
Test run
Sep 29, 2014
300c28c
Change folder name
Oct 1, 2014
b9edeca
Removed Old
nchen94 Oct 5, 2014
8383bba
Merge branch 'master' of https://github.com/nchen94/CEN3031Project
nchen94 Oct 5, 2014
03e9111
Removed Old
nchen94 Oct 5, 2014
1f14e33
New project commit using yo generator without Articles.
sltclss Oct 5, 2014
c88154b
General Commit: Added customer module
sltclss Oct 5, 2014
cbade17
Implemented user story 79241514
nchen94 Oct 5, 2014
bdf5232
Mock-up folders
nchen94 Oct 8, 2014
6ac3835
updated Models
nchen94 Oct 8, 2014
c6285c2
Update
Oct 8, 2014
b7d2dcf
general commit
nchen94 Oct 8, 2014
a14f7a4
General Commit: Minor changes
Oct 8, 2014
88b4d4e
Customer Dashboard added. Order history view and controller created.
sltclss Oct 8, 2014
72c6193
General Commit: Minor changes
Oct 9, 2014
2e92d68
Model test for bill, contact and inventory added
Oct 9, 2014
b935e44
General Commit: Minor changes
nchen94 Oct 10, 2014
2134268
General Commit: CSS changes (footer)
sltclss Oct 11, 2014
d1ad3f7
Model test for messaging
Oct 12, 2014
7ba7168
General Commit: Bug fix
Oct 12, 2014
be0c6b2
General Commit: Front-end sign-in test fix and modal $emit change.
sltclss Oct 12, 2014
5c65c98
General Commit: new model
nchen94 Oct 12, 2014
d4f5840
General Commit
nchen94 Oct 12, 2014
4c37900
Merge pull request #1 from nchen94/Nancy's
nchen94 Oct 12, 2014
982f588
Model test for order, form and result
Oct 12, 2014
86d0124
General Commit: Minor change in order test
Oct 12, 2014
33e0bca
Implementation of registration user story 79242026--jcaneus1
Olguy Oct 12, 2014
bfe24bc
functions to manipulate ng-show for verification purpose added in aut…
Olguy Oct 12, 2014
f972603
General Commit
nchen94 Oct 12, 2014
d627e2b
Merge branch 'master' of https://github.com/nchen94/CEN3031Project
nchen94 Oct 12, 2014
ede35f3
General Commit
nchen94 Oct 12, 2014
8f14a32
General Commit
Oct 12, 2014
d6b01ea
General Commit
Oct 12, 2014
4732bd3
Remove connection to user model
Oct 12, 2014
fffe7df
Minor change to contact model test
Oct 12, 2014
48b944f
General Commit
nchen94 Oct 12, 2014
c16539e
Model test for medical history
Oct 12, 2014
3de2340
Merge branch 'master' of https://github.com/nchen94/CEN3031Project
nchen94 Oct 12, 2014
eb7dfb3
General Commit
nchen94 Oct 12, 2014
566f138
General Commit: created new-order view and controller.
sltclss Oct 12, 2014
b805a62
General Commit: created new-order view and controller.
sltclss Oct 12, 2014
01bfbf7
General Commit: changed gitignore file for lib/ css files
sltclss Oct 12, 2014
388751a
update terminal
schoenfelde Oct 12, 2014
2b769b9
Forgot Password
schoenfelde Oct 12, 2014
d6fb2b0
new pictures
schoenfelde Oct 12, 2014
4cfc26c
Pending Tab
schoenfelde Oct 12, 2014
99271f3
Implemented User Story 79242014 -gandhima24
MonicaGandhi Oct 12, 2014
d054e65
Implemented User Story 79242014 -gandhima24
MonicaGandhi Oct 13, 2014
56dea9e
Implemented User Story 79242014 -gandhima24
MonicaGandhi Oct 13, 2014
6d7c44e
Fixed Pending
schoenfelde Oct 13, 2014
b882894
Changed the front page
schoenfelde Oct 13, 2014
d92281d
last part of wallpaper
schoenfelde Oct 13, 2014
3788491
Implemented $http connection to back-end for New Order and Pending Or…
sltclss Oct 13, 2014
06c6be2
General Commit: fixed datepicker for registration
sltclss Oct 13, 2014
0db06b0
General commit: new-order testing bug
sltclss Oct 13, 2014
aac6dfb
General Commit: initial front-end web app mock-ups
sltclss Oct 14, 2014
9989784
"Implementation of user story for the customer history --jcaneus"
Olguy Oct 15, 2014
5d64d2b
Updated Backend
nchen94 Oct 18, 2014
7d2d08c
General Commit: fixed small errors and formatted
nchen94 Oct 18, 2014
780a326
General Commit: minor adjustment on model test
Oct 19, 2014
67719c7
General Commit
nchen94 Oct 21, 2014
e7ff64a
General Commit
nchen94 Oct 22, 2014
6d66b9b
Adding result controller and routes
nchen94 Oct 22, 2014
e261a47
Added Result functions/routes
nchen94 Oct 25, 2014
8677019
General Commit
Oct 25, 2014
6db1faf
Bug fixes for Registration, additon of module lab, and Implemented Us…
sltclss Oct 28, 2014
59998e1
General Commit: Registration back-end bug fix
sltclss Oct 28, 2014
3e3c844
Update README.md
nchen94 Oct 29, 2014
a0d744c
Added Verify HTML and controller
schoenfelde Oct 29, 2014
3ef8224
lab view for verify
schoenfelde Oct 30, 2014
3120486
added validation for status and roles
nchen94 Oct 31, 2014
6f6c10e
General Commit
Oct 31, 2014
93907ad
LabFacility model and functions.
nchen94 Oct 31, 2014
42a9bc7
Change model test
Oct 31, 2014
872586d
General Commit: misc
nchen94 Oct 31, 2014
51dd7b9
Minor bug
Oct 31, 2014
43382a6
Merge remote-tracking branch 'origin/master' into sltalty
sltclss Nov 1, 2014
a483581
General Commit: minor change to model test
Nov 1, 2014
b5bb108
Added check for input result
Nov 1, 2014
0b0effb
Check valid order ID and verifier ID
Nov 1, 2014
eec409f
General Commit
Nov 1, 2014
548a3e3
Added some comments in results controller
Nov 1, 2014
0e66a9f
Return Verifier List, Updated result functions
nchen94 Nov 1, 2014
aba0744
Added lab controller, connect to lab-nav controller, and mock backend…
sltclss Nov 1, 2014
8f660ce
General Commit: Adding comments
nchen94 Nov 1, 2014
e602622
connected input result page
MonicaGandhi Nov 1, 2014
dfa9b46
Bug fix
nchen94 Nov 1, 2014
53031ab
Implement input result
MonicaGandhi Nov 1, 2014
9493f53
Added check for valid verifier ID
Nov 1, 2014
f18d34d
Fixed some minor bug
Nov 1, 2014
7e8809d
General commit
Nov 1, 2014
27c69d0
General Commit: Suppress the === warning
Nov 2, 2014
1934b76
Merge remote-tracking branch 'origin/sltalty'
nchen94 Nov 2, 2014
b4139b3
General Commit: minor bugs
nchen94 Nov 2, 2014
bcadd3f
General Commit
nchen94 Nov 2, 2014
704d6c8
General Commit: Suppress JS Hint errors
Nov 2, 2014
96013e1
Result.create function implemented
sltclss Nov 3, 2014
94a5246
Implemented front-end verify results and submit results.
sltclss Nov 3, 2014
79a446d
Front End Testing and small changes
nchen94 Nov 3, 2014
33a00e8
General Commit: Seqid Dependency
Nov 3, 2014
4624cd1
General Commit: Minor changes
Nov 3, 2014
76a02f1
Added some more tests
Nov 3, 2014
2374a4f
"Completed Order Page to view completed orders" --jcaneus1
Olguy Nov 3, 2014
fec670f
General Commit: Minor bug fixed
Nov 3, 2014
056d7e3
Temporary disable signup test
Nov 3, 2014
ab2a6c2
Remove and clean up files containing JsFiddle which we are no longer …
Olguy Nov 4, 2014
ca46299
Minor Changes
schoenfelde Nov 4, 2014
4d55a9c
Merge branch 'master' of https://github.com/nchen94/CEN3031Project
schoenfelde Nov 4, 2014
92ce7c5
Update for the completed Order page --jcaneus1
Olguy Nov 4, 2014
4aad6e1
Added more tests for lab facility model
Nov 4, 2014
989a43e
Minor bug fixed
Nov 4, 2014
882a0d7
Minor changes
Nov 5, 2014
3860113
Implemented Backend testing
nchen94 Nov 5, 2014
d2e69a3
Added results controller test
Nov 5, 2014
5c7af94
Formatted Completed Orders added listing function and routes for orders
sltclss Nov 5, 2014
1d4f956
Testing for new-result
schoenfelde Nov 5, 2014
a0804ed
have made changes in the html pages of the lab-nav controller,
MonicaGandhi Nov 5, 2014
eabc409
made html page for lab orders that are failed
MonicaGandhi Nov 5, 2014
2697158
general commit
MonicaGandhi Nov 5, 2014
d9477e6
genral changes
MonicaGandhi Nov 5, 2014
cf41087
'multiple front end test' --jcaneus1
Olguy Nov 5, 2014
4f1fd1f
Change console log message for easier reading
Nov 5, 2014
56a6b88
Temporary disable some tests
Nov 5, 2014
ef06822
"Clean up and remove non working xeditable codes on the customer dash…
Olguy Nov 10, 2014
3d5ab4b
Created admin module (controllers, views, and routes); route separati…
sltclss Nov 11, 2014
87906ec
Create a function to list all orders & minor change
Nov 12, 2014
2b1cda2
Small bug fixed
Nov 12, 2014
f4086b1
created new functions and added registrationCode
nchen94 Nov 12, 2014
ed0b7a6
Inventory View and Controller
schoenfelde Nov 12, 2014
37c2a8d
created adminedashboard orderstatus and shipment status view and cont…
MonicaGandhi Nov 13, 2014
38ef3b6
'Implementation of Customer-lab view for the admin page as well as th…
Olguy Nov 13, 2014
ca4847a
General Commit
nchen94 Nov 13, 2014
2e745fb
General commit: bug fixes
sltclss Nov 13, 2014
7971366
Added function to decrease item amount when shipped
Nov 13, 2014
05759d0
Temporary comment out the errors
Nov 14, 2014
fe722fd
List for Customers and labs
nchen94 Nov 14, 2014
f4eff18
'views for customer-lab from admin page' --jcaneus1
Olguy Nov 13, 2014
39d5458
"modifying customer-lab view as well as admin controller to pull info…
Olguy Nov 15, 2014
15bf349
Routing interceptions
sltclss Nov 16, 2014
f9d498d
General commits: form fixes and back-end call setups
sltclss Nov 16, 2014
003fc1e
Finished implementing decrease item function
Nov 16, 2014
f796d17
Minor bug fixed
Nov 16, 2014
f678c3c
Hot fix
Nov 17, 2014
5694bfc
General commit
Nov 17, 2014
63463fd
Functions for Lab and Admins
nchen94 Nov 17, 2014
283ba46
Setup inventory connections (changed inventory increment/update to ta…
sltclss Nov 17, 2014
363e52b
General commits: fixed back-end inventory list, set inventory view fo…
sltclss Nov 17, 2014
45a76d6
general commits
sltclss Nov 17, 2014
47b0664
General Commits
nchen94 Nov 17, 2014
7045b14
Minor changes
Nov 17, 2014
0d64855
Enable add new kit function
Nov 17, 2014
c05df42
General commit
nchen94 Nov 17, 2014
193b578
General commit
sltclss Nov 17, 2014
352e36c
General commit
Nov 17, 2014
33d8744
General Commit
nchen94 Nov 17, 2014
40b2005
Added check for item count when ship order
Nov 17, 2014
c9f5d4c
register page for customer lab kit
MonicaGandhi Nov 17, 2014
2bff300
controller for register
MonicaGandhi Nov 17, 2014
03df196
'testing function for various controller functions --jcaneus1'
Olguy Nov 17, 2014
c5245d6
general changes
MonicaGandhi Nov 17, 2014
e962217
fixed function name: order.server.controller.js
Nov 17, 2014
502e47b
general commit
nchen94 Nov 17, 2014
58a8b7e
fix errors in console.log in order.server
Nov 17, 2014
b2c9294
Fixed the HTML and made it pretty
Nov 17, 2014
83a06ad
general commit: add adminsignout route
sltclss Nov 17, 2014
8fbd529
General Commit: fix the fix for adminsignout
sltclss Nov 17, 2014
976bcd1
Fixing CSS bugs
sltclss Nov 17, 2014
8c9c446
'More testing function for various controller functions --jcaneus1'
Olguy Nov 18, 2014
79395e4
'some more front end testing for the admin view as well as the custom…
Olguy Nov 18, 2014
21853c1
Cleaned up the html/controller on the client side
Nov 18, 2014
ad6fc1b
More or Less fixed the Inventory
Nov 18, 2014
0f736f3
Fixed the inventory model test
Nov 18, 2014
1fdc224
General commit
Nov 18, 2014
7a42ebc
Fixed placed to ship process; still need inventory decrement
sltclss Nov 18, 2014
d26b8af
Added Billing and shipping fields for orders
nchen94 Nov 18, 2014
e58ba40
General commit
Nov 18, 2014
33e7b5e
General commit
Nov 18, 2014
922894a
fixed shipping and back-end order functional test
sltclss Nov 19, 2014
cf3271a
General commit
sltclss Nov 19, 2014
d9908c1
'testing --jcaneus1'
Olguy Nov 18, 2014
ef3276a
'More front end test added --jcaneus'
Olguy Nov 19, 2014
cb987d0
General commit
Nov 19, 2014
e4d536d
Added result controller test (bugs commented out)
Nov 19, 2014
12e62d4
General commit
Nov 19, 2014
1806953
'more tests cases checking for error message from the Get responses -…
Olguy Nov 19, 2014
344e558
Added more tests for back-end model
Nov 19, 2014
6c24a9c
Added test and Fixed small bug
nchen94 Nov 19, 2014
bbbcb94
cleaned up MH
Nov 21, 2014
934746d
Added email back-end function
sltclss Nov 21, 2014
70fe208
Added List of Registered Orders for LAB
Nov 21, 2014
578838f
Changed DATE to TEXT
Nov 21, 2014
8da5868
Customer/Admin Backend functions updated
nchen94 Nov 22, 2014
449aa61
Automatically send an email to reset password
Nov 22, 2014
47418d8
'added new rows in customer and lab page --jcaneus1'
Olguy Nov 23, 2014
7069399
Inventory decrement/increment fix; login type check restrictions added
sltclss Nov 23, 2014
b4093ff
some major changes in customer page view and addding a order button o…
MonicaGandhi Nov 23, 2014
e86b799
general commits
sltclss Nov 23, 2014
00f69ad
General commit: new order fixes (some still in progress)
sltclss Nov 23, 2014
34c8da9
Formatting of Customer History
Nov 23, 2014
2c48774
Fixed date problem for the admin list return as well as the ship kit bug
sltclss Nov 23, 2014
07f9392
General Commit: Fixed status names
nchen94 Nov 23, 2014
9a1a47b
General Commit
nchen94 Nov 23, 2014
6618202
General commit
nchen94 Nov 23, 2014
2fcb08b
General Commit
nchen94 Nov 23, 2014
97d16f5
Added more email functions
Nov 23, 2014
5ae81a4
General commit
Nov 23, 2014
8073f01
Fixed email
Nov 23, 2014
e71318a
Added Notification Functionality
Nov 24, 2014
b5e7bd7
Fixed lab reject result and new result creation check
sltclss Nov 29, 2014
30ca4f8
Fixed verify; fixing customerhistory
sltclss Nov 29, 2014
ccdf2ad
fixed date bug in users
sltclss Dec 4, 2014
b5770d0
General commit
Dec 6, 2014
91a8733
Email for result
Dec 6, 2014
037e4bb
Quick fix
Dec 7, 2014
9dc17b6
Fix email for result
Dec 7, 2014
c002321
Fixed back-end test
Dec 7, 2014
a01e881
Added inventory testing
Dec 7, 2014
202028f
Clean code
Dec 7, 2014
7f621d7
More admin tests
Dec 7, 2014
397f2ac
Fixed customer view info and completed order email (still in progress)
sltclss Dec 7, 2014
d701a24
'fixing some front end test' --jcaneus1
Olguy Dec 8, 2014
399ddfb
Clean code
Dec 8, 2014
9df3e8e
General commit
Dec 8, 2014
da2ace5
'Fix Register controller issue' --jcaneus1
Olguy Dec 8, 2014
9615558
'signin() authentication test related issue got fixed' --jcaneus1
Olguy Dec 8, 2014
1ad03bf
Fixed two front-end tests and email function
Dec 9, 2014
679d455
'more front end test for the lab view' --jcaneus1
Olguy Dec 10, 2014
f210ede
Added view features to lab; general bug fixes.
sltclss Dec 10, 2014
d668a06
"lab and verify test cleanup file" --jcaneus1
Olguy Dec 10, 2014
908d39d
"Admin clean up files" --jcaneus1
Olguy Dec 10, 2014
70cf2a6
implemented basic view functions
sltclss Dec 10, 2014
873bc6f
Fixed some weird back-end test bugs
Dec 10, 2014
cd0de81
Fixed some small bugs.
Dec 10, 2014
df80552
Fixed bugs created by fixing bugs
Dec 10, 2014
143a469
Fixed testing for lab
Dec 10, 2014
8f1799a
General commit
Dec 10, 2014
fefdbf5
fixed email and verify bugs
sltclss Dec 10, 2014
85726e4
General commit
Aug 31, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test
test
nchen94 committed Sep 21, 2014
commit 832a715717cc878e733a0dd72a96a6a90d043a69
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<section class="row" data-ng-controller="PasswordController">
<h3 class="col-md-12 text-center">Restore your password</h3>
<h3 class="col-md-12 text-center">Restore your testpassword</h3>
<p class="small text-center">Enter your account username.</p>
<div class="col-xs-offset-2 col-xs-8 col-md-offset-5 col-md-2">
<form data-ng-submit="askForPasswordReset()" class="signin form-horizontal" autocomplete="off">